Merge pull request #66 from direc85/master

Settings.qml rewrite, lots of fixes
condo4 · Jul 26, 2021 · 104030a · 104030a
2 parents 6895d65 + a43a936
commit 104030a
Show file tree

Hide file tree

Showing 23 changed files with 755 additions and 938 deletions.
diff --git a/CarBudget.cpp b/CarBudget.cpp
@@ -25,6 +25,7 @@
 
 #include <sailfishapp.h>
 #include <QSettings>
+#include <QLocale>
 #include "src/tank.h"
 #include "src/cost.h"
 #include "src/tire.h"
@@ -57,8 +58,10 @@ int main(int argc, char *argv[])
     app->setApplicationName("harbour-carbudget");
     QQuickView *view = SailfishApp::createView();
 
+    QLocale systemLocale;
+
     QTranslator translator;
-    if(translator.load((QLocale::system().name() != "C")?(QLocale::system().name()):("en_GB"), "/usr/share/harbour-carbudget/translations/"))
+    if(translator.load((systemLocale.name() != "C")?(systemLocale.name()):("en_GB"), "/usr/share/harbour-carbudget/translations/"))
     {
         QGuiApplication::installTranslator(&translator);
     }
@@ -78,18 +81,20 @@ int main(int argc, char *argv[])
     qmlRegisterType<Car>(       "harbour.carbudget",1,0,"Car");
     qmlRegisterType<FileModel>( "harbour.carbudget",1,0,"FileModel");
 
-
     CarManager manager;
 
-
     view->engine()->addImportPath("/usr/share/harbour-carbudget/qmlModules");
     view->rootContext()->setContextProperty("manager", &manager);
     view->rootContext()->setContextProperty("downloadPath", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
+    view->rootContext()->setContextProperty("systemCurrencySymbol", systemLocale.currencySymbol());
+    view->rootContext()->setContextProperty("systemDistanceUnit", QString(systemLocale.measurementSystem() == 0 ? "km" : "mi"));
     view->setSource(SailfishApp::pathTo("qml/Application.qml"));
     view->showFullScreen();
 
     int errorlevel = app->exec();
     qDebug() << "CarBudget exited normally.";
+    delete view;
+    delete app;
     return errorlevel;
 }
 
diff --git a/harbour-carbudget.pro b/harbour-carbudget.pro
@@ -14,6 +14,11 @@ QT += sql xml
 
 DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 
+CONFIG(release, debug|release) {
+    DEFINES += QT_NO_DEBUG
+    DEFINES += QT_NO_DEBUG_OUTPUT
+}
+
 HEADERS += \
     src/tank.h \
     src/car.h \
@@ -77,7 +82,6 @@ DISTFILES += \
     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 \

diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
@@ -121,7 +121,7 @@ CoverBackground {
             iconSource: "image://theme/icon-cover-new"
             onTriggered: {
                 app.activate()
-                pageStack.push(Qt.resolvedUrl("../pages/CarCreate.qml"))
+                pageStack.push(Qt.resolvedUrl("../pages/Settings.qml"), { newCarMode: true })
             }
         }
     }

diff --git a/qml/pages/CarBudgetImport.qml b/qml/pages/CarBudgetImport.qml
@@ -56,7 +56,7 @@ Page {
                 label: newName
                 placeholderText: label
                 text: label
-                validator: RegExpValidator { regExp: /^[0-9A-Za-z_-]{4,16}$/ }
+                validator: RegExpValidator { regExp: /^[0-9A-Za-z_\- ]{1,32}$/ }
                 EnterKey.enabled: text.length >= 4 && acceptableInput == true
                 onFocusChanged: if(focus) errorLabel.text = ""
             }

diff --git a/qml/pages/CarCreate.qml b/qml/pages/CarCreate.qml
diff --git a/qml/pages/CarEntry.qml b/qml/pages/CarEntry.qml
@@ -58,7 +58,7 @@ Page {
 
             MenuItem {
                 text: qsTr("Settings")
-                onClicked: pageStack.push(Qt.resolvedUrl("Settings.qml"))
+                onClicked: pageStack.push(Qt.resolvedUrl("Settings.qml"), { newCarMode: false })
             }
 
             MenuItem {

diff --git a/qml/pages/CarView.qml b/qml/pages/CarView.qml
@@ -42,7 +42,7 @@ Page {
             }
             MenuItem {
                 text: qsTr("Create new car")
-                onClicked: pageStack.push(Qt.resolvedUrl("CarCreate.qml"))
+                onClicked: pageStack.push(Qt.resolvedUrl("Settings.qml"), { newCarMode: true })
             }
         }
         Label {
@@ -89,7 +89,7 @@ Page {
             }
             MenuItem {
                 text: qsTr("Create new car")
-                onClicked: pageStack.push(Qt.resolvedUrl("CarCreate.qml"))
+                onClicked: pageStack.push(Qt.resolvedUrl("Settings.qml"), { newCarMode: true })
             }
         }
 

diff --git a/qml/pages/CostEntry.qml b/qml/pages/CostEntry.qml
@@ -80,7 +80,7 @@ Dialog {
                 label: manager.car.distanceUnit
                 placeholderText: label
 
-                validator: RegExpValidator { regExp: /^[0-9]{1,7}$/ }
+                validator: IntValidator { bottom: 0; top: 99999999 }
                 inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoPrediction
 
                 EnterKey.enabled: text.length > 0 && acceptableInput == true
@@ -116,7 +116,7 @@ Dialog {
                 label: qsTr("Price")
                 placeholderText: label
 
-                validator: RegExpValidator { regExp: /^[0-9\.,]{1,7}$/ }
+                validator: DoubleValidator { bottom: 0; top: 99999999 }
                 inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoPrediction
                 EnterKey.enabled: text.length > 0 && acceptableInput == true
                 EnterKey.onClicked: descinput.focus = true