Revert "Reverts a commit series that cripple windows ci."

with addition of...

- svxlo-SvxColorListBox
+ svxcorelo-SvxColorListBox

This reverts commit db380aab1063e8a5e40111c40ee9f7921aa82601.

Change-Id: I3af7aa0abb1a430bce64188244404fcbd480b128
Reviewed-on: https://gerrit.libreoffice.org/30598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 62 insertions, 30 deletions

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 9482562f83a6..444797ff9714 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -13,9 +13,14 @@
     <property name="can_focus">False</property>
     <property name="margin_right">6</property>
     <property name="xalign">0</property>
-    <property name="pixbuf">cmd/sc_colorsettings.png</property>
+    <property name="pixbuf">cmd/sc_square_unfilled.png</property>
     <property name="icon_size">1</property>
   </object>
+  <object class="GtkImage" id="none_icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">cmd/sc_square_unfilled.png</property>
+  </object>
   <object class="GtkWindow" id="palette_popup_window">
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
@@ -25,7 +30,6 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
     <property name="skip_pager_hint">True</property>
-    <property name="decorated">False</property>
     <property name="deletable">False</property>
     <child>
       <object class="GtkBox" id="box1">
@@ -33,13 +37,41 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkButton" id="auto_color_button">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="image">auto_icon</property>
-            <property name="relief">none</property>
-            <property name="xalign">0</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkButton" id="auto_color_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">auto_icon</property>
+                <property name="relief">none</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="none_color_button">
+                <property name="label" translatable="yes">None</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">none_icon</property>
+                <property name="relief">none</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui
index e3856ffbd3ca..b468ce2a076d 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1089,7 +1089,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="ambientcolor">
+                      <object class="svxcorelo-SvxColorListBox" id="ambientcolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -1250,7 +1250,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor1">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="valign">start</property>
@@ -1263,7 +1263,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor2">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor2">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1276,7 +1276,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor3">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor3">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1289,7 +1289,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor4">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor4">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1302,7 +1302,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor5">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor5">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1315,7 +1315,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor6">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor6">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1328,7 +1328,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor7">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor7">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1341,7 +1341,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-ColorLB" id="lightcolor8">
+                          <object class="svxcorelo-SvxColorListBox" id="lightcolor8">
                             <property name="can_focus">False</property>
                             <property name="no_show_all">True</property>
                             <property name="valign">start</property>
@@ -1721,7 +1721,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="objcolor">
+                      <object class="svxcorelo-SvxColorListBox" id="objcolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -1733,7 +1733,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="illumcolor">
+                      <object class="svxcorelo-SvxColorListBox" id="illumcolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
@@ -1856,7 +1856,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="speccolor">
+                      <object class="svxcorelo-SvxColorListBox" id="speccolor">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">center</property>
diff --git a/svx/uiconfig/ui/dockingcolorreplace.ui b/svx/uiconfig/ui/dockingcolorreplace.ui
index 778c740f38bc..c74b4618e385 100644
--- a/svx/uiconfig/ui/dockingcolorreplace.ui
+++ b/svx/uiconfig/ui/dockingcolorreplace.ui
@@ -241,7 +241,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="color1">
+                      <object class="svxcorelo-SvxColorListBox" id="color1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -257,7 +257,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="color2">
+                      <object class="svxcorelo-SvxColorListBox" id="color2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -273,7 +273,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="color3">
+                      <object class="svxcorelo-SvxColorListBox" id="color3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -289,7 +289,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="color4">
+                      <object class="svxcorelo-SvxColorListBox" id="color4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -305,7 +305,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-ColorLB" id="color5">
+                      <object class="svxcorelo-SvxColorListBox" id="color5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
diff --git a/svx/uiconfig/ui/dockingfontwork.ui b/svx/uiconfig/ui/dockingfontwork.ui
index 0c729be1b10e..32ab55392784 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -437,7 +437,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-ColorLB" id="color">
+          <object class="svxcorelo-SvxColorListBox" id="color">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="tooltip_text" translatable="yes">Shadow Color</property>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index e85fe45dfa20..79bc5b65a520 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -100,7 +100,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-ColorLB" id="fillgrad1">
+                  <object class="svxcorelo-SvxColorListBox" id="fillgrad1">
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_text" translatable="yes">Fill gradient from.</property>
@@ -144,7 +144,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxlo-ColorLB" id="fillgrad2">
+              <object class="svxcorelo-SvxColorListBox" id="fillgrad2">
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
                 <property name="tooltip_text" translatable="yes">Fill gradient to.</property>
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index 0b2e8cf6d48b..31531ab823b1 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -184,7 +184,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo-ColorLB" id="LB_SHADOW_COLOR">
+                  <object class="svxcorelo-SvxColorListBox" id="LB_SHADOW_COLOR">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>