From 9780e05ef274e60a68c733385f2f14b53a3dc224 Mon Sep 17 00:00:00 2001
From: Ali Kianian <ali.kianian@qt.io>
Date: Wed, 13 Mar 2024 15:55:13 +0200
Subject: [PATCH] QmlDesigner: Check the validity before accepting the import
 dialog

Fixes: QDS-12068
Change-Id: I5341214b43edf8fb7d3693a861a09c7fd3461ac2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 .../collectionEditorQmlSource/ImportDialog.qml  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml
index d98b23c5ba7..21a5e4e8e04 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml
@@ -32,6 +32,11 @@ StudioControls.Dialog {
         fileName.text = ""
     }
 
+    function acceptIfIsValid() {
+        if (btnImport.enabled)
+            btnImport.onClicked()
+    }
+
     RegularExpressionValidator {
         id: fileNameValidator
         regularExpression: /^(\w[^*><?|]*)[^/\\:*><?|]$/
@@ -67,6 +72,10 @@ StudioControls.Dialog {
     contentItem: ColumnLayout {
         spacing: 2
 
+        Keys.onEnterPressed: root.acceptIfIsValid()
+        Keys.onReturnPressed: root.acceptIfIsValid()
+        Keys.onEscapePressed: root.reject()
+
         Text {
             text: qsTr("File name")
             color: StudioTheme.Values.themeTextColor
@@ -87,10 +96,6 @@ StudioControls.Dialog {
                 translationIndicator.visible: false
                 validator: fileNameValidator
 
-                Keys.onEnterPressed: btnImport.onClicked()
-                Keys.onReturnPressed: btnImport.onClicked()
-                Keys.onEscapePressed: root.reject()
-
                 onTextChanged: root.fileExists = root.backendValue.isValidUrlToImport(fileName.text)
             }
 
@@ -121,10 +126,6 @@ StudioControls.Dialog {
             validator: RegularExpressionValidator {
                 regularExpression: /^[\w ]+$/
             }
-
-            Keys.onEnterPressed: btnImport.onClicked()
-            Keys.onReturnPressed: btnImport.onClicked()
-            Keys.onEscapePressed: root.reject()
         }
 
         Spacer { implicitHeight: StudioTheme.Values.controlLabelGap }