diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2011-06-08 10:45:26 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-06-08 13:27:52 +0200 |
| commit | 2fad22c0306974ce1b4a21e9fbc3c5e8840aeff1 (patch) | |
| tree | c1f156df1a80547391659ea28e20a8ac3a1d6e52 /src/plugins/projectexplorer/editorsettingspropertiespage.ui | |
| parent | e436768127798d456f8dee8aa4187d8c293e8b1a (diff) | |
| download | qt-creator-2fad22c0306974ce1b4a21e9fbc3c5e8840aeff1.tar.gz | |
Add restore fallback functionality, make better tr()
Task-number: QTCREATORBUG-5025
Change-Id: Ia3f6fa2380dd1a93f120873f584662a267ca4d50
Reviewed-on: http://codereview.qt.nokia.com/360
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/editorsettingspropertiespage.ui')
| -rw-r--r-- | src/plugins/projectexplorer/editorsettingspropertiespage.ui | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.ui b/src/plugins/projectexplorer/editorsettingspropertiespage.ui index ce01078784..15d4fe5f34 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.ui +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.ui @@ -6,35 +6,56 @@ <rect> <x>0</x> <y>0</y> - <width>368</width> - <height>98</height> + <width>401</width> + <height>111</height> </rect> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="useGlobalCheckBox"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Use global settings</string> + <string>Editor settings:</string> </property> </widget> </item> - <item row="1" column="0" colspan="3"> - <widget class="TextEditor::BehaviorSettingsWidget" name="behaviorSettingsWidget" native="true"/> + <item row="0" column="1"> + <widget class="QComboBox" name="globalSelector"> + <item> + <property name="text"> + <string>Global</string> + </property> + </item> + <item> + <property name="text"> + <string>Custom</string> + </property> + </item> + </widget> + </item> + <item row="0" column="2"> + <widget class="QPushButton" name="restoreButton"> + <property name="text"> + <string>Restore Global</string> + </property> + </widget> </item> - <item row="2" column="0" colspan="2"> + <item row="0" column="3"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>224</width> + <width>3</width> <height>20</height> </size> </property> </spacer> </item> - <item row="3" column="1"> + <item row="1" column="0" colspan="4"> + <widget class="TextEditor::BehaviorSettingsWidget" name="behaviorSettingsWidget" native="true"/> + </item> + <item row="2" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -47,13 +68,6 @@ </property> </spacer> </item> - <item row="2" column="2"> - <widget class="QPushButton" name="restoreButton"> - <property name="text"> - <string>Restore Global Values</string> - </property> - </widget> - </item> </layout> </widget> <customwidgets> |