From dae84a97c9637f85cb3d9ae9fc28afa924214fb9 Mon Sep 17 00:00:00 2001
From: Anton Thomasson <antonthomasson@gmail.com>
Date: Sun, 7 Jun 2020 14:33:35 +0200
Subject: [PATCH] Move settings

---
 qml/harbour-seaprint.qml  | 21 +++++++++++++++++++++
 qml/pages/PrinterPage.qml | 26 +++-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/qml/harbour-seaprint.qml b/qml/harbour-seaprint.qml
index d0e037a..e54f043 100644
--- a/qml/harbour-seaprint.qml
+++ b/qml/harbour-seaprint.qml
@@ -82,5 +82,26 @@ ApplicationWindow
         defaultValue: 0
         property int expectedValue: 1
     }
+
+    ConfigurationValue
+    {
+        id: alwaysConvertSetting
+        key: "/apps/harbour-seaprint/settings/always-convert"
+        defaultValue: false
+    }
+
+    ConfigurationValue
+    {
+        id: forceIncluDeDocumentFormatSetting
+        key: "/apps/harbour-seaprint/settings/force-include-document-format"
+        defaultValue: false
+    }
+
+    ConfigurationValue
+    {
+        id: removeRedundantAttributesForRasterSetting
+        key: "/apps/harbour-seaprint/settings/remove-redundant-raster-attributes"
+        defaultValue: true
+    }
 }
 
diff --git a/qml/pages/PrinterPage.qml b/qml/pages/PrinterPage.qml
index a021ad2..53cc9a9 100644
--- a/qml/pages/PrinterPage.qml
+++ b/qml/pages/PrinterPage.qml
@@ -3,7 +3,6 @@ import Sailfish.Silica 1.0
 import seaprint.mimer 1.0
 import seaprint.ippmsg 1.0
 import "utils.js" as Utils
-import Nemo.Configuration 1.0
 
 Page {
     id: page
@@ -11,27 +10,6 @@ Page {
     property var jobParams: new Object();
     property string selectedFile
 
-    ConfigurationValue
-    {
-        id: alwaysConvert
-        key: "/apps/harbour-seaprint/settings/always_convert"
-        defaultValue: false
-    }
-
-    ConfigurationValue
-    {
-        id: forceIncluDeDocumentFormat
-        key: "/apps/harbour-seaprint/settings/force_include_document_format"
-        defaultValue: false
-    }
-
-    ConfigurationValue
-    {
-        id: removeRedundantAttributesForRaster
-        key: "/apps/harbour-seaprint/settings/remove_redundant_attributes_for_raster"
-        defaultValue: true
-    }
-
     Component.onCompleted: {
         console.log(JSON.stringify(printer.attrs))
     }
@@ -49,7 +27,9 @@ Page {
                         pageStack.replace(Qt.resolvedUrl("BusyPage.qml"),{printer:printer},
                                           PageStackAction.Immediate)
                         printer.print(jobParams, page.selectedFile,
-                                      alwaysConvert.value, forceIncluDeDocumentFormat.value, removeRedundantAttributesForRaster.value)
+                                      alwaysConvertSetting.value,
+                                      forceIncluDeDocumentFormatSetting.value,
+                                      removeRedundantAttributesForRasterSetting.value)
                     }
                 }
             }