diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-07-17 17:24:32 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2009-07-20 17:08:02 +0200 |
| commit | 60905c485fb132b2c949605eb2248c3ed86abc87 (patch) | |
| tree | 914c266a9405bfaaa516d2c4f883018c4c318d4a /src/plugins/texteditor/fontsettingspage.ui | |
| parent | 68c920d1d4a0792214c632d93f87dcdbd82e7d0a (diff) | |
Embedded the color scheme editor in the options dialog again
With the new representation it fits fine, and this is a bit more
convenient for the user.
Diffstat (limited to 'src/plugins/texteditor/fontsettingspage.ui')
| -rw-r--r-- | src/plugins/texteditor/fontsettingspage.ui | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui index 2ff5268962..3bf055ccfc 100644 --- a/src/plugins/texteditor/fontsettingspage.ui +++ b/src/plugins/texteditor/fontsettingspage.ui @@ -121,9 +121,9 @@ </widget> </item> <item> - <widget class="QPushButton" name="cloneButton"> + <widget class="QPushButton" name="copyButton"> <property name="text"> - <string>Clone</string> + <string>Copy</string> </property> </widget> </item> @@ -140,50 +140,28 @@ </layout> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QPushButton" name="editButton"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Edit</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>87</height> - </size> + <widget class="TextEditor::Internal::ColorSchemeEdit" name="schemeEdit" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> </property> - </spacer> + </widget> </item> </layout> </widget> </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>TextEditor::Internal::ColorSchemeEdit</class> + <extends>QWidget</extends> + <header>colorschemeedit.h</header> + <container>1</container> + </customwidget> + </customwidgets> <resources/> <connections/> </ui> |