iRail · DylanVanAssche · Jan 4, 2018 · Dec 22, 2017 · Dec 22, 2017 · Dec 22, 2017
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,6 @@ Makefile*
 # QtCtreator CMake
 CMakeLists.txt.user*
 
+#Enforce .pro.user ignore
+harbour-berail.pro.user
+
diff --git a/harbour-berail.pro b/harbour-berail.pro
@@ -1,13 +1,19 @@
-# NOTICE:
 #
-# Application name defined in TARGET has a corresponding QML filename.
-# If name defined in TARGET is changed, the following needs to be done
-# to match new name:
-#   - corresponding QML filename must be changed
-#   - desktop icon filename must be changed
-#   - desktop filename must be changed
-#   - icon definition filename in desktop file must be changed
-#   - translation filenames have to be changed
+#   This file is part of BeRail.
+#
+#   BeRail is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   BeRail is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with BeRail.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 # The name of your application
 TARGET = harbour-berail
@@ -18,34 +24,6 @@ QT += core \
     network \
     positioning
 
-SOURCES += src/harbour-berail.cpp \
-    src/logger.cpp \
-    src/os.cpp \
-    src/api.cpp \
-    src/models/station.cpp \
-    src/models/alert.cpp \
-    src/models/disturbances.cpp \
-    src/models/liveboard.cpp \
-    src/models/vehicle.cpp \
-    src/models/stop.cpp \
-    src/models/connection.cpp \
-    src/models/via.cpp \
-    src/models/enum.cpp \
-    src/models/alertlistmodel.cpp \
-    src/models/stoplistmodel.cpp \
-    src/models/vehiclelistmodel.cpp \
-    src/models/stationlistmodel.cpp \
-    src/models/connectionlistmodel.cpp \
-    src/models/vialistmodel.cpp
-
-OTHER_FILES += qml/harbour-berail.qml \
-    qml/cover/CoverPage.qml \
-    qml/pages/FirstPage.qml \
-    rpm/harbour-berail.spec \
-    rpm/harbour-berail.yaml \
-    translations/*.ts \
-    harbour-berail.desktop
-
 # OS module notification support
 PKGCONFIG += nemonotifications-qt5
 QT += dbus
@@ -59,15 +37,13 @@ DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 
 SAILFISHAPP_ICONS = 86x86 108x108 128x128 256x256
 
-# to disable building translations every time, comment out the
-# following CONFIG line
-CONFIG += sailfishapp_i18n
+# Enable translations
+CONFIG += sailfishapp_i18n \
+    sailfishapp_i18n_idbased \
+    sailfishapp_i18n_unfinished
 
-# German translation is enabled as an example. If you aren't
-# planning to localize your app, remember to comment out the
-# following TRANSLATIONS line. And also do not forget to
-# modify the localized app name in the the .desktop file.
-TRANSLATIONS += translations/harbour-berail-de.ts \
+TRANSLATIONS += translations/harbour-berail.ts \
+translations/harbour-berail-de.ts \
 translations/harbour-berail-nl.ts
 
 DISTFILES += \
@@ -85,10 +61,8 @@ DISTFILES += \
     qml/pages/StationListPage.qml \
     qml/pages/js/util.js \
     qml/pages/DatePickerPage.qml \
-    qml/pages/TripPage.qml \
     qml/pages/components/TripItem.qml \
     qml/pages/js/trip.js \
-    qml/pages/TripDetailPage.qml \
     qml/pages/components/LiveBoardItem.qml \
     qml/pages/components/CancelOverlay.qml \
     qml/pages/js/liveboard.js \
@@ -98,7 +72,10 @@ DISTFILES += \
     qml/pages/js/disturbances.js \
     qml/pages/components/DisturbancesView.qml \
     qml/pages/DisturbancesPage.qml \
-    qml/pages/SettingsPage.qml
+    qml/pages/SettingsPage.qml \
+    translations/harbour-berail-en.ts \
+    qml/components/GlassStationButton.qml \
+    qml/pages/TripDetailHeader.qml
 
 RESOURCES += \
     qml/resources/resources.qrc
@@ -121,4 +98,42 @@ HEADERS += \
     src/models/vehiclelistmodel.h \
     src/models/stationlistmodel.h \
     src/models/connectionlistmodel.h \
-    src/models/vialistmodel.h
+    src/models/vialistmodel.h \
+    src/models/announcements.h \
+    src/models/remarks.h \
+    src/models/stationlistmodelfilter.h \
+    src/models/stopvia.h \
+    src/models/stopabstract.h
+
+SOURCES += src/harbour-berail.cpp \
+    src/logger.cpp \
+    src/os.cpp \
+    src/api.cpp \
+    src/models/station.cpp \
+    src/models/alert.cpp \
+    src/models/disturbances.cpp \
+    src/models/liveboard.cpp \
+    src/models/vehicle.cpp \
+    src/models/stop.cpp \
+    src/models/connection.cpp \
+    src/models/via.cpp \
+    src/models/enum.cpp \
+    src/models/alertlistmodel.cpp \
+    src/models/stoplistmodel.cpp \
+    src/models/vehiclelistmodel.cpp \
+    src/models/stationlistmodel.cpp \
+    src/models/connectionlistmodel.cpp \
+    src/models/vialistmodel.cpp \
+    src/models/announcements.cpp \
+    src/models/remarks.cpp \
+    src/models/stationlistmodelfilter.cpp \
+    src/models/stopvia.cpp \
+    src/models/stopabstract.cpp
+
+OTHER_FILES += qml/harbour-berail.qml \
+    qml/cover/CoverPage.qml \
+    qml/pages/FirstPage.qml \
+    rpm/harbour-berail.spec \
+    rpm/harbour-berail.yaml \
+    translations/*.ts \
+    harbour-berail.desktop