diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-03-17 19:22:08 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-18 22:10:57 +0100 |
commit | c403c86c6da4db0a6f2864ad4e13def9a3898cd4 (patch) | |
tree | 3b6e0ca5c6255506989f4312ac7a7723eb359b84 /sw/uiconfig | |
parent | cc0b0f94b1888709f45bf63b98761a471f73f041 (diff) |
weld SwFieldRefPage
Change-Id: I5ae3965aa681ea1f5a005fbc8dad4d0ce36af1b3
Reviewed-on: https://gerrit.libreoffice.org/69373
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/uiconfig')
-rw-r--r-- | sw/uiconfig/swriter/ui/fldrefpage.ui | 184 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/templatedialog8.ui | 22 |
2 files changed, 161 insertions, 45 deletions
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui index 042b373f88f4..812ee1cfa0ef 100644 --- a/sw/uiconfig/swriter/ui/fldrefpage.ui +++ b/sw/uiconfig/swriter/ui/fldrefpage.ui @@ -1,11 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> - <requires lib="LibreOffice" version="1.0"/> <object class="GtkTreeStore" id="liststore1"> <columns> - <!-- column-name gchararray1 --> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkTreeStore" id="liststore2"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkTreeStore" id="liststore3"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkTreeStore" id="liststore4"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> <column type="gchararray"/> </columns> </object> @@ -44,14 +69,37 @@ <property name="hexpand">True</property> <property name="top_padding">6</property> <child> - <object class="GtkTreeView" id="type:border"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore1</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="type"> + <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="search_column">0</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> </child> @@ -61,9 +109,9 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="fldrefpage|label1">_Type</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -90,14 +138,37 @@ <property name="hexpand">True</property> <property name="top_padding">6</property> <child> - <object class="GtkTreeView" id="format:border"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore1</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection2"/> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="format"> + <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> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> </child> @@ -107,9 +178,9 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="fldrefpage|label3">Insert _reference to</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -162,9 +233,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="left_attach">0</property> @@ -176,7 +244,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="shadow_type">out</property> + <property name="activates_default">True</property> <property name="placeholder_text" translatable="yes" context="fldrefpage|filter">Filter Selection</property> </object> <packing> @@ -199,25 +267,49 @@ <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> - <child type="label"> + <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="top_padding">6</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="swuilo-SwFieldRefTreeListBox" id="selecttip:border"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Tooltip Tree List-selection"/> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="selecttip"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="model">liststore3</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-selection3"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> <packing> @@ -227,14 +319,37 @@ </packing> </child> <child> - <object class="GtkTreeView" id="select:border"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection4"/> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="select"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="model">liststore4</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-selection4"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn4"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext4"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> <packing> @@ -249,11 +364,10 @@ </child> <child type="label"> <object class="GtkLabel" id="label2"> - <property name="visible">False</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="fldrefpage|label2">S_election</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -278,10 +392,10 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="fldrefpage|valueft">_Value</property> <property name="use_underline">True</property> <property name="mnemonic_widget">value</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -294,6 +408,7 @@ <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> @@ -304,10 +419,10 @@ <object class="GtkLabel" id="nameft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="fldrefpage|nameft">Na_me</property> <property name="use_underline">True</property> <property name="mnemonic_widget">name</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -319,6 +434,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui index 20640bcddf93..87d5a777394c 100644 --- a/sw/uiconfig/swriter/ui/templatedialog8.ui +++ b/sw/uiconfig/swriter/ui/templatedialog8.ui @@ -68,7 +68,7 @@ </child> <child> <object class="GtkButton" id="standard"> - <property name="label" translatable="no">Standard</property> + <property name="label">Standard</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -162,7 +162,7 @@ <child type="tab"> <object class="GtkLabel" id="organizer"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|organizer">Organizer</property> </object> <packing> @@ -208,7 +208,7 @@ <child type="tab"> <object class="GtkLabel" id="page"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|page">Page</property> </object> <packing> @@ -255,7 +255,7 @@ <child type="tab"> <object class="GtkLabel" id="area"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|area">Area</property> </object> <packing> @@ -302,7 +302,7 @@ <child type="tab"> <object class="GtkLabel" id="transparence"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|transparence">Transparency</property> </object> <packing> @@ -349,7 +349,7 @@ <child type="tab"> <object class="GtkLabel" id="header"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|header">Header</property> </object> <packing> @@ -396,7 +396,7 @@ <child type="tab"> <object class="GtkLabel" id="footer"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|footer">Footer</property> </object> <packing> @@ -443,7 +443,7 @@ <child type="tab"> <object class="GtkLabel" id="borders"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|borders">Borders</property> </object> <packing> @@ -490,7 +490,7 @@ <child type="tab"> <object class="GtkLabel" id="columns"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|columns">Columns</property> </object> <packing> @@ -537,7 +537,7 @@ <child type="tab"> <object class="GtkLabel" id="footnotes"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|footnotes">Footnote</property> </object> <packing> @@ -584,7 +584,7 @@ <child type="tab"> <object class="GtkLabel" id="textgrid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes" context="templatedialog8|textgrid">Text Grid</property> </object> <packing> |