Prepare all project for New Harbour Submission

condo4 · May 30, 2018 · 3478fcd · 3478fcd
1 parent d568981
commit 3478fcd
Show file tree

Hide file tree

Showing 14 changed files with 105 additions and 350 deletions.
diff --git a/Resources.qrc b/Resources.qrc
@@ -6,6 +6,5 @@
         <file alias="Dollar.png">picture/Dollar.png</file>
         <file alias="GitHub_Logo.png">picture/GitHub_Logo.png</file>
         <file alias="GitHub_Logo_White.png">picture/GitHub_Logo_White.png</file>
-        <file alias="harbour-carbudget.png">harbour-carbudget.png</file>
     </qresource>
 </RCC>
diff --git a/harbour-carbudget.pro b/harbour-carbudget.pro
@@ -8,24 +8,11 @@
 #         - icon definition filename in desktop file must be changed
 TARGET = harbour-carbudget
 
-CONFIG += sailfishapp sailfishapp_i18n
-QT += sql xml
-DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
-QML_IMPORT_PATH += qml
+CONFIG += sailfishapp
 
-TRANSLATIONS = translations/de_DE.ts \
-               translations/fi_FI.ts \
-               translations/fr_FR.ts \
-               translations/it_IT.ts \
-               translations/ru_RU.ts \
-               translations/sv_SE.ts
+QT += sql xml
 
-lupdate_only{
-    SOURCES += qml/*.qml \
-    SOURCES += qml/pages/*.qml \
-    SOURCES += qml/jbQuick/Charts/*.qml \
-    SOURCES += qml/jbQuick/Charts/*.js
-}
+DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 
 HEADERS += \
     tank.h \
@@ -57,9 +44,65 @@ SOURCES += CarBudget.cpp \
     filemodel.cpp \
     statfileinfo.cpp \
     globals.cpp
+
+DISTFILES += \
+    qml/pages/CostEntry.qml \
+    qml/pages/ImportHelp.qml \
+    qml/pages/CarEntry.qml \
+    qml/pages/CarView.qml \
+    qml/pages/About.qml \
+    qml/pages/BudgetView.qml \
+    qml/pages/TiremountView.qml \
+    qml/pages/CosttypeView.qml \
+    qml/pages/SelectImportFile.qml \
+    qml/pages/TireEntry.qml \
+    qml/pages/Settings.qml \
+    qml/pages/TankEntry.qml \
+    qml/pages/FueltypeView.qml \
+    qml/pages/MycarImport.qml \
+    qml/pages/CosttypeEntry.qml \
+    qml/pages/TankEntryView.qml \
+    qml/pages/FuelpadImport.qml \
+    qml/pages/CostEntryView.qml \
+    qml/pages/CostView.qml \
+    qml/pages/TankView.qml \
+    qml/pages/TireMount.qml \
+    qml/pages/StationView.qml \
+    qml/pages/BackupNotification.qml \
+    qml/pages/CarBudgetImport.qml \
+    qml/pages/CostStatistics.qml \
+    qml/pages/TiremountEdit.qml \
+    qml/pages/CarBudgetImportError.qml \
+    qml/pages/ConsumptionStatistics.qml \
+    qml/pages/TireView.qml \
+    qml/pages/StationEntry.qml \
+    qml/pages/SelectTankDate.qml \
+    qml/pages/Statistics.qml \
+    qml/pages/CarCreate.qml \
+    qml/pages/DirectoryPage.qml \
+    qml/pages/FueltypeEntry.qml \
+    qml/Application.qml \
+    qml/cover/CoverPage.qml \
+    qml/jbQuick/Charts/*.js \
+    rpm/CarBudget.yaml \
+    rpm/CarBudget.spec \
+    harbour-carbudget.desktop \
+    translations/*.ts
+
+
+SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
+
+# to disable building translations every time, comment out the
+# following CONFIG line
+CONFIG += sailfishapp_i18n
+
+TRANSLATIONS = translations/de_DE.ts \
+               translations/fi_FI.ts \
+               translations/fr_FR.ts \
+               translations/it_IT.ts \
+               translations/ru_RU.ts \
+               translations/sv_SE.ts
 
-OTHER_FILES += rpm/CarBudget.yaml \
-    harbour-carbudget.desktop
 
 RESOURCES += \
     Resources.qrc

diff --git a/icons/108x108/harbour-carbudget.png b/icons/108x108/harbour-carbudget.png
diff --git a/icons/128x128/harbour-carbudget.png b/icons/128x128/harbour-carbudget.png
diff --git a/icons/172x172/harbour-carbudget.png b/icons/172x172/harbour-carbudget.png
diff --git a/harbour-carbudget.png → icons/86x86/harbour-carbudget.png b/harbour-carbudget.png → icons/86x86/harbour-carbudget.png
diff --git a/rpm/CarBudget.yaml b/rpm/CarBudget.yaml
@@ -2,36 +2,45 @@ Name: harbour-carbudget
 Summary: Car expenses calculation
 Version: 0.20
 Release: 0
+# The contents of the Group field should be one of the groups listed here:
+# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group: Qt/Qt
-License: GPL
 URL: https://github.com/condo4/carbudget
+License: GPL-3.0
+# This must be generated before uploading a package to a remote build service.
+# Usually this line does not need to be modified.
 Sources:
 - '%{name}-%{version}.tar.bz2'
-Description: |-
+Description: |
   Application to calculate all expenses from a Car
 Configure: none
+# The qtc5 builder inserts macros to allow QtCreator to have fine
+# control over qmake/make execution
 Builder: qtc5
+
+# This section specifies build dependencies that are resolved using pkgconfig.
+# This is the preferred way of specifying build dependencies for your package.
 PkgConfigBR:
-- sailfishapp
-- Qt5Quick
-- Qt5Qml
-- Qt5Core
+  - sailfishapp >= 1.0.2
+  - Qt5Core
+  - Qt5Qml
+  - Qt5Quick
+
+# Build dependencies without a pkgconfig setup can be listed here
+# PkgBR:
+#   - package-needed-to-build
+
+# Runtime dependencies which are not automatically detected
 Requires:
-- sailfishsilica-qt5
-- qt5-qtdeclarative-import-xmllistmodel
+  - sailfishsilica-qt5 >= 0.10.9 
+  - qt5-qtdeclarative-import-xmllistmodel
+
+# All installed files
 Files:
-- '%{_bindir}'
-- '%{_datadir}/%{name}/qml'
-- '%{_datadir}/%{name}/translations'
-- '%{_datadir}/applications/%{name}.desktop'
-- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
-- '%{_datadir}/icons/hicolor/108x108/apps/%{name}.png'
-- '%{_datadir}/icons/hicolor/128x128/apps/%{name}.png'
-- '%{_datadir}/applications'
-- '%{_datadir}/icons/hicolor/86x86/apps'
-- '%{_datadir}/icons/hicolor/108x108/apps'
-- '%{_datadir}/icons/hicolor/128x128/apps'
-- '%{_datadir}/%{name}'
-PkgBR: []
-QMakeOptions:
-    - VERSION=%{version}
+  - '%{_bindir}'
+  - '%{_datadir}/%{name}'
+  - '%{_datadir}/applications/%{name}.desktop'
+  - '%{_datadir}/icons/hicolor/*/apps/%{name}.png'
+
+# For more information about yaml and what's supported in Sailfish OS
+# build system, please see https://wiki.merproject.org/wiki/Spectacle
diff --git a/translations/de_DE.ts b/translations/de_DE.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>About</name>
     <message>
@@ -566,31 +566,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FileModel</name>
-    <message>
-        <location filename="../filemodel.cpp" line="66"/>
-        <source>dir-link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="67"/>
-        <source>dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="295"/>
-        <location filename="../filemodel.cpp" line="329"/>
-        <source>Folder does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="299"/>
-        <location filename="../filemodel.cpp" line="335"/>
-        <source>No permission to read the folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FuelpadImport</name>
     <message>
@@ -696,33 +671,10 @@
         <translation>Import</translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../globals.cpp" line="48"/>
-        <source>%1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="51"/>
-        <source>%1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="54"/>
-        <source>%1 MB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="56"/>
-        <source>%1 GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SelectImportFile</name>
     <message>
-        <location filename="../qml/pages/SelectImportFile.qml" line="37"/>
+        <location filename="../qml/pages/SelectImportFile.qml" line="38"/>
         <source>File to import</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/fi_FI.ts b/translations/fi_FI.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fi_FI">
+<TS version="2.1" language="fi_FI">
 <context>
     <name>About</name>
     <message>
@@ -566,31 +566,6 @@
         <translation>Ei tiedostoja</translation>
     </message>
 </context>
-<context>
-    <name>FileModel</name>
-    <message>
-        <location filename="../filemodel.cpp" line="66"/>
-        <source>dir-link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="67"/>
-        <source>dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="295"/>
-        <location filename="../filemodel.cpp" line="329"/>
-        <source>Folder does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="299"/>
-        <location filename="../filemodel.cpp" line="335"/>
-        <source>No permission to read the folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FuelpadImport</name>
     <message>
@@ -696,33 +671,10 @@
         <translation>Tuo</translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../globals.cpp" line="48"/>
-        <source>%1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="51"/>
-        <source>%1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="54"/>
-        <source>%1 MB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="56"/>
-        <source>%1 GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SelectImportFile</name>
     <message>
-        <location filename="../qml/pages/SelectImportFile.qml" line="37"/>
+        <location filename="../qml/pages/SelectImportFile.qml" line="38"/>
         <source>File to import</source>
         <translation>Tuo tiedosto</translation>
     </message>

diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>About</name>
     <message>
@@ -566,31 +566,6 @@
         <translation>Pas de fichiers</translation>
     </message>
 </context>
-<context>
-    <name>FileModel</name>
-    <message>
-        <location filename="../filemodel.cpp" line="66"/>
-        <source>dir-link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="67"/>
-        <source>dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="295"/>
-        <location filename="../filemodel.cpp" line="329"/>
-        <source>Folder does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../filemodel.cpp" line="299"/>
-        <location filename="../filemodel.cpp" line="335"/>
-        <source>No permission to read the folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FuelpadImport</name>
     <message>
@@ -696,33 +671,10 @@
         <translation>Importer</translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../globals.cpp" line="48"/>
-        <source>%1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="51"/>
-        <source>%1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="54"/>
-        <source>%1 MB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../globals.cpp" line="56"/>
-        <source>%1 GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SelectImportFile</name>
     <message>
-        <location filename="../qml/pages/SelectImportFile.qml" line="37"/>
+        <location filename="../qml/pages/SelectImportFile.qml" line="38"/>
         <source>File to import</source>
         <translation type="unfinished"></translation>
     </message>