From 6296b9a1a415d7e9f3674ba73d09e4b5c72cae2e Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 16 Nov 2022 15:11:43 +0100
Subject: [PATCH] QmlDesigner: Add option for Always auto-format ui.qml files
 in Design mode

Task-number: QDS-8170
Change-Id: I6e345c69e60a19fd8eb7a505d7f64cb5fd664c88
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/qmldesigner/settingspage.cpp |  6 ++++++
 src/plugins/qmldesigner/settingspage.ui  | 27 +++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 02e775c5987..1e107f8996f 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -164,6 +164,9 @@ QHash<QByteArray, QVariant> SettingsPageWidget::newSettings() const
                     m_ui.askBeforeDeletingAssetCheckBox->isChecked());
     settings.insert(DesignerSettingsKey::SMOOTH_RENDERING, m_ui.smoothRendering->isChecked());
 
+    settings.insert(DesignerSettingsKey::REFORMAT_UI_QML_FILES,
+                    m_ui.alwaysAutoFormatUICheckBox->isChecked());
+
     return settings;
 }
 
@@ -248,6 +251,9 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings)
     m_ui.debugGroupBox->setVisible(showAdvancedFeatures);
     m_ui.featureTimelineEditorCheckBox->setVisible(standaloneMode);
     m_ui.smoothRendering->setChecked(settings.value(DesignerSettingsKey::SMOOTH_RENDERING).toBool());
+
+    m_ui.alwaysAutoFormatUICheckBox->setChecked(
+        settings.value(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool());
 }
 
 void SettingsPageWidget::apply()
diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui
index 2e7c9516554..37057546df7 100644
--- a/src/plugins/qmldesigner/settingspage.ui
+++ b/src/plugins/qmldesigner/settingspage.ui
@@ -264,7 +264,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Utils::PathChooser" name="fallbackPuppetPathLineEdit" native="true">
+         <widget class="Utils::PathChooser" name="fallbackPuppetPathLineEdit">
           <property name="enabled">
            <bool>true</bool>
           </property>
@@ -305,7 +305,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Utils::PathChooser" name="puppetBuildPathLineEdit" native="true">
+         <widget class="Utils::PathChooser" name="puppetBuildPathLineEdit">
           <property name="enabled">
            <bool>true</bool>
           </property>
@@ -433,13 +433,6 @@
       <string>Features</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="featureTimelineEditorCheckBox">
-        <property name="text">
-         <string>Enable Timeline editor</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QCheckBox" name="designerAlwaysDesignModeCheckBox">
         <property name="text">
@@ -447,13 +440,27 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QCheckBox" name="askBeforeDeletingAssetCheckBox">
         <property name="text">
          <string>Ask for confirmation before deleting asset</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="alwaysAutoFormatUICheckBox">
+        <property name="text">
+         <string>Always auto-format ui.qml files in Design mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="featureTimelineEditorCheckBox">
+        <property name="text">
+         <string>Enable Timeline editor</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>