diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-17 21:01:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-19 12:10:13 +0100 |
| commit | 7bf4edd62fd0e34a0bd79cc918155ac5043b091b (patch) | |
| tree | 8e82d0dc6609329a5291844d588b0377c252981e /sw/uiconfig | |
| parent | 62c634d6e8d55f71fa9ebd8c4b78774f8946f39d (diff) | |
weld SwFieldDBPage
Change-Id: Ic4919fa3caa2106598ed8da3cec5deffa506eee1
Reviewed-on: https://gerrit.libreoffice.org/69401
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/flddbpage.ui | 97 |
1 files changed, 85 insertions, 12 deletions
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui index 6c0d90835d49..a1d47bce72d3 100644 --- a/sw/uiconfig/swriter/ui/flddbpage.ui +++ b/sw/uiconfig/swriter/ui/flddbpage.ui @@ -1,7 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> - <requires lib="LibreOffice" version="1.0"/> + <object class="GtkTreeStore" id="liststore1"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> + <object class="GtkTreeStore" id="liststore2"> + <columns> + <!-- column-name expander --> + <column type="GdkPixbuf"/> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> <object class="GtkBox" id="FieldDbPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -37,14 +54,38 @@ <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="hexpand">True</property> <property name="vexpand">True</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="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="type"> + <property name="visible">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="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <property name="spacing">6</property> + <child> + <object class="GtkCellRendererText" id="cellrenderer4"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> </child> @@ -96,7 +137,7 @@ </packing> </child> <child> - <object class="swlo-ConditionEdit" id="condition"> + <object class="GtkEntry" id="condition"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> @@ -195,13 +236,46 @@ <property name="hexpand">True</property> <property name="top_padding">6</property> <child> - <object class="swlo-SwDBTreeList" 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> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="SwDBTreeList-selection1"/> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="select"> + <property name="width_request">-1</property> + <property name="visible">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">liststore2</property> + <property name="headers_visible">False</property> + <property name="show_expanders">True</property> + <property name="search_column">1</property> + <property name="enable_tree_lines">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection2"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn8"> + <property name="spacing">6</property> + <child> + <object class="GtkCellRendererPixbuf" id="cellrenderertext5"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText" id="cellrenderertext6"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + </object> </child> </object> </child> @@ -299,7 +373,6 @@ <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <property name="group">userdefinedcb</property> </object> <packing> <property name="left_attach">0</property> @@ -347,7 +420,7 @@ </packing> </child> <child> - <object class="swlo-NumFormatListBox" id="numformat"> + <object class="GtkComboBoxText" id="numformat"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> |