diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-12-22 14:50:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-23 15:01:51 +0100 |
commit | 4a4c99a44349d1249d0f8ce32e3807313c2a61ed (patch) | |
tree | 85d338b1b665c34b5cca80e423bcff8fd193e7b3 /extensions/uiconfig/spropctrlr | |
parent | 7ded05762b8b39c4e3180dd7d68f087405398a04 (diff) |
drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
for extensions
Change-Id: I3dcde5981ba6254277edcf2442cfa03de2a6be5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108207
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/uiconfig/spropctrlr')
-rw-r--r-- | extensions/uiconfig/spropctrlr/ui/browserpage.ui | 18 | ||||
-rw-r--r-- | extensions/uiconfig/spropctrlr/ui/listselectdialog.ui | 46 | ||||
-rw-r--r-- | extensions/uiconfig/spropctrlr/ui/taborder.ui | 184 |
3 files changed, 114 insertions, 134 deletions
diff --git a/extensions/uiconfig/spropctrlr/ui/browserpage.ui b/extensions/uiconfig/spropctrlr/ui/browserpage.ui index 8a084283fdca..171c837276c4 100644 --- a/extensions/uiconfig/spropctrlr/ui/browserpage.ui +++ b/extensions/uiconfig/spropctrlr/ui/browserpage.ui @@ -65,19 +65,13 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkTextView" id="helptext"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkTextView" id="helptext"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="cursor_visible">False</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="cursor_visible">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> </object> </child> <child type="label"> diff --git a/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui b/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui index 945c16ce2d52..2c4ddc6444ba 100644 --- a/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui @@ -91,43 +91,35 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="shadow_type">in</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="treeview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="model">liststore2</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> <child> - <object class="GtkTreeView" id="treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore2</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection2"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> </child> diff --git a/extensions/uiconfig/spropctrlr/ui/taborder.ui b/extensions/uiconfig/spropctrlr/ui/taborder.ui index fbe57d18850f..3897d3dbb648 100644 --- a/extensions/uiconfig/spropctrlr/ui/taborder.ui +++ b/extensions/uiconfig/spropctrlr/ui/taborder.ui @@ -91,130 +91,124 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=1 n-rows=1 --> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="column_spacing">12</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkTreeView" id="CTRLtree"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="reorderable">True</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> <child> - <object class="GtkTreeView" id="CTRLtree"> - <property name="visible">True</property> - <property name="can_focus">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="headers_clickable">False</property> - <property name="reorderable">True</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererPixbuf" id="cellrenderertext1"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="CTRLtree-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="taborder|extended_tip|CTRLtree">Lists all controls in the form. These controls can be selected with the tab key in the given order from top to bottom.</property> - </object> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="CTRLtree-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="taborder|extended_tip|CTRLtree">Lists all controls in the form. These controls can be selected with the tab key in the given order from top to bottom.</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="upB"> + <property name="label" translatable="yes" context="taborder|upB">_Move Up</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButtonBox"> + <object class="GtkButton" id="downB"> + <property name="label" translatable="yes" context="taborder|downB">Move _Down</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="upB"> - <property name="label" translatable="yes" context="taborder|upB">_Move Up</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="downB"> - <property name="label" translatable="yes" context="taborder|downB">Move _Down</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="autoB"> - <property name="label" translatable="yes" context="taborder|autoB">_Automatic Sort</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="autoB"> + <property name="label" translatable="yes" context="taborder|autoB">_Automatic Sort</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> |