Use numeric input for Range widgets

opengisch · Sep 7, 2016 · 8b680d2 · 8b680d2
1 parent 2817610
commit 8b680d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.6
 import QtQuick.Controls 1.4 as Controls
 import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls.Private 1.0
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import QtQml.Models 2.2
@@ -42,6 +43,16 @@ Rectangle {
 
     id: container
 
+
+    // A container for the main form area (below the tabs)
+    Connections {
+      target: container
+      onVisibleChanged: {
+        if ( container.visible )
+          content.sourceComponent = element
+      }
+    }
+
     // Tabs
     Item {
       anchors.fill: parent
@@ -199,14 +210,6 @@ Rectangle {
         content.pType = 'tab'
       }
     }
-
-    Connections {
-      target: container
-      onVisibleChanged: {
-        if ( container.visible )
-          content.sourceComponent = element
-      }
-    }
   }
 
   /**
@@ -249,7 +252,7 @@ Rectangle {
         text: name
         height: name === '' ? 0 : undefined
         anchors { left: parent.left; right: parent.right }
-        font { pointSize: 20 * dp; bold: true }
+        font { pixelSize: 1.4 * TextSingleton.font.pixelSize; bold: true }
       }
 
       Column {
@@ -328,7 +331,7 @@ Rectangle {
             if ( attributeEditorLoader.status === Loader.Error )
             {
               console.warn( "Editor widget type '" + editorWidget + "' not avaliable." )
-              widget = 'TextEdit'
+              source = 'editorwidgets/TextEdit.qml'
             }
           }
         }

diff --git a/src/qml/editorwidgets/TextEdit.qml b/src/qml/editorwidgets/TextEdit.qml
@@ -14,7 +14,7 @@ Item {
 
     text: value || ''
 
-    inputMethodHints: field.isNumeric ? Qt.ImhDigitsOnly : Qt.ImhNone
+    inputMethodHints: field.isNumeric || widget == 'Range' ? Qt.ImhDigitsOnly : Qt.ImhNone
 
     onEditingFinished: {
       valueChanged( text, text == '' )