bin/ui-rules-enforcer.py | 12 ++++++------
sfx2/uiconfig/ui/commandpopup.ui | 1 -
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 980c3721f0eb7665a2af5d7d5c363f8b5d0c3152
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 7 09:32:36 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Sep 7 15:05:37 2022 +0200
gtk4: caps-lock-warning is gone as a property
Change-Id: I66aac55f0ebb381bc2f9f1fffbdb887d4a016005
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139588
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 6f2d56bf935f..8c222793d700 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -242,19 +242,19 @@ def remove_spin_button_input_purpose(current):
if input_purpose != None:
current.remove(input_purpose)
-def remove_spin_button_caps_lock_warning(current):
+def remove_caps_lock_warning(current):
caps_lock_warning = None
- isspinbutton = current.get('class') == "GtkSpinButton"
+ iscandidate = current.get('class') == "GtkSpinButton" or
current.get('class') == "GtkEntry"
for child in current:
- remove_spin_button_caps_lock_warning(child)
- if not isspinbutton:
+ remove_caps_lock_warning(child)
+ if not iscandidate:
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 iscandidate:
if caps_lock_warning != None:
current.remove(caps_lock_warning)
@@ -628,7 +628,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_caps_lock_warning(root)
remove_spin_button_max_length(root)
remove_track_visited_links(root)
remove_label_pad(root)
diff --git a/sfx2/uiconfig/ui/commandpopup.ui b/sfx2/uiconfig/ui/commandpopup.ui
index 9630f2994cf9..08e82423e394 100644
--- a/sfx2/uiconfig/ui/commandpopup.ui
+++ b/sfx2/uiconfig/ui/commandpopup.ui
@@ -31,7 +31,6 @@
<object class="GtkEntry" id="command_entry">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="caps-lock-warning">False</property>
<property name="truncate-multiline">True</property>
<property name="placeholder-text" translatable="yes"
context="commandpopup|entry">Search command</property>
</object>
