diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-31 16:39:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-31 20:50:54 +0200 |
| commit | 87fe3110bb74df751985ef6c68d98493ff8c0451 (patch) | |
| tree | a516ed84b15a22650fab5f30d644e94fab4a50f0 | |
| parent | a8ba9ce02f8d2b1fa5639a5bcc77693652152813 (diff) | |
GtkLabel:track-visited-links was removed
but we have some uses of it, which all look accidental
Change-Id: Iccb12d904e8dc7410205735e49526b73bb81083e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116488
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 1 | ||||
| -rwxr-xr-x | bin/ui-rules-enforcer.py | 16 | ||||
| -rw-r--r-- | cui/uiconfig/ui/eventassignpage.ui | 1 | ||||
| -rw-r--r-- | cui/uiconfig/ui/macroselectordialog.ui | 1 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/regressiondialog.ui | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 1 |
6 files changed, 16 insertions, 5 deletions
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index ff6a0890450a..2f700a31fab0 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -166,7 +166,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property> <property name="ellipsize">end</property> - <property name="track_visited_links">False</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py index e981ade27b26..5e46367112cf 100755 --- a/bin/ui-rules-enforcer.py +++ b/bin/ui-rules-enforcer.py @@ -192,6 +192,21 @@ def remove_check_button_align(current): raise Exception(sys.argv[1] + ': non-default yalign', yalign.text) current.remove(yalign) +def remove_track_visited_links(current): + track_visited_links = None + islabel = current.get('class') == "GtkLabel" + for child in current: + remove_track_visited_links(child) + if not islabel: + continue + if child.tag == "property": + attributes = child.attrib + if attributes.get("name") == "track_visited_links" or attributes.get("name") == "track-visited-links": + track_visited_links = child + + if track_visited_links != None: + current.remove(track_visited_links) + with open(sys.argv[1], encoding="utf-8") as f: header = f.readline() f.seek(0) @@ -212,6 +227,7 @@ if not sys.argv[1].endswith('/multiline.ui'): # let this one alone not truncate replace_button_use_stock(root) replace_image_stock(root) remove_check_button_align(root) +remove_track_visited_links(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/cui/uiconfig/ui/eventassignpage.ui b/cui/uiconfig/ui/eventassignpage.ui index e24cb15552f5..26274e4f6a03 100644 --- a/cui/uiconfig/ui/eventassignpage.ui +++ b/cui/uiconfig/ui/eventassignpage.ui @@ -319,7 +319,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="eventassignpage|existingmacrosft">Existing Macros</property> - <property name="track_visited_links">False</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui index 4b502ddfaa96..624d853ec035 100644 --- a/cui/uiconfig/ui/macroselectordialog.ui +++ b/cui/uiconfig/ui/macroselectordialog.ui @@ -241,7 +241,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="macroselectordialog|macronameft">Macro Name</property> - <property name="track_visited_links">False</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sc/uiconfig/scalc/ui/regressiondialog.ui b/sc/uiconfig/scalc/ui/regressiondialog.ui index 02063b1f9200..38771503dc8f 100644 --- a/sc/uiconfig/scalc/ui/regressiondialog.ui +++ b/sc/uiconfig/scalc/ui/regressiondialog.ui @@ -500,7 +500,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="wrap">True</property> - <property name="track_visited_links">False</property> </object> <packing> <property name="expand">True</property> diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 9d16fd74d966..9ef705a080b8 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -327,7 +327,6 @@ <property name="use-underline">True</property> <property name="justify">fill</property> <property name="mnemonic-widget">metricFields</property> - <property name="track-visited-links">False</property> <property name="xalign">0</property> </object> <packing> |