From 5f480df5abc0c8f20d074f89c80ceef9cb58789a Mon Sep 17 00:00:00 2001 From: adrian-kong <35755741+adrian-kong@users.noreply.github.com> Date: Sat, 13 May 2023 13:44:37 +1000 Subject: [PATCH 1/5] [backport] allow comma in settings pane --- resources/SettingsTabComponents/SettingsPane.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index 2ca7c41c1..0d9295298 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -357,7 +357,8 @@ Rectangle { anchors.centerIn: parent anchors.verticalCenterOffset: 5 onEditingFinished: { - backend_request_broker.settings_write_request(settingGroup, settingName, text); + let isNumericField = settingType === "float" || settingType === "double"; + backend_request_broker.settings_write_request(settingGroup, settingName, isNumericField ? text.replace(",", ".") : text); } validator: { if (settingType === "integer") @@ -401,13 +402,15 @@ Rectangle { } - floatValidator: DoubleValidator { + floatValidator: RegExpValidator { + regExp: /[-+]?[0-9]*[.,]?[0-9]+/ } intValidator: IntValidator { } stringValidator: RegExpValidator { + regExp: /[-+]?[0-9]*[.,]?[0-9]+/ } } From d2023838da92c5326dd9e193e252d813a730cb58 Mon Sep 17 00:00:00 2001 From: adrian-kong <35755741+adrian-kong@users.noreply.github.com> Date: Sat, 13 May 2023 13:54:43 +1000 Subject: [PATCH 2/5] clipy --- resources/SettingsTabComponents/SettingsPane.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index 0d9295298..fd64a3500 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -357,7 +357,7 @@ Rectangle { anchors.centerIn: parent anchors.verticalCenterOffset: 5 onEditingFinished: { - let isNumericField = settingType === "float" || settingType === "double"; + let isNumericField = settingType === "float" || settingType === "double"; backend_request_broker.settings_write_request(settingGroup, settingName, isNumericField ? text.replace(",", ".") : text); } validator: { From a8dbae08112202999aa137b0f8f13eca05c04464 Mon Sep 17 00:00:00 2001 From: adrian-kong <35755741+adrian-kong@users.noreply.github.com> Date: Sat, 13 May 2023 13:55:06 +1000 Subject: [PATCH 3/5] clipy --- resources/SettingsTabComponents/SettingsPane.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index fd64a3500..95f35a6b3 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -403,7 +403,7 @@ Rectangle { } floatValidator: RegExpValidator { - regExp: /[-+]?[0-9]*[.,]?[0-9]+/ + regExp: /[-+]?[0-9]*[.,]?[0-9]+/ } intValidator: IntValidator { From a65f683e559227bb03e7cb446c65e2d89e9f0a87 Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Mon, 15 May 2023 10:21:39 +1000 Subject: [PATCH 4/5] clippy --- resources/SettingsTabComponents/SettingsPane.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index 95f35a6b3..a8ee96f2b 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -357,7 +357,7 @@ Rectangle { anchors.centerIn: parent anchors.verticalCenterOffset: 5 onEditingFinished: { - let isNumericField = settingType === "float" || settingType === "double"; + let isNumericField = settingType === "float" || settingType === "double"; backend_request_broker.settings_write_request(settingGroup, settingName, isNumericField ? text.replace(",", ".") : text); } validator: { From c62563dae8df1fcf0bf5d8b150c6e2d4e3f9655b Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Mon, 15 May 2023 10:26:48 +1000 Subject: [PATCH 5/5] clippy --- resources/SettingsTabComponents/SettingsPane.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/SettingsTabComponents/SettingsPane.qml b/resources/SettingsTabComponents/SettingsPane.qml index a8ee96f2b..8ba7f16fb 100644 --- a/resources/SettingsTabComponents/SettingsPane.qml +++ b/resources/SettingsTabComponents/SettingsPane.qml @@ -357,7 +357,7 @@ Rectangle { anchors.centerIn: parent anchors.verticalCenterOffset: 5 onEditingFinished: { - let isNumericField = settingType === "float" || settingType === "double"; + let isNumericField = settingType === "float" || settingType === "double"; backend_request_broker.settings_write_request(settingGroup, settingName, isNumericField ? text.replace(",", ".") : text); } validator: {