diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-03 16:46:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-04 09:54:00 +0200 |
| commit | 736cebb414af587e7ac82f1326b06ce4022badf4 (patch) | |
| tree | 5f2914ff65971760028510fe9158538b47a0aefc /sc/uiconfig | |
| parent | c1293a13b0e98eae5a2e12e59693bdfbf93b6dc9 (diff) | |
weld ScMergeCellsDialog
Change-Id: I513f7e9b0c969706646821af508e41bb2331bbc2
Reviewed-on: https://gerrit.libreoffice.org/53809
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/uiconfig')
| -rw-r--r-- | sc/uiconfig/scalc/ui/mergecellsdialog.ui | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui b/sc/uiconfig/scalc/ui/mergecellsdialog.ui index a7413ff396b5..028b56862846 100644 --- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui +++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.20.4 --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="MergeCellsDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes" context="mergecellsdialog|MergeCellsDialog">Merge Cells</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> @@ -105,7 +105,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="position">1</property> </packing> </child> <child> @@ -122,7 +121,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">4</property> - <property name="position">2</property> </packing> </child> <child> @@ -139,7 +137,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="position">3</property> </packing> </child> <child> @@ -150,7 +147,7 @@ <property name="margin_left">24</property> <property name="margin_bottom">6</property> <property name="hexpand">False</property> - <property name="pixbuf">vcl/res/MergeFirstCell.svg</property> + <property name="icon_name">vcl/res/MergeFirstCell.svg</property> </object> <packing> <property name="left_attach">0</property> @@ -165,7 +162,7 @@ <property name="margin_left">24</property> <property name="margin_bottom">6</property> <property name="hexpand">True</property> - <property name="pixbuf">vcl/res/MergeKeepHidden.svg</property> + <property name="icon_name">vcl/res/MergeKeepHidden.svg</property> </object> <packing> <property name="left_attach">0</property> @@ -179,7 +176,7 @@ <property name="halign">start</property> <property name="margin_left">24</property> <property name="hexpand">True</property> - <property name="pixbuf">vcl/res/MergeEmptyHidden.svg</property> + <property name="icon_name">vcl/res/MergeEmptyHidden.svg</property> </object> <packing> <property name="left_attach">0</property> @@ -195,5 +192,13 @@ </child> </object> </child> + <action-widgets> + <action-widget response="-5">ok</action-widget> + <action-widget response="-6">cancel</action-widget> + <action-widget response="-11">help</action-widget> + </action-widgets> + <child> + <placeholder/> + </child> </object> </interface> |