Fix advanced page range input

attah · Nov 17, 2022 · 6f4d602 · 6f4d602
1 parent 3d8ade0
commit 6f4d602
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/harbour-seaprint.pro b/harbour-seaprint.pro
@@ -51,10 +51,8 @@ SOURCES += src/harbour-seaprint.cpp \
     src/settings.cpp
 
 DISTFILES += qml/harbour-seaprint.qml \
-    qml/components/DependentOn.qml \
-    qml/components/RangeListInputDialog.qml \
     qml/cover/CoverPage.qml \
-    qml/components/*qml \
+    qml/components/*.qml \
     qml/pages/*.qml \
     qml/pages/*.js \
     qml/pages/*svg \

diff --git a/qml/components/RangeListInputDialog.qml b/qml/components/RangeListInputDialog.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import seaprint.rangelistchecker 1.0
+
+Dialog {
+    id: dialog
+    allowedOrientations: Orientation.All
+
+    property string title
+    property var value
+    canAccept: valueField.acceptableInput
+
+    Column {
+        width: parent.width
+
+        DialogHeader { }
+
+        TextField {
+            id: valueField
+            acceptableInput: Object.keys(value).length !== 0
+            width: parent.width
+            placeholderText: "1,2,17-42"
+            label: title
+            focus: true
+            labelVisible: true
+            onTextChanged: { dialog.value = RangeListChecker.parse(text) }
+        }
+    }
+
+}
diff --git a/qml/components/RangeSetting.qml b/qml/components/RangeSetting.qml
@@ -146,7 +146,7 @@ Setting {
             visible: acceptRangeList
             text: qsTr("Advanced")
             onClicked: {var dialog = pageStack.push(Qt.resolvedUrl("RangeListInputDialog.qml"),
-                                                    {value: choice, title: prettyName});
+                                                    {title: prettyName});
                         dialog.accepted.connect(function() {
                             choice = dialog.value;
                         })