bin/ui-rules-enforcer.py | 17 +++++++++++++++++
chart2/uiconfig/ui/tp_Trendline.ui | 2 --
extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui | 1 -
extensions/uiconfig/spropctrlr/ui/formattedsample.ui | 1 -
sfx2/uiconfig/ui/documentinfopage.ui | 1 -
5 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 58c849a94234f18eac020be66117aa2378487e2f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 29 15:53:54 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 18:03:40 2022 +0100
gtk4: remove unwanted caps-lock-warning from GtkSpinButton
Change-Id: I723b13a5b012a89379cf6984a2b0fdd44ae932f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129148
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py
index fcf2d0505b97..d39cb39c85aa 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -242,6 +242,22 @@ def remove_spin_button_input_purpose(current):
if input_purpose != None:
current.remove(input_purpose)
+def remove_spin_button_caps_lock_warning(current):
+ caps_lock_warning = None
+ isspinbutton = current.get('class') == "GtkSpinButton"
+ for child in current:
+ remove_spin_button_caps_lock_warning(child)
+ if not isspinbutton:
+ continue
+ if child.tag == "property":
+ attributes = child.attrib
+ if attributes.get("name") == "caps_lock_warning" or
attributes.get("name") == "caps-lock-warning":
+ caps_lock_warning = child
+
+ if isspinbutton:
+ if caps_lock_warning != None:
+ current.remove(caps_lock_warning)
+
def remove_spin_button_max_length(current):
max_length = None
isspinbutton = current.get('class') == "GtkSpinButton"
@@ -600,6 +616,7 @@ remove_check_button_align(root)
remove_check_button_relief(root)
remove_check_button_image_position(root)
remove_spin_button_input_purpose(root)
+remove_spin_button_caps_lock_warning(root)
remove_spin_button_max_length(root)
remove_track_visited_links(root)
remove_label_pad(root)
diff --git a/chart2/uiconfig/ui/tp_Trendline.ui
b/chart2/uiconfig/ui/tp_Trendline.ui
index 5698ed56ae83..9a385c7b925b 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -449,7 +449,6 @@
<property name="can-focus">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="caps-lock-warning">False</property>
<property
name="adjustment">adjustmentForwardBackward</property>
<property name="digits">2</property>
</object>
@@ -577,7 +576,6 @@
<property name="activates-default">True</property>
<property name="text">0</property>
<property name="truncate-multiline">True</property>
- <property name="caps-lock-warning">False</property>
<property
name="adjustment">adjustmentForwardBackward2</property>
<property name="digits">2</property>
<accessibility>
diff --git a/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui
b/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui
index 657542e7c23f..be3bd8857d52 100644
--- a/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui
+++ b/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui
@@ -13,7 +13,6 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="activates_default">True</property>
- <property name="caps_lock_warning">False</property>
<property name="adjustment">adjustmentForwardBackward</property>
<property name="truncate-multiline">True</property>
<property name="digits">2</property>
diff --git a/extensions/uiconfig/spropctrlr/ui/formattedsample.ui
b/extensions/uiconfig/spropctrlr/ui/formattedsample.ui
index 63ee0ea6bc68..60fb76e8397e 100644
--- a/extensions/uiconfig/spropctrlr/ui/formattedsample.ui
+++ b/extensions/uiconfig/spropctrlr/ui/formattedsample.ui
@@ -31,7 +31,6 @@
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="activates_default">True</property>
- <property name="caps_lock_warning">False</property>
<property name="adjustment">adjustmentForwardBackward</property>
<property name="truncate-multiline">True</property>
<property name="digits">2</property>
commit c347a949786a2ae41740849480f16ecdc7d13f8a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 29 15:46:05 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 18:03:28 2022 +0100
gtk4: stray accidental GtkAction
Change-Id: I9b0bd6608e0ead79aba8957a8e19ddd5e9094c66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129147
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui
b/sfx2/uiconfig/ui/documentinfopage.ui
index de1120caa698..f8be86a62b5e 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -484,5 +484,4 @@
</object>
</child>
</object>
- <object class="GtkAction" id="action1"/>
</interface>
