Disable radio buttons in color dialog if not using first tab

nyalldawson · nyalldawson · commit 6f4a28f5ffbf · 2014-09-30T20:35:55.000+10:00
diff --git a/src/gui/qgscolordialog.cpp b/src/gui/qgscolordialog.cpp
@@ -687,6 +687,18 @@ void QgsColorDialogV2::on_mSampleButton_clicked()
   setMouseTracking( true );
 }
 
+void QgsColorDialogV2::on_mTabWidget_currentChanged( int index )
+{
+  //disable radio buttons if not using the first tab, as they have no meaning for other tabs
+  bool enabled = index == 0;
+  mRedRadio->setEnabled( enabled );
+  mBlueRadio->setEnabled( enabled );
+  mGreenRadio->setEnabled( enabled );
+  mHueRadio->setEnabled( enabled );
+  mSaturationRadio->setEnabled( enabled );
+  mValueRadio->setEnabled( enabled );
+}
+
 void QgsColorDialogV2::saveSettings()
 {
   //save changes to scheme
diff --git a/src/gui/qgscolordialog.h b/src/gui/qgscolordialog.h
@@ -170,6 +170,7 @@ class GUI_EXPORT QgsColorDialogV2 : public QDialog, private Ui::QgsColorDialogBa
     void on_mAddCustomColorButton_clicked();
 
     void on_mSampleButton_clicked();
+    void on_mTabWidget_currentChanged( int index );
 
   private:
 
diff --git a/src/ui/qgscolordialog.ui b/src/ui/qgscolordialog.ui
@@ -25,9 +25,16 @@
      <item row="0" column="1">
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0,1">
          <item>
           <widget class="QRadioButton" name="mHueRadio">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_5">
            <property name="text">
             <string>H</string>
            </property>
@@ -39,9 +46,16 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,0,1">
          <item>
           <widget class="QRadioButton" name="mSaturationRadio">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_6">
            <property name="text">
             <string>S</string>
            </property>
@@ -53,9 +67,16 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0,1">
          <item>
           <widget class="QRadioButton" name="mValueRadio">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_7">
            <property name="text">
             <string>V</string>
            </property>
@@ -67,9 +88,16 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,1">
          <item>
           <widget class="QRadioButton" name="mRedRadio">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_8">
            <property name="text">
             <string>R</string>
            </property>
@@ -81,9 +109,16 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1">
          <item>
           <widget class="QRadioButton" name="mGreenRadio">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_9">
            <property name="text">
             <string>G</string>
            </property>
@@ -95,9 +130,16 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,1">
          <item>
           <widget class="QRadioButton" name="mBlueRadio">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_10">
            <property name="text">
             <string>B</string>
            </property>
