cui/uiconfig/ui/optlingupage.ui | 127 +++++----------------------------------- 1 file changed, 17 insertions(+), 110 deletions(-)
New commits: commit 77bc971910771232c8e6e28f4590181ced954997 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Sat Nov 11 21:15:55 2023 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Sun Nov 12 13:03:16 2023 +0100 Gtk-WARNING gtktreestore.c:1047: Invalid column number 6 added to iter since: commit 985b404f208559b4a91f31eb31dafa9d0384fdaf Date: Wed Nov 8 21:34:41 2023 +0100 tdf#158003 - UI: Part 22 - Unify lockdown behavior of Options dialog for Language - Writing Aids Page. Change-Id: Iff9ab545a5d212d004b55f5ceab11d4c9f6dee5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159341 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index 8be09171927b..ad8ee3da1ca7 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -42,6 +42,10 @@ <column type="gboolean"/> <!-- column-name checktri1 --> <column type="gboolean"/> + <!-- column-name weight1 --> + <column type="gint"/> + <!-- column-name sensitive1 --> + <column type="gboolean"/> </columns> </object> <!-- n-columns=1 n-rows=3 --> @@ -398,6 +402,7 @@ <child> <object class="GtkCellRendererToggle" id="cellrenderer555"/> <attributes> + <attribute name="sensitive">6</attribute> <attribute name="visible">3</attribute> <attribute name="active">0</attribute> </attributes> @@ -411,6 +416,7 @@ <child> <object class="GtkCellRendererText" id="cellrenderer444"/> <attributes> + <attribute name="sensitive">6</attribute> <attribute name="text">1</attribute> </attributes> </child> commit 2d200d88d972ce05951696c6920efd90fc357d31 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Sat Nov 11 21:08:42 2023 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Sun Nov 12 13:03:07 2023 +0100 resave with latest glade Change-Id: If01a98195581399e92b31cfe7caa4782a0b246a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159340 Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index 13d9b3d059f9..8be09171927b 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="liststore2"> @@ -44,7 +44,7 @@ <column type="gboolean"/> </columns> </object> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="OptLinguPage"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -65,13 +65,13 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="column-spacing">12</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -158,57 +158,12 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> <child type="label"> @@ -237,15 +192,15 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="column-spacing">12</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> @@ -376,27 +331,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> <child type="label"> @@ -425,16 +359,16 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row-spacing">3</property> <property name="column-spacing">12</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> @@ -553,21 +487,6 @@ <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> <child type="label"> @@ -589,24 +508,6 @@ <property name="top-attach">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="OptLinguPage-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="OptLinguPage">Specifies the properties of the spelling, thesaurus and hyphenation.</property>