From 14a09dbb57deecab402968446fa551d913bc3f78 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@eyecreate.org>
Date: Sun, 23 Aug 2020 10:46:07 -0400
Subject: [PATCH] Move carfax import into settings since not important enough
 for main screen.

---
 src/contents/ui/MainPage.qml | 28 ----------------------------
 src/contents/ui/Settings.qml | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/contents/ui/MainPage.qml b/src/contents/ui/MainPage.qml
index 9b8d340..14be782 100644
--- a/src/contents/ui/MainPage.qml
+++ b/src/contents/ui/MainPage.qml
@@ -3,8 +3,6 @@ import org.kde.kirigami 2.12 as Kirigami
 import QtQuick.Controls 2.14 as Controls
 import QtQuick.Layouts 1.14 as Layouts
 import QtQuick.Controls 1.4 as Old
-import QtQuick.Dialogs 1.3 as Dialogs
-import Qt.labs.platform 1.1 as Labs
 
 Kirigami.PageRoute {
     name: "main"
@@ -19,13 +17,6 @@ Kirigami.PageRoute {
                 }
             }
             contextualActions: [
-                Kirigami.Action {
-                    iconName: "application-javascript"
-                    text: qsTr("Import From Carfax JSON")
-                    onTriggered: {
-                        importMessage.visible = true;
-                    }
-                },
                 Kirigami.Action {
                     iconName: "preferences-system"
                     text: qsTr("Settings")
@@ -42,25 +33,6 @@ Kirigami.PageRoute {
                 }
             ]
             title: "Vehicles"
-            Dialogs.FileDialog {
-                id: importDialog
-                title: qsTr("Select Carfax Json file to import...")
-                nameFilters: ["Carfax Vehicle Json (*.json)"]
-                onAccepted: {
-                    if(jsonConverter.importCarfaxJsonToDB(importDialog.fileUrl)) {
-                        //
-                    } else {
-                        root.showPassiveNotification(qsTr("Failed to parse file."),"short");
-                    }
-                }
-            }
-            Labs.MessageDialog {
-                id:importMessage
-                title: qsTr("Warning")
-                text: qsTr("This is an advanced feature that requires you pulling JSON file from Carfax website unofficially in advanced. Do you want to continue?")
-                buttons: Labs.MessageDialog.Yes | Labs.MessageDialog.No
-                onYesClicked: importDialog.visible = true
-            }
             Kirigami.CardsListView {
                     anchors.fill: parent
                     id: vehicleView
diff --git a/src/contents/ui/Settings.qml b/src/contents/ui/Settings.qml
index df49fa4..326dd27 100644
--- a/src/contents/ui/Settings.qml
+++ b/src/contents/ui/Settings.qml
@@ -2,6 +2,8 @@ import QtQuick 2.14
 import org.kde.kirigami 2.12 as Kirigami
 import QtQuick.Controls 2.14 as Controls
 import QtQuick.Layouts 1.14 as Layouts
+import QtQuick.Dialogs 1.3 as Dialogs
+import Qt.labs.platform 1.1 as Labs
 
 Kirigami.PageRoute {
     name: "settings"
@@ -9,6 +11,34 @@ Kirigami.PageRoute {
         Kirigami.Page {
             id: settingsPage
             title: qsTr("Settings")
+            contextualActions: [
+                Kirigami.Action {
+                    iconName: "application-javascript"
+                    text: qsTr("Import From Carfax JSON")
+                    onTriggered: {
+                        importMessage.visible = true;
+                    }
+                }
+            ]
+            Dialogs.FileDialog {
+                id: importDialog
+                title: qsTr("Select Carfax Json file to import...")
+                nameFilters: ["Carfax Vehicle Json (*.json)"]
+                onAccepted: {
+                    if(jsonConverter.importCarfaxJsonToDB(importDialog.fileUrl)) {
+                        //
+                    } else {
+                        root.showPassiveNotification(qsTr("Failed to parse file."),"short");
+                    }
+                }
+            }
+            Labs.MessageDialog {
+                id:importMessage
+                title: qsTr("Warning")
+                text: qsTr("This is an advanced feature that requires you pulling JSON file from Carfax website unofficially in advanced. Do you want to continue?")
+                buttons: Labs.MessageDialog.Yes | Labs.MessageDialog.No
+                onYesClicked: importDialog.visible = true
+            }
             Layouts.ColumnLayout {
                 anchors.fill: parent
                 Kirigami.InlineMessage {
-- 
GitLab