diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-03-20 11:18:47 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-20 14:22:32 +0100 |
commit | 9f5cf96bd8b0d33a4505e941025f93af776159a9 (patch) | |
tree | 191b7c02828ff72d45dafe4b49980f09f0762036 /sw/uiconfig | |
parent | bfa7db29bd5077c4c8be6ccd9dfd80f974c1e148 (diff) |
weld SwFieldEditDlg
Change-Id: I786944a4bf8979526f0ccae5b00fb42ad5016a66
Reviewed-on: https://gerrit.libreoffice.org/69463
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/editfielddialog.ui | 18 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/flddbpage.ui | 46 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/flddocinfopage.ui | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/flddocumentpage.ui | 8 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/fldfuncpage.ui | 46 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/fldrefpage.ui | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/fldvarpage.ui | 27 |
7 files changed, 79 insertions, 70 deletions
diff --git a/sw/uiconfig/swriter/ui/editfielddialog.ui b/sw/uiconfig/swriter/ui/editfielddialog.ui index 6f3d73a3170c..922e37d2c2f7 100644 --- a/sw/uiconfig/swriter/ui/editfielddialog.ui +++ b/sw/uiconfig/swriter/ui/editfielddialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> <object class="GtkImage" id="image3"> @@ -16,7 +16,13 @@ <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes" context="editfielddialog|EditFieldDialog">Edit Fields</property> + <property name="modal">True</property> + <property name="default_width">0</property> + <property name="default_height">0</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -84,6 +90,7 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="column_spacing">6</property> <child> <object class="GtkButton" id="prev"> <property name="visible">True</property> @@ -92,7 +99,6 @@ <property name="tooltip_text" translatable="yes" context="editfielddialog|prev_tip">Previous field of same type</property> <property name="valign">center</property> <property name="margin_left">8</property> - <property name="vexpand">True</property> <property name="image">image3</property> <property name="image_position">right</property> </object> @@ -108,7 +114,6 @@ <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes" context="editfielddialog|next_tip">Next field of same type</property> <property name="valign">center</property> - <property name="vexpand">True</property> <property name="image">image4</property> </object> <packing> @@ -124,7 +129,7 @@ <property name="receives_default">True</property> <property name="no_show_all">True</property> <property name="tooltip_text" translatable="yes" context="editfielddialog|edit_tip">Edit variable field content</property> - <property name="margin_left">18</property> + <property name="margin_left">12</property> <property name="use_underline">True</property> </object> <packing> @@ -135,7 +140,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="pack_type">end</property> <property name="position">1</property> </packing> @@ -150,8 +155,5 @@ <action-widget response="-5">ok</action-widget> <action-widget response="-6">cancel</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> </interface> diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui index a1d47bce72d3..49672192e0cf 100644 --- a/sw/uiconfig/swriter/ui/flddbpage.ui +++ b/sw/uiconfig/swriter/ui/flddbpage.ui @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.1 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> <object class="GtkTreeStore" id="liststore1"> @@ -22,6 +23,8 @@ <object class="GtkBox" id="FieldDbPage"> <property name="visible">True</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="spacing">12</property> <child> @@ -95,9 +98,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="flddbpage|label1">_Type</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -124,16 +127,14 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="flddbpage|label5">_Condition</property> <property name="use_underline">True</property> <property name="mnemonic_widget">condition</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -145,16 +146,12 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -171,32 +168,26 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="flddbpage|label4">Record number</property> <property name="use_underline">True</property> <property name="mnemonic_widget">recnumber</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -210,8 +201,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -252,11 +241,10 @@ <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"/> + <object class="GtkTreeSelection" id="Macro Library List-selection1"/> </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn8"> @@ -285,9 +273,9 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="flddbpage|label2">Database s_election</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -310,16 +298,14 @@ <object class="GtkLabel" id="browseft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes" context="flddbpage|browseft">Add database file</property> <property name="use_underline">True</property> <property name="mnemonic_widget">browse</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -332,8 +318,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -378,7 +362,6 @@ <property name="left_attach">0</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> <child> @@ -398,8 +381,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -410,8 +391,6 @@ <object class="GtkComboBoxText" id="format"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> </object> <packing> <property name="expand">False</property> @@ -425,8 +404,6 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> <accessibility> <relation type="labelled-by" target="userdefinedcb"/> </accessibility> @@ -441,8 +418,6 @@ <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> </object> @@ -453,9 +428,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="flddbpage|label3">Format</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -473,7 +448,6 @@ <property name="left_attach">1</property> <property name="top_attach">0</property> <property name="width">2</property> - <property name="height">1</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui index 9354b258e4da..81357bed19ff 100644 --- a/sw/uiconfig/swriter/ui/flddocinfopage.ui +++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui @@ -29,6 +29,8 @@ <object class="GtkBox" id="FieldDocInfoPage"> <property name="visible">True</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="spacing">12</property> <property name="homogeneous">True</property> diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui index b62a505c4f17..906649d07cd2 100644 --- a/sw/uiconfig/swriter/ui/flddocumentpage.ui +++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui @@ -2,7 +2,6 @@ <!-- Generated with glade 3.22.1 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> - <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">10</property> @@ -45,6 +44,8 @@ <object class="GtkBox" id="FieldDocumentPage"> <property name="visible">True</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="spacing">12</property> <property name="homogeneous">True</property> @@ -453,10 +454,5 @@ <object class="GtkSizeGroup" id="sizegroup1"> <property name="mode">both</property> <property name="ignore_hidden">True</property> - <widgets> - <widget name="type:border"/> - <widget name="select:border"/> - <widget name="format:border"/> - </widgets> </object> </interface> diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui index 99fbf069c27e..1fc76b49bde4 100644 --- a/sw/uiconfig/swriter/ui/fldfuncpage.ui +++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui @@ -26,9 +26,19 @@ <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> <object class="GtkBox" id="FieldFuncPage"> <property name="visible">True</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="spacing">12</property> <property name="homogeneous">True</property> @@ -37,6 +47,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -106,6 +117,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -175,6 +187,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -244,6 +257,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="row_spacing">12</property> <child> <object class="GtkButton" id="macro"> @@ -487,13 +501,37 @@ </packing> </child> <child> - <object class="GtkTreeView" id="listitems"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection5"/> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="listitems"> + <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-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> diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui index 6344f9013fec..87ff24de6d3f 100644 --- a/sw/uiconfig/swriter/ui/fldrefpage.ui +++ b/sw/uiconfig/swriter/ui/fldrefpage.ui @@ -37,6 +37,8 @@ <object class="GtkBox" id="FieldRefPage"> <property name="visible">True</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="spacing">12</property> <child> diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui index 6d704b1bfe4d..5036abdae2e4 100644 --- a/sw/uiconfig/swriter/ui/fldvarpage.ui +++ b/sw/uiconfig/swriter/ui/fldvarpage.ui @@ -2,6 +2,16 @@ <!-- Generated with glade 3.22.1 --> <interface domain="sw"> <requires lib="gtk+" version="3.18"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">svx/res/nu02.png</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">svx/res/nu01.png</property> + </object> <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> @@ -34,26 +44,11 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/nu02.png</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/nu01.png</property> - </object> - <object class="GtkTreeStore" id="liststore1"> - <columns> - <!-- column-name gchararray1 --> - <column type="gchararray"/> - </columns> - </object> <object class="GtkGrid" id="FieldVarPage"> <property name="visible">True</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">12</property> <property name="column_spacing">12</property> |