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

GeneralSettings: Sort items

Browse Source 
Layout is identical.

Change-Id: Ic6e0bfffdeed634bd5ff89b9000a66f201462c99
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2013-01-10 20:45:28 +02:00
committed by hjk
parent 2106d24459
commit ff288af50b
1 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
src/plugins/coreplugin/generalsettings.ui
View File

@@ -17,13 +17,66 @@
<string>User Interface</string> <string>User Interface</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="colorLabel"> <widget class="QLabel" name="colorLabel">
<property name="text">
<string>Color:</string>
</property>
<property name="buddy">
<cstring>colorButton</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="Utils::QtColorButton" name="colorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>64</width>
<height>0</height>
</size>
</property>
<property name="alphaAllowed" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="resetColorButton">
<property name="toolTip">
<string comment="Color">Reset to default.</string>
</property>
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>285</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="languageLabel">
<property name="text"> <property name="text">
<string>Color:</string> <string>Language:</string>
</property>
<property name="buddy">
<cstring>colorButton</cstring>
</property> </property>
</widget> </widget>
</item> </item>
@@ -54,59 +107,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="Utils::QtColorButton" name="colorButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>64</width>
<height>0</height>
</size>
</property>
<property name="alphaAllowed" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="resetColorButton">
<property name="toolTip">
<string comment="Color">Reset to default.</string>
</property>
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>285</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="languageLabel">
<property name="text">
<string>Language:</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@@ -130,6 +130,16 @@
</property> </property>
</widget> </widget>
</item> </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"> <item row="1" column="0">
<widget class="QLabel" name="externalFileBrowserLabel"> <widget class="QLabel" name="externalFileBrowserLabel">
<property name="text"> <property name="text">
@@ -140,6 +150,16 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="externalFileBrowserEdit"/> <widget class="QLineEdit" name="externalFileBrowserEdit"/>
</item> </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"> <item row="1" column="3">
<widget class="QToolButton" name="helpExternalFileBrowserButton"> <widget class="QToolButton" name="helpExternalFileBrowserButton">
<property name="text"> <property name="text">
@@ -197,26 +217,6 @@
</item> </item>
</layout> </layout>
</item> </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="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="3" column="0" colspan="4"> <item row="3" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
@@ -305,17 +305,6 @@
<header location="global">utils/qtcolorbutton.h</header> <header location="global">utils/qtcolorbutton.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops>
<tabstop>colorButton</tabstop>
<tabstop>resetColorButton</tabstop>
<tabstop>languageBox</tabstop>
<tabstop>terminalComboBox</tabstop>
<tabstop>resetTerminalButton</tabstop>
<tabstop>externalFileBrowserEdit</tabstop>
<tabstop>resetFileBrowserButton</tabstop>
<tabstop>helpExternalFileBrowserButton</tabstop>
<tabstop>reloadBehavior</tabstop>
</tabstops>
<resources> <resources>
<include location="core.qrc"/> <include location="core.qrc"/>
</resources> </resources>