cui/uiconfig/ui/acorreplacepage.ui | 104 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 52 deletions(-)
New commits: commit af11de36dc30df8f3f66cee7be836b6250bae4f5 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Sep 7 16:54:23 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Sep 12 09:31:23 2023 +0200 tdf#154063 allow autocorrect GtkTreeView to shrink It will allow shrinking if there is a horizontal scrollbar. We don't actually want to show a horizontal scrollbar so use "external" which vcl will ignore, and gtk not show a visible scrollbar but allow scrolling. So when we shrink it will "scroll" and the resize handler sets the column widths as we want and it works out to behave like vcl does. If this fails to work out for some reason we could put this inside some other container which can shrink as an alternative solution. Change-Id: Ic7e3ab4bff344f4ed5c1a6317644e697c9cfc395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156673 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index bf48f728b65c..0b428273a05e 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -98,7 +98,7 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="hscrollbar-policy">never</property> + <property name="hscrollbar-policy">external</property> <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="tabview"> commit d5f418077a9e257f66ab78a695e6bd73891a43e2 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Sep 7 16:42:06 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Sep 12 09:31:12 2023 +0200 resave with latest glade Change-Id: I7a721aec05f8d96d9c7ecc6c6a8e863e2265c1d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156672 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index 48015f8222b7..bf48f728b65c 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="liststore1"> @@ -12,19 +12,19 @@ <column type="gchararray"/> </columns> </object> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid" id="AcorReplacePage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="border-width">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkBox" id="buttonbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <property name="orientation">vertical</property> <property name="spacing">6</property> @@ -32,8 +32,8 @@ <object class="GtkButton" id="new"> <property name="label" translatable="yes" context="stock">_New</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> <child internal-child="accessible"> <object class="AtkObject" id="new-atkobject"> @@ -51,10 +51,10 @@ <object class="GtkButton" id="replace"> <property name="label" translatable="yes" context="acorreplacepage|replace">_Replace</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="replace-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="acorreplacepage|extended_tip|replace">Adds or replaces an entry in the replacement table.</property> @@ -71,8 +71,8 @@ <object class="GtkButton" id="delete"> <property name="label" translatable="yes" context="stock">_Delete</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> <child internal-child="accessible"> <object class="AtkObject" id="delete-atkobject"> @@ -88,30 +88,30 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <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="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="tabview"> <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="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> - <property name="fixed_height_mode">True</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="search-column">0</property> + <property name="fixed-height-mode">True</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection1"/> </child> @@ -150,18 +150,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkEntry" id="newtext"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="width_chars">25</property> <property name="activates-default">True</property> + <property name="width-chars">25</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="newtext-atkobject"> @@ -170,17 +170,17 @@ </child> </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> <child> <object class="GtkEntry" id="origtext"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="width_chars">25</property> <property name="activates-default">True</property> + <property name="width-chars">25</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="origtext-atkobject"> @@ -189,52 +189,52 @@ </child> </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="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="acorreplacepage|label1">Repla_ce</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">origtext</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">origtext</property> <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> </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="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="acorreplacepage|label2">_With</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">newtext</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">newtext</property> <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> </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="GtkCheckButton" id="textonly"> <property name="label" translatable="yes" context="acorreplacepage|textonly">_Text only</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="textonly-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="acorreplacepage|extended_tip|textonly">Saves the entry in the With box without formatting. When the replacement is made, the text uses the same format as the document text.</property> @@ -242,8 +242,8 @@ </child> </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>
