feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Reduce clutter in System preferences

Browse Source 
Vertically align some more things.

Change-Id: I6f106369252035e07a4b56e4b5b8f066b2338cb0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2020-11-16 15:50:04 +01:00
parent 382aed1f72
commit 4517edd894
2 changed files with 108 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -87,9 +87,7 @@ public:
m_ui.externalFileBrowserEdit->setText(UnixUtils::fileBrowser(ICore::settings())); m_ui.externalFileBrowserEdit->setText(UnixUtils::fileBrowser(ICore::settings()));
} else { } else {
m_ui.externalFileBrowserLabel->hide(); m_ui.externalFileBrowserLabel->hide();
m_ui.externalFileBrowserEdit->hide(); m_ui.externalFileBrowserWidget->hide();
m_ui.resetFileBrowserButton->hide();
m_ui.helpExternalFileBrowserButton->hide();
} }
const QString patchToolTip = tr("Command used for reverting diff chunks."); const QString patchToolTip = tr("Command used for reverting diff chunks.");
@@ -149,6 +147,7 @@ public:
else else
m_ui.fileSystemCaseSensitivityChooser->setCurrentIndex(1); m_ui.fileSystemCaseSensitivityChooser->setCurrentIndex(1);
} else { } else {
m_ui.fileSystemCaseSensitivityLabel->hide();
m_ui.fileSystemCaseSensitivityWidget->hide(); m_ui.fileSystemCaseSensitivityWidget->hide();
} }

112
src/plugins/coreplugin/systemsettings.ui
View File

@@ -24,7 +24,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<item> <item>
<widget class="QComboBox" name="terminalComboBox"> <widget class="QComboBox" name="terminalComboBox">
@@ -55,9 +55,7 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="resetTerminalButton"> <widget class="QPushButton" name="resetTerminalButton">
<property name="toolTip"> <property name="toolTip">
<string comment="Terminal">Reset to default.</string> <string comment="Terminal">Reset to default.</string>
@@ -67,6 +65,8 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="externalFileBrowserLabel"> <widget class="QLabel" name="externalFileBrowserLabel">
<property name="text"> <property name="text">
@@ -74,10 +74,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <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"/> <widget class="QLineEdit" name="externalFileBrowserEdit"/>
</item> </item>
<item row="1" column="2"> <item>
<widget class="QPushButton" name="resetFileBrowserButton"> <widget class="QPushButton" name="resetFileBrowserButton">
<property name="toolTip"> <property name="toolTip">
<string comment="File Browser">Reset to default.</string> <string comment="File Browser">Reset to default.</string>
@@ -87,13 +102,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item>
<widget class="QToolButton" name="helpExternalFileBrowserButton"> <widget class="QToolButton" name="helpExternalFileBrowserButton">
<property name="text"> <property name="text">
<string>?</string> <string>?</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="patchCommandLabel"> <widget class="QLabel" name="patchCommandLabel">
<property name="text"> <property name="text">
@@ -104,7 +122,17 @@
<item row="2" column="1" colspan="2"> <item row="2" column="1" colspan="2">
<widget class="Utils::PathChooser" name="patchChooser" native="true"/> <widget class="Utils::PathChooser" name="patchChooser" native="true"/>
</item> </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"> <widget class="QWidget" name="fileSystemCaseSensitivityWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
@@ -119,27 +147,17 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </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> <item>
<widget class="QComboBox" name="fileSystemCaseSensitivityChooser"/> <widget class="QComboBox" name="fileSystemCaseSensitivityChooser"/>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="fileSystemCaseSensitivitySpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>202</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@@ -148,15 +166,15 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="4"> <item row="4" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="modifiedLabel"> <widget class="QLabel" name="modifiedLabel">
<property name="text"> <property name="text">
<string>When files are externally modified:</string> <string>When files are externally modified:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QComboBox" name="reloadBehavior"> <widget class="QComboBox" name="reloadBehavior">
<property name="currentIndex"> <property name="currentIndex">
@@ -194,9 +212,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QCheckBox" name="autoSaveCheckBox"> <widget class="QCheckBox" name="autoSaveCheckBox">
<property name="text"> <property name="text">
<string>Auto-save modified files</string> <string>Auto-save modified files</string>
@@ -206,22 +222,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="5" column="1" colspan="2">
<spacer name="horizontalSpacer_6"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<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> <item>
<widget class="QLabel" name="autoSaveIntervalLabel"> <widget class="QLabel" name="autoSaveIntervalLabel">
<property name="text"> <property name="text">
@@ -254,9 +256,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="6" column="0" colspan="4"> <item row="6" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QCheckBox" name="autoSuspendCheckBox"> <widget class="QCheckBox" name="autoSuspendCheckBox">
<property name="toolTip"> <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> <string>Automatically free resources of old documents that are not visible and not modified. They stay visible in the list of open documents.</string>
@@ -269,19 +269,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="6" column="1" colspan="2">
<spacer name="horizontalSpacer_7"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<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> <item>
<widget class="QLabel" name="autoSuspendLabel"> <widget class="QLabel" name="autoSuspendLabel">
<property name="toolTip"> <property name="toolTip">
@@ -363,15 +352,15 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="8" column="0" colspan="3"> <item row="8" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="maxRecentFilesLabel"> <widget class="QLabel" name="maxRecentFilesLabel">
<property name="text"> <property name="text">
<string>Maximum number of entries in &quot;Recent Files&quot;:</string> <string>Maximum number of entries in &quot;Recent Files&quot;:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <item>
<widget class="QSpinBox" name="maxRecentFilesSpinBox"/> <widget class="QSpinBox" name="maxRecentFilesSpinBox"/>
</item> </item>
@@ -436,7 +425,6 @@
<tabstop>externalFileBrowserEdit</tabstop> <tabstop>externalFileBrowserEdit</tabstop>
<tabstop>resetFileBrowserButton</tabstop> <tabstop>resetFileBrowserButton</tabstop>
<tabstop>helpExternalFileBrowserButton</tabstop> <tabstop>helpExternalFileBrowserButton</tabstop>
<tabstop>fileSystemCaseSensitivityChooser</tabstop>
<tabstop>reloadBehavior</tabstop> <tabstop>reloadBehavior</tabstop>
<tabstop>autoSaveCheckBox</tabstop> <tabstop>autoSaveCheckBox</tabstop>
<tabstop>autoSaveInterval</tabstop> <tabstop>autoSaveInterval</tabstop>