sw/uiconfig/swriter/ui/contentcontroldlg.ui |  122 ++++++++++++----------------
 1 file changed, 55 insertions(+), 67 deletions(-)

New commits:
commit 12959054a0786811041c70173e1d4d448e85c012
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Sep 30 09:26:42 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 30 14:10:24 2022 +0200

    resave with latest glade
    
    Change-Id: I0e6b4bf7a6420e555ef72b58995055a116afd43d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140790
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/uiconfig/swriter/ui/contentcontroldlg.ui 
b/sw/uiconfig/swriter/ui/contentcontroldlg.ui
index f602bd00712c..e18078d9fc74 100644
--- a/sw/uiconfig/swriter/ui/contentcontroldlg.ui
+++ b/sw/uiconfig/swriter/ui/contentcontroldlg.ui
@@ -2,20 +2,20 @@
 <!-- Generated with glade 3.38.2 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkTreeStore" id="liststore1">
+  <object class="GtkTreeStore" id="date_liststore">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
-      <!-- column-name text2 -->
-      <column type="gchararray"/>
       <!-- column-name id -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkTreeStore" id="date_liststore">
+  <object class="GtkTreeStore" id="liststore1">
     <columns>
       <!-- column-name text -->
       <column type="gchararray"/>
+      <!-- column-name text2 -->
+      <column type="gchararray"/>
       <!-- column-name id -->
       <column type="gchararray"/>
     </columns>
@@ -42,10 +42,10 @@
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" 
context="stock">_OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -58,8 +58,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" 
context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -72,8 +72,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" 
context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -123,83 +123,84 @@
         <child>
           <object class="GtkFrame" id="checkboxframe">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
+              <!-- n-columns=3 n-rows=2 -->
               <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <child>
                   <object class="GtkLabel" id="checkboxcheckedlabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" 
context="contentcontroldlg|checkboxcheckedlabel">Checked character:</property>
                     <property 
name="mnemonic-widget">checkboxcheckedentry</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="GtkLabel" id="checkboxuncheckedlabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes" 
context="contentcontroldlg|checkboxuncheckedlabel">Unchecked 
character:</property>
                     <property 
name="mnemonic-widget">checkboxuncheckedentry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="btncheckboxchecked">
                     <property name="label" translatable="yes" 
context="contentcontroldlg|btncheckboxchecked">Select...</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">0</property>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="btncheckboxunchecked">
                     <property name="label" translatable="yes" 
context="contentcontroldlg|btncheckboxunchecked">Select...</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">2</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkEntry" id="checkboxcheckedentry">
                     <property name="visible">True</property>
+                    <property name="can-focus">True</property>
                     <property name="truncate-multiline">True</property>
-                    <property name="can_focus">True</property>
                   </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>
                   <object class="GtkEntry" id="checkboxuncheckedentry">
                     <property name="visible">True</property>
+                    <property name="can-focus">True</property>
                     <property name="truncate-multiline">True</property>
-                    <property name="can_focus">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
                   </packing>
                 </child>
               </object>
@@ -207,9 +208,9 @@
             <child type="label">
               <object class="GtkLabel" id="lblcheckbox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" 
context="contentcontroldlg|lblcheckbox">Check Box:</property>
-                <property name="use_underline">True</property>
+                <property name="use-underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -255,7 +256,6 @@
                         <property name="resizable">True</property>
                         <property name="spacing">6</property>
                         <property name="title" translatable="yes" 
context="contentcontroldlg|displayname">Display Name</property>
-                        <property name="clickable">False</property>
                         <child>
                           <object class="GtkCellRendererText" 
id="cellrenderer0"/>
                           <attributes>
@@ -269,7 +269,6 @@
                         <property name="resizable">True</property>
                         <property name="spacing">6</property>
                         <property name="title" translatable="yes" 
context="contentcontroldlg|value">Value</property>
-                        <property name="clickable">False</property>
                         <child>
                           <object class="GtkCellRendererText" 
id="cellrenderer1"/>
                           <attributes>
@@ -316,7 +315,6 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack-type">start</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -331,7 +329,6 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack-type">start</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -346,7 +343,6 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack-type">start</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -361,7 +357,6 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack-type">start</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -376,7 +371,6 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack-type">start</property>
                 <property name="position">4</property>
               </packing>
             </child>
@@ -390,35 +384,35 @@
         <child>
           <object class="GtkFrame" id="dateframe">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="list_grid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">12</property>
+                <property name="can-focus">False</property>
+                <property name="row-spacing">12</property>
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can-focus">True</property>
                     <property name="margin-start">12</property>
                     <property name="margin-top">6</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="shadow_type">in</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkTreeView" id="date_formats_treeview">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can-focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <property name="model">date_liststore</property>
-                        <property name="headers_visible">False</property>
-                        <property name="headers_clickable">False</property>
-                        <property name="search_column">0</property>
-                        <property name="show_expanders">False</property>
+                        <property name="headers-visible">False</property>
+                        <property name="headers-clickable">False</property>
+                        <property name="search-column">0</property>
+                        <property name="show-expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" 
id="treeview-selection1"/>
                         </child>
@@ -436,24 +430,18 @@
                     </child>
                   </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>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child type="label">
               <object class="GtkLabel" id="lbldate">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="label" translatable="yes" 
context="contentcontroldlg|lbldate">Date Format:</property>
-                <property name="use_underline">True</property>
+                <property name="use-underline">True</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>

Reply via email to