diff options
author | heiko tietze <tietze.heiko@gmail.com> | 2018-02-27 14:53:01 +0100 |
---|---|---|
committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-03-01 16:02:44 +0100 |
commit | 0a9a3f14f4f6cef46a816f9f4c6c4d14f981be60 (patch) | |
tree | cc9e3c4014dad341796d19bed6ed35ff86378688 /sw | |
parent | 7651e57573952758032ceb88f16e2dbbb6cc4e18 (diff) |
tdf#116029 Layout of field edit dialog according to the book
Help button to the left, Ok/Cancel right hand
Change-Id: I106466ab2b5e585367db7873e91bf44bbe66db0a
Reviewed-on: https://gerrit.libreoffice.org/50438
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/fldui/fldedt.cxx | 4 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/editfielddialog.ui | 102 |
2 files changed, 59 insertions, 47 deletions
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 3a4c22ea6095..f0e30e05c1bb 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -146,7 +146,9 @@ void SwFieldEditDlg::Init() m_pPrevBT->Enable( bMove ); if (pCurField->GetTypeId() == TYP_EXTUSERFLD) - m_pAddressBT->Show(); + m_pAddressBT->Enable(); + else + m_pAddressBT->Disable(); pSh->DestroyCursor(); pSh->EndAction(); diff --git a/sw/uiconfig/swriter/ui/editfielddialog.ui b/sw/uiconfig/swriter/ui/editfielddialog.ui index 8e555e4f2a8e..6a2c57c52438 100644 --- a/sw/uiconfig/swriter/ui/editfielddialog.ui +++ b/sw/uiconfig/swriter/ui/editfielddialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.3 --> <interface domain="sw"> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkImage" id="image3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -24,39 +25,15 @@ <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="layout_style">end</property> <child> - <object class="GtkGrid" id="grid2"> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkButton" id="prev"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image3</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> - <object class="GtkButton" id="next"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image4</property> - </object> - <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> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> @@ -78,7 +55,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -92,36 +69,67 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">5</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkButton" id="help"> - <property name="label">gtk-help</property> + <object class="GtkButton" id="prev"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <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> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="next"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <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> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkButton" id="edit"> <property name="label" translatable="yes" context="editfielddialog|edit">_Edit</property> + <property name="visible">True</property> <property name="can_focus">True</property> <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="use_underline">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - <property name="secondary">True</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -129,7 +137,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -138,10 +146,12 @@ </object> </child> <action-widgets> + <action-widget response="-11">help</action-widget> <action-widget response="-5">ok</action-widget> <action-widget response="-6">cancel</action-widget> - <action-widget response="-11">help</action-widget> - <action-widget response="0">edit</action-widget> </action-widgets> + <child> + <placeholder/> + </child> </object> </interface> |