[Libreoffice-commits] core.git: bin/ui-rules-enforcer.py sd/uiconfig sw/uiconfig

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 14 18:42:45 UTC 2021


 bin/ui-rules-enforcer.py                         |   13 +++++++++++++
 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |    4 ----
 sw/uiconfig/swriter/ui/renameautotextdialog.ui   |    4 ----
 3 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit b1d6c3921002a15a8a34f7725b73ebaaa5bafe48
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 14 16:20:22 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 14 20:41:59 2021 +0200

    remove double-buffered properties
    
    these are all fat fingered in somehow or another
    
    Change-Id: I0864a5622a244d5e60b368ddc425fc5a9b019060
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117176
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py
index 922631d739c3..984735d1a520 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -207,6 +207,18 @@ def remove_track_visited_links(current):
   if track_visited_links != None:
     current.remove(track_visited_links)
 
+def remove_double_buffered(current):
+  double_buffered = None
+  for child in current:
+    remove_double_buffered(child)
+    if child.tag == "property":
+      attributes = child.attrib
+      if attributes.get("name") == "double_buffered" or attributes.get("name") == "double-buffered":
+        double_buffered = child
+
+  if double_buffered != None:
+    current.remove(double_buffered)
+
 def remove_label_fill(current):
   label_fill = None
   isexpander = current.get('class') == "GtkExpander"
@@ -309,6 +321,7 @@ remove_track_visited_links(root)
 remove_label_fill(root)
 enforce_menubutton_indicator_consistency(root)
 enforce_active_in_group_consistency(root)
+remove_double_buffered(root)
 
 with open(sys.argv[1], 'wb') as o:
   # without encoding='unicode' (and the matching encode("utf8")) we get &#XXXX replacements for non-ascii characters
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 9ef705a080b8..51448f5eda2d 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -322,7 +322,6 @@
                   <object class="GtkLabel" id="tapstoplabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="double-buffered">False</property>
                     <property name="label" translatable="yes" context="optimpressgeneralpage|tapstoplabel">Ta_b stops:</property>
                     <property name="use-underline">True</property>
                     <property name="justify">fill</property>
@@ -386,7 +385,6 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="double-buffered">False</property>
                 <property name="use-underline">True</property>
                 <property name="draw-indicator">True</property>
               </object>
@@ -518,7 +516,6 @@
           <object class="GtkGrid" id="grid7">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="double-buffered">False</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
             <property name="row-spacing">6</property>
@@ -527,7 +524,6 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="double-buffered">False</property>
                 <property name="margin-end">3</property>
                 <property name="label" translatable="yes" context="optimpressgeneralpage|label8">_Drawing scale:</property>
                 <property name="use-underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/renameautotextdialog.ui b/sw/uiconfig/swriter/ui/renameautotextdialog.ui
index 5134b1f7d677..7a48e2ef8df5 100644
--- a/sw/uiconfig/swriter/ui/renameautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/renameautotextdialog.ui
@@ -77,7 +77,6 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="double_buffered">False</property>
                     <property name="label" translatable="yes" context="renameautotextdialog|label2">Na_me</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">oldname</property>
@@ -92,7 +91,6 @@
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="double_buffered">False</property>
                     <property name="label" translatable="yes" context="renameautotextdialog|label3">_New</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">newname</property>
@@ -160,7 +158,6 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="double_buffered">False</property>
                     <property name="label" translatable="yes" context="renameautotextdialog|label4">Short_cut</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">oldsc</property>
@@ -175,7 +172,6 @@
                   <object class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="double_buffered">False</property>
                     <property name="label" translatable="yes" context="renameautotextdialog|label5">_Shortcut</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">newsc</property>


More information about the Libreoffice-commits mailing list