Mercurial > ldforge / file diff

--- a/ui/config.ui	Wed Oct 23 13:14:17 2013 +0300
+++ b/ui/config.ui	Mon Jan 20 15:04:26 2014 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>717</width>
-    <height>328</height>
+    <height>359</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -51,7 +51,7 @@
        </item>
        <item>
         <property name="text">
-         <string>Quick colors</string>
+         <string>Color Toolbar</string>
         </property>
        </item>
        <item>
@@ -146,6 +146,27 @@
                </widget>
               </item>
               <item row="2" column="0">
+               <widget class="QLabel" name="selectedColorLabel">
+                <property name="text">
+                 <string>Selected Color</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QPushButton" name="selColorButton">
+                <property name="whatsThis">
+                 <string>This color is used for the main color.</string>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../ldforge.qrc">
+                  <normaloff>:/icons/colorselect.png</normaloff>:/icons/colorselect.png</iconset>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="0">
                <widget class="QLabel" name="label_2">
                 <property name="whatsThis">
                  <string/>
@@ -155,7 +176,7 @@
                 </property>
                </widget>
               </item>
-              <item row="2" column="1">
+              <item row="3" column="1">
                <widget class="QPushButton" name="backgroundColorButton">
                 <property name="whatsThis">
                  <string>This is the background color for the viewport.</string>
@@ -267,6 +288,13 @@
                  </widget>
                 </item>
                 <item>
+                 <widget class="QCheckBox" name="linelengths">
+                  <property name="text">
+                   <string>Display line lenghts when drawing</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
                  <widget class="QCheckBox" name="implicitFiles">
                   <property name="text">
                    <string>List implicitly loaded files</string>
@@ -458,7 +486,7 @@
 Usually this contains MainColor, EdgeColor and some auxiliary colors used to group objects.</string>
            </property>
            <property name="title">
-            <string>Quick colors</string>
+            <string>Color Toolbar</string>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_6">
             <item>