From 1905cec9339be03c75a9d6cf3cb5dbf2c044b068 Mon Sep 17 00:00:00 2001 From: Anton Thomasson Date: Sat, 25 Feb 2023 16:15:45 +0100 Subject: [PATCH] Improve integer input hints/labels --- qml/components/IntegerInputDialog.qml | 3 +-- qml/components/IntegerSetting.qml | 2 +- qml/components/RangeSetting.qml | 4 ++-- translations/harbour-seaprint-de.ts | 8 ++++++++ translations/harbour-seaprint-es.ts | 8 ++++++++ translations/harbour-seaprint-fr.ts | 8 ++++++++ translations/harbour-seaprint-nl.ts | 8 ++++++++ translations/harbour-seaprint-pl.ts | 8 ++++++++ translations/harbour-seaprint-zh_CN.ts | 8 ++++++++ translations/harbour-seaprint.ts | 8 ++++++++ 10 files changed, 60 insertions(+), 5 deletions(-) diff --git a/qml/components/IntegerInputDialog.qml b/qml/components/IntegerInputDialog.qml index e70e356..dea13d8 100644 --- a/qml/components/IntegerInputDialog.qml +++ b/qml/components/IntegerInputDialog.qml @@ -20,10 +20,9 @@ Dialog { id: valueField validator: IntValidator{bottom: min; top: max;} width: parent.width - placeholderText: ""+min+"-"+max + placeholderText: ""+min+"-"+(max == 65535 ? "..." : max) label: title focus: true - labelVisible: true inputMethodHints: Qt.ImhDigitsOnly } diff --git a/qml/components/IntegerSetting.qml b/qml/components/IntegerSetting.qml index 8936df1..ef74c40 100644 --- a/qml/components/IntegerSetting.qml +++ b/qml/components/IntegerSetting.qml @@ -53,7 +53,7 @@ Setting { anchors.right: parent.right icon.source: "image://theme/icon-s-edit" onClicked: {var dialog = pageStack.push(Qt.resolvedUrl("IntegerInputDialog.qml"), - {value: choice, title: prettyName, + {title: prettyName, min: low, max: high}); dialog.accepted.connect(function() { choice = dialog.value; diff --git a/qml/components/RangeSetting.qml b/qml/components/RangeSetting.qml index 265c850..33c5a14 100644 --- a/qml/components/RangeSetting.qml +++ b/qml/components/RangeSetting.qml @@ -104,7 +104,7 @@ Setting { anchors.right: parent.right icon.source: "image://theme/icon-s-edit" onClicked: {var dialog = pageStack.push(Qt.resolvedUrl("IntegerInputDialog.qml"), - {value: choice, title: prettyName, + {title: prettyName + " (" + qsTr("Low") + ")", min: 1, max: high}); dialog.accepted.connect(function() { choice_low = dialog.value; @@ -132,7 +132,7 @@ Setting { anchors.right: parent.right icon.source: "image://theme/icon-s-edit" onClicked: {var dialog = pageStack.push(Qt.resolvedUrl("IntegerInputDialog.qml"), - {value: choice, title: prettyName, + {title: prettyName + " (" + qsTr("High") + ")", min: 1, max: high}); dialog.accepted.connect(function() { choice_high = dialog.value; diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts index b5d53d3..2847049 100644 --- a/translations/harbour-seaprint-de.ts +++ b/translations/harbour-seaprint-de.ts @@ -535,6 +535,14 @@ auf diesem Drucker Advanced Fortgeschrittene + + Low + + + + High + + Setting diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts index bbca890..85068b6 100644 --- a/translations/harbour-seaprint-es.ts +++ b/translations/harbour-seaprint-es.ts @@ -534,6 +534,14 @@ Advanced + + Low + + + + High + + Setting diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts index 11d630d..ac91ad2 100644 --- a/translations/harbour-seaprint-fr.ts +++ b/translations/harbour-seaprint-fr.ts @@ -535,6 +535,14 @@ sur cette imprimante Advanced + + Low + + + + High + + Setting diff --git a/translations/harbour-seaprint-nl.ts b/translations/harbour-seaprint-nl.ts index 6e52d53..7cb8874 100644 --- a/translations/harbour-seaprint-nl.ts +++ b/translations/harbour-seaprint-nl.ts @@ -534,6 +534,14 @@ Advanced + + Low + + + + High + + Setting diff --git a/translations/harbour-seaprint-pl.ts b/translations/harbour-seaprint-pl.ts index 20827ef..87efccc 100644 --- a/translations/harbour-seaprint-pl.ts +++ b/translations/harbour-seaprint-pl.ts @@ -534,6 +534,14 @@ Advanced + + Low + + + + High + + Setting diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts index 941b4c2..f8d141b 100644 --- a/translations/harbour-seaprint-zh_CN.ts +++ b/translations/harbour-seaprint-zh_CN.ts @@ -534,6 +534,14 @@ Advanced + + Low + + + + High + + Setting diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts index 673d532..a962fc7 100644 --- a/translations/harbour-seaprint.ts +++ b/translations/harbour-seaprint.ts @@ -534,6 +534,14 @@ Advanced + + Low + + + + High + + Setting