Proper highlight colors.

https://bugzilla.gnome.org/show_bug.cgi?id=622246

2 files changed, 65 insertions, 35 deletions

diff --git a/data/caribou-prefs.ui b/data/caribou-prefs.ui
index 6c4a029..8ebb0d5 100644
--- a/data/caribou-prefs.ui
+++ b/data/caribou-prefs.ui
@@ -244,70 +244,89 @@
                 <property name="border_width">12</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkVBox" id="vbox8">
+                  <object class="GtkTable" id="table1">
                     <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="homogeneous">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">6</property>
+                    <property name="row_spacing">6</property>
                     <child>
-                      <object class="GtkLabel" id="label4">
+                      <object class="GtkColorButton" id="normal_state_color_button">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Normal state:</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="color">#000000000000</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="label4"/>
+                        </accessibility>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">6</property>
-                        <property name="position">0</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label7">
+                      <object class="GtkColorButton" id="mouse_over_color_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="color">#000000000000</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="label7"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Mouse over:</property>
+                        <property name="label" translatable="yes">Normal state:</property>
+                        <accessibility>
+                          <relation type="label-for" target="normal_state_color_button"/>
+                        </accessibility>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="padding">6</property>
-                        <property name="position">1</property>
+                        <property name="x_options">GTK_FILL</property>
                       </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox9">
-                    <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="homogeneous">True</property>
                     <child>
-                      <object class="GtkColorButton" id="normal_state_color_button">
+                      <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="color">#000000000000</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Mouse over:</property>
+                        <accessibility>
+                          <relation type="label-for" target="mouse_over_color_button"/>
+                        </accessibility>
                       </object>
                       <packing>
-                        <property name="position">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkColorButton" id="mouse_over_color_button">
+                      <object class="GtkCheckButton" id="default_colors_checkbox">
+                        <property name="label" translatable="yes">Use Defaults</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="color">#000000000000</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="position">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
diff --git a/data/caribou.schemas b/data/caribou.schemas
index 9e0566d..e3f933e 100644
--- a/data/caribou.schemas
+++ b/data/caribou.schemas
@@ -33,5 +33,16 @@
         <long></long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/apps/caribou/osk/default_colors</key>
+      <applyto>/apps/caribou/osk/default_colors</applyto>
+      <owner>caribou</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Use the default theme colors</short>
+        <long></long>
+      </locale>
+    </schema>
   </schemalist>
 </gconfschemafile>