From 4517edd8945664a3d2a1474d40c159b4fdaea291 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 16 Nov 2020 15:50:04 +0100
Subject: [PATCH] Reduce clutter in System preferences

Vertically align some more things.

Change-Id: I6f106369252035e07a4b56e4b5b8f066b2338cb0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/coreplugin/systemsettings.cpp |   5 +-
 src/plugins/coreplugin/systemsettings.ui  | 224 ++++++++++------------
 2 files changed, 108 insertions(+), 121 deletions(-)

diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp
index 4d4234e6259..109ce4fc9fe 100644
--- a/src/plugins/coreplugin/systemsettings.cpp
+++ b/src/plugins/coreplugin/systemsettings.cpp
@@ -87,9 +87,7 @@ public:
             m_ui.externalFileBrowserEdit->setText(UnixUtils::fileBrowser(ICore::settings()));
         } else {
             m_ui.externalFileBrowserLabel->hide();
-            m_ui.externalFileBrowserEdit->hide();
-            m_ui.resetFileBrowserButton->hide();
-            m_ui.helpExternalFileBrowserButton->hide();
+            m_ui.externalFileBrowserWidget->hide();
         }
 
         const QString patchToolTip = tr("Command used for reverting diff chunks.");
@@ -149,6 +147,7 @@ public:
             else
                 m_ui.fileSystemCaseSensitivityChooser->setCurrentIndex(1);
         } else {
+            m_ui.fileSystemCaseSensitivityLabel->hide();
             m_ui.fileSystemCaseSensitivityWidget->hide();
         }
 
diff --git a/src/plugins/coreplugin/systemsettings.ui b/src/plugins/coreplugin/systemsettings.ui
index 769a8e04c98..1e9a2f9d857 100644
--- a/src/plugins/coreplugin/systemsettings.ui
+++ b/src/plugins/coreplugin/systemsettings.ui
@@ -24,7 +24,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item row="0" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_8">
         <item>
          <widget class="QComboBox" name="terminalComboBox">
@@ -55,18 +55,18 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QPushButton" name="resetTerminalButton">
+          <property name="toolTip">
+           <string comment="Terminal">Reset to default.</string>
+          </property>
+          <property name="text">
+           <string>Reset</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="resetTerminalButton">
-        <property name="toolTip">
-         <string comment="Terminal">Reset to default.</string>
-        </property>
-        <property name="text">
-         <string>Reset</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="externalFileBrowserLabel">
         <property name="text">
@@ -74,24 +74,42 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="externalFileBrowserEdit"/>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="resetFileBrowserButton">
-        <property name="toolTip">
-         <string comment="File Browser">Reset to default.</string>
-        </property>
-        <property name="text">
-         <string>Reset</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QToolButton" name="helpExternalFileBrowserButton">
-        <property name="text">
-         <string>?</string>
-        </property>
+      <item row="1" column="1" colspan="2">
+       <widget class="QWidget" name="externalFileBrowserWidget" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_9">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="externalFileBrowserEdit"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="resetFileBrowserButton">
+           <property name="toolTip">
+            <string comment="File Browser">Reset to default.</string>
+           </property>
+           <property name="text">
+            <string>Reset</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="helpExternalFileBrowserButton">
+           <property name="text">
+            <string>?</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="2" column="0">
@@ -104,7 +122,17 @@
       <item row="2" column="1" colspan="2">
        <widget class="Utils::PathChooser" name="patchChooser" native="true"/>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="3" column="0">
+       <widget class="QLabel" name="fileSystemCaseSensitivityLabel">
+        <property name="toolTip">
+         <string>Influences how file names are matched to decide if they are the same.</string>
+        </property>
+        <property name="text">
+         <string>File system case sensitivity:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
        <widget class="QWidget" name="fileSystemCaseSensitivityWidget" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <property name="leftMargin">
@@ -119,27 +147,17 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="toolTip">
-            <string>Influences how file names are matched to decide if they are the same.</string>
-           </property>
-           <property name="text">
-            <string>File system case sensitivity:</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QComboBox" name="fileSystemCaseSensitivityChooser"/>
          </item>
          <item>
-          <spacer name="horizontalSpacer">
+          <spacer name="fileSystemCaseSensitivitySpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>202</width>
              <height>20</height>
             </size>
            </property>
@@ -148,15 +166,15 @@
         </layout>
        </widget>
       </item>
-      <item row="4" column="0" colspan="4">
+      <item row="4" column="0">
+       <widget class="QLabel" name="modifiedLabel">
+        <property name="text">
+         <string>When files are externally modified:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="modifiedLabel">
-          <property name="text">
-           <string>When files are externally modified:</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QComboBox" name="reloadBehavior">
           <property name="currentIndex">
@@ -194,34 +212,18 @@
         </item>
        </layout>
       </item>
-      <item row="5" column="0" colspan="3">
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="autoSaveCheckBox">
+        <property name="text">
+         <string>Auto-save modified files</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
-         <widget class="QCheckBox" name="autoSaveCheckBox">
-          <property name="text">
-           <string>Auto-save modified files</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_6">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item>
          <widget class="QLabel" name="autoSaveIntervalLabel">
           <property name="text">
@@ -254,34 +256,21 @@
         </item>
        </layout>
       </item>
-      <item row="6" column="0" colspan="4">
+      <item row="6" column="0">
+       <widget class="QCheckBox" name="autoSuspendCheckBox">
+        <property name="toolTip">
+         <string>Automatically free resources of old documents that are not visible and not modified. They stay visible in the list of open documents.</string>
+        </property>
+        <property name="text">
+         <string>Auto-suspend unmodified files</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QCheckBox" name="autoSuspendCheckBox">
-          <property name="toolTip">
-           <string>Automatically free resources of old documents that are not visible and not modified. They stay visible in the list of open documents.</string>
-          </property>
-          <property name="text">
-           <string>Auto-suspend unmodified files</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_7">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item>
          <widget class="QLabel" name="autoSuspendLabel">
           <property name="toolTip">
@@ -363,15 +352,15 @@
         </item>
        </layout>
       </item>
-      <item row="8" column="0" colspan="3">
+      <item row="8" column="0" colspan="2">
+       <widget class="QLabel" name="maxRecentFilesLabel">
+        <property name="text">
+         <string>Maximum number of entries in &quot;Recent Files&quot;:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="2">
        <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <item>
-         <widget class="QLabel" name="maxRecentFilesLabel">
-          <property name="text">
-           <string>Maximum number of entries in &quot;Recent Files&quot;:</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QSpinBox" name="maxRecentFilesSpinBox"/>
         </item>
@@ -393,11 +382,11 @@
       <item row="9" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_7">
         <item>
-          <widget class="QCheckBox" name="askBeforeExitCheckBox">
-           <property name="text">
-            <string>Ask for confirmation before exiting</string>
-           </property>
-          </widget>
+         <widget class="QCheckBox" name="askBeforeExitCheckBox">
+          <property name="text">
+           <string>Ask for confirmation before exiting</string>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
@@ -436,7 +425,6 @@
   <tabstop>externalFileBrowserEdit</tabstop>
   <tabstop>resetFileBrowserButton</tabstop>
   <tabstop>helpExternalFileBrowserButton</tabstop>
-  <tabstop>fileSystemCaseSensitivityChooser</tabstop>
   <tabstop>reloadBehavior</tabstop>
   <tabstop>autoSaveCheckBox</tabstop>
   <tabstop>autoSaveInterval</tabstop>