From 43bc3031483d172eccd72c3804e2d4fc2ef37de4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 28 Oct 2016 13:37:33 +0100
Subject: unify color selectors

Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.

Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
---
 sc/uiconfig/scalc/ui/conditionalentry.ui |  6 +++---
 sc/uiconfig/scalc/ui/databaroptions.ui   | 17 +++--------------
 sc/uiconfig/scalc/ui/optchangespage.ui   |  8 ++++----
 sc/uiconfig/scalc/ui/scenariodialog.ui   |  2 +-
 sc/uiconfig/scalc/ui/tpviewpage.ui       |  2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)

(limited to 'sc/uiconfig')

diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui
index 86d18e199b5a..a7f4f1402f20 100644
--- a/sc/uiconfig/scalc/ui/conditionalentry.ui
+++ b/sc/uiconfig/scalc/ui/conditionalentry.ui
@@ -131,7 +131,7 @@
           </packing>
         </child>
         <child>
-          <object class="svtlo-ColorListBox" id="lbcolmin">
+          <object class="svxlo-SvxColorListBox" id="lbcolmin">
             <property name="can_focus">False</property>
           </object>
           <packing>
@@ -140,7 +140,7 @@
           </packing>
         </child>
         <child>
-          <object class="svtlo-ColorListBox" id="lbcolmiddle">
+          <object class="svxlo-SvxColorListBox" id="lbcolmiddle">
             <property name="can_focus">False</property>
           </object>
           <packing>
@@ -149,7 +149,7 @@
           </packing>
         </child>
         <child>
-          <object class="svtlo-ColorListBox" id="lbcolmax">
+          <object class="svxlo-SvxColorListBox" id="lbcolmax">
             <property name="can_focus">False</property>
           </object>
           <packing>
diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui
index c2a4ae233281..0624e8b55e2c 100644
--- a/sc/uiconfig/scalc/ui/databaroptions.ui
+++ b/sc/uiconfig/scalc/ui/databaroptions.ui
@@ -241,7 +241,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ColorListBox" id="positive_colour">
+                          <object class="svxlo-SvxColorListBox" id="positive_colour">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -252,7 +252,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ColorListBox" id="negative_colour">
+                          <object class="svxlo-SvxColorListBox" id="negative_colour">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -374,7 +374,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo-ColorListBox" id="axis_colour">
+                          <object class="svxlo-SvxColorListBox" id="axis_colour">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -523,17 +523,6 @@
                 <property name="position">5</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="custom_color">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/optchangespage.ui b/sc/uiconfig/scalc/ui/optchangespage.ui
index df83ce92437f..7d4bba5bded0 100644
--- a/sc/uiconfig/scalc/ui/optchangespage.ui
+++ b/sc/uiconfig/scalc/ui/optchangespage.ui
@@ -87,7 +87,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-ColorLB" id="changes">
+                  <object class="svxlo-SvxColorListBox" id="changes">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -97,7 +97,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-ColorLB" id="deletions">
+                  <object class="svxlo-SvxColorListBox" id="deletions">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -107,7 +107,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-ColorLB" id="entries">
+                  <object class="svxlo-SvxColorListBox" id="entries">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -117,7 +117,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-ColorLB" id="insertions">
+                  <object class="svxlo-SvxColorListBox" id="insertions">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
diff --git a/sc/uiconfig/scalc/ui/scenariodialog.ui b/sc/uiconfig/scalc/ui/scenariodialog.ui
index 846c05e4691f..ece0490e4b48 100644
--- a/sc/uiconfig/scalc/ui/scenariodialog.ui
+++ b/sc/uiconfig/scalc/ui/scenariodialog.ui
@@ -253,7 +253,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="svtlo-ColorListBox" id="bordercolor">
+                              <object class="svxlo-SvxColorListBox" id="bordercolor">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <accessibility>
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 1e39a39f2ea0..9d1591ec3966 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -345,7 +345,7 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="svxlo-ColorLB" id="color">
+                          <object class="svxlo-SvxColorListBox" id="color">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-- 
cgit