Use Settings.qml instead of CarCreate.qml to reduce duplicate code

condo4 · Jul 25, 2021 · 50fc79d · 50fc79d
1 parent 0c51ad1
commit 50fc79d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 127 deletions.
diff --git a/harbour-carbudget.pro b/harbour-carbudget.pro
@@ -82,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/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 })
             }
         }