From 60905c485fb132b2c949605eb2248c3ed86abc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 17 Jul 2009 17:24:32 +0200
Subject: 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.
---
 src/plugins/texteditor/fontsettingspage.ui | 56 +++++++++---------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

(limited to 'src/plugins/texteditor/fontsettingspage.ui')

diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index 2ff5268962b..3bf055ccfc9 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>
-- 
cgit v1.2.3