From 05c384cc087a32b65e8ecb1bdf277f1ff063c8b6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 27 Aug 2021 16:54:08 +0100
Subject: change the extra config colors to match the application ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

these extra ones are dynamically appended to the static set of the
colorconfigwin.ui so adapt them to the changes of

commit 2f706b1e91396cbe044c20fab79772dfc081a340
Date:   Fri Aug 27 11:46:57 2021 +0200

    Improve accessibility for application color settings

Change-Id: I5a458ea509dfffc147b533d38458465df18869e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121174
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 cui/uiconfig/ui/chapterfragment.ui | 31 +++++++++++++++++--------------
 cui/uiconfig/ui/colorfragment.ui   | 38 +++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 33 deletions(-)

(limited to 'cui/uiconfig')

diff --git a/cui/uiconfig/ui/chapterfragment.ui b/cui/uiconfig/ui/chapterfragment.ui
index b1179f5fbabd..6ed4fb34a71a 100644
--- a/cui/uiconfig/ui/chapterfragment.ui
+++ b/cui/uiconfig/ui/chapterfragment.ui
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
-  <!-- n-columns=1 n-rows=1 -->
-  <object class="GtkGrid" id="ChapterFragment">
+  <object class="GtkFrame" id="ChapterFragment">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
-    <property name="row_homogeneous">True</property>
+    <property name="can-focus">False</property>
+    <property name="label-xalign">0</property>
+    <property name="shadow-type">none</property>
     <child>
+      <object class="GtkBox" id="contents">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">3</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+    <child type="label">
       <object class="GtkLabel" id="chapter">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="can-focus">False</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">3</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/cui/uiconfig/ui/colorfragment.ui b/cui/uiconfig/ui/colorfragment.ui
index a0b1fa636ebe..e127bf52d58a 100644
--- a/cui/uiconfig/ui/colorfragment.ui
+++ b/cui/uiconfig/ui/colorfragment.ui
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
-  <!-- n-columns=1 n-rows=1 -->
+  <!-- n-columns=2 n-rows=1 -->
   <object class="GtkGrid" id="ColorFragment">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="row_spacing">6</property>
-    <property name="column_spacing">12</property>
-    <property name="row_homogeneous">True</property>
+    <property name="can-focus">False</property>
+    <property name="margin-start">6</property>
+    <property name="margin-end">6</property>
+    <property name="column-spacing">6</property>
+    <property name="row-homogeneous">True</property>
     <child>
       <object class="GtkLabel" id="label">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="margin-start">6</property>
-        <property name="use_underline">True</property>
-        <property name="mnemonic_widget">button</property>
+        <property name="use-underline">True</property>
+        <property name="mnemonic-widget">button</property>
         <property name="xalign">0</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkMenuButton" id="button">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
+        <property name="can-focus">True</property>
+        <property name="receives-default">False</property>
+        <property name="halign">end</property>
+        <property name="hexpand">True</property>
         <property name="xalign">0</property>
-        <property name="draw_indicator">True</property>
+        <property name="draw-indicator">True</property>
         <property name="label" translatable="no"></property>
         <child>
           <placeholder/>
         </child>
       </object>
       <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">1</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
-- 
cgit