Mercurial Repositories > eric / file diff

diff -r 72f3bde98c58 -r 55030c09e142 Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>381</width>
-    <height>338</height>
+    <height>481</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -50,6 +50,22 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Result</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLineEdit" name="eResultVar">
+        <property name="toolTip">
+         <string>Enter the result variable name</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="titleGroup">
      <property name="title">
       <string>Title</string>
@@ -66,6 +82,62 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="parentGroup">
+     <property name="title">
+      <string>Parent</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="parentSelf">
+        <property name="toolTip">
+         <string>Select &quot;self&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>self</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="parentNone">
+        <property name="toolTip">
+         <string>Select &quot;None&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>None</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="parentOther">
+          <property name="toolTip">
+           <string>Select to enter a parent expression</string>
+          </property>
+          <property name="text">
+           <string>Expression:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="parentEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Enter the parent expression</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Colour</string>
@@ -217,7 +289,7 @@
       <item row="2" column="0" colspan="4">
        <widget class="QLabel" name="TextLabel2">
         <property name="text">
-         <string>Variable</string>
+         <string>Colour Variable</string>
         </property>
        </widget>
       </item>
@@ -318,7 +390,12 @@
  <tabstops>
   <tabstop>rColor</tabstop>
   <tabstop>rRGBA</tabstop>
+  <tabstop>eResultVar</tabstop>
   <tabstop>eTitle</tabstop>
+  <tabstop>parentSelf</tabstop>
+  <tabstop>parentNone</tabstop>
+  <tabstop>parentOther</tabstop>
+  <tabstop>parentEdit</tabstop>
   <tabstop>eColor</tabstop>
   <tabstop>sRed</tabstop>
   <tabstop>sGreen</tabstop>
@@ -340,8 +417,8 @@
      <y>35</y>
     </hint>
     <hint type="destinationlabel">
-     <x>36</x>
-     <y>66</y>
+     <x>45</x>
+     <y>319</y>
     </hint>
    </hints>
   </connection>
@@ -356,8 +433,8 @@
      <y>38</y>
     </hint>
     <hint type="destinationlabel">
-     <x>209</x>
-     <y>122</y>
+     <x>218</x>
+     <y>442</y>
     </hint>
    </hints>
   </connection>
@@ -368,8 +445,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>20</x>
-     <y>263</y>
+     <x>29</x>
+     <y>471</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -384,8 +461,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>76</x>
-     <y>260</y>
+     <x>85</x>
+     <y>471</y>
     </hint>
     <hint type="destinationlabel">
      <x>76</x>
@@ -393,5 +470,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>parentOther</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>parentEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>82</x>
+     <y>241</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>122</x>
+     <y>240</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>