sfx2/uiconfig/ui/alienwarndialog.ui | 6 +-- sfx2/uiconfig/ui/querysavedialog.ui | 4 +- starmath/uiconfig/smath/ui/savedefaultsdialog.ui | 5 +- svx/uiconfig/ui/deletefooterdialog.ui | 5 +- svx/uiconfig/ui/deleteheaderdialog.ui | 5 +- svx/uiconfig/ui/formlinkwarndialog.ui | 9 ++-- svx/uiconfig/ui/linkwarndialog.ui | 5 +- svx/uiconfig/ui/querydeletecontourdialog.ui | 5 +- svx/uiconfig/ui/querydeleteobjectdialog.ui | 5 +- svx/uiconfig/ui/querydeletethemedialog.ui | 5 +- svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui | 4 +- svx/uiconfig/ui/querynewcontourdialog.ui | 5 +- svx/uiconfig/ui/querysavecontchangesdialog.ui | 5 +- svx/uiconfig/ui/querysaveimagemapchangesdialog.ui | 4 +- svx/uiconfig/ui/queryunlinkgraphicsdialog.ui | 5 +- svx/uiconfig/ui/savemodifieddialog.ui | 4 +- sw/uiconfig/swriter/ui/alreadyexistsdialog.ui | 30 ++++------------ sw/uiconfig/swriter/ui/asksearchdialog.ui | 4 +- sw/uiconfig/swriter/ui/attachnamedialog.ui | 24 +++--------- sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui | 5 +- sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui | 5 +- sw/uiconfig/swriter/ui/printmergedialog.ui | 4 +- sw/uiconfig/swriter/ui/querycontinuebegindialog.ui | 5 +- sw/uiconfig/swriter/ui/querycontinueenddialog.ui | 5 +- sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui | 5 +- sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui | 6 ++- sw/uiconfig/swriter/ui/querysavelabeldialog.ui | 5 +- sw/uiconfig/swriter/ui/queryshowchangesdialog.ui | 5 +- sw/uiconfig/swriter/ui/saveashtmldialog.ui | 5 +- sw/uiconfig/swriter/ui/subjectdialog.ui | 30 ++++------------ sw/uiconfig/swriter/ui/warndatasourcedialog.ui | 5 +- sw/uiconfig/swriter/ui/warnemaildialog.ui | 5 +- 32 files changed, 107 insertions(+), 122 deletions(-)
New commits: commit 69241123ed87d6b9974f9fb45e54377efcf7cead Author: Adolfo Jayme Barrientos <[email protected]> Date: Fri Sep 26 22:49:20 2014 -0500 border_width from 12 to 6, as the rest of dialogs I know the old GNOME HIG mentions extra spacing for queries, but Iâve never understood why -- not even GNOME itself respects that rule. It just looks inconsistent and wastes space. Change-Id: I181f800957f69b0943369791e460c7273b6b08f6 Reviewed-on: https://gerrit.libreoffice.org/11658 Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Samuel Mehrbrodt <[email protected]> diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui index 0e6141d..514630b 100644 --- a/sfx2/uiconfig/ui/alienwarndialog.ui +++ b/sfx2/uiconfig/ui/alienwarndialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Wed Jan 8 12:15:41 2014 --> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="AlienWarnDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Confirm File Format</property> <property name="resizable">False</property> <property name="modal">True</property> diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui index 93a67c3..86cf5b0 100644 --- a/sfx2/uiconfig/ui/querysavedialog.ui +++ b/sfx2/uiconfig/ui/querysavedialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QuerySaveDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save document?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui index da6040d..336bf09 100644 --- a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui +++ b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="SaveDefaultsDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save defaults?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui index 78fa1d6..d6ef6f7 100644 --- a/svx/uiconfig/ui/deletefooterdialog.ui +++ b/svx/uiconfig/ui/deletefooterdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="DeleteFooterDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Delete footer?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui index bd471d9..a1fab03 100644 --- a/svx/uiconfig/ui/deleteheaderdialog.ui +++ b/svx/uiconfig/ui/deleteheaderdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="DeleteHeaderDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Delete header?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/formlinkwarndialog.ui b/svx/uiconfig/ui/formlinkwarndialog.ui index 2ee639b..9c31aa4 100644 --- a/svx/uiconfig/ui/formlinkwarndialog.ui +++ b/svx/uiconfig/ui/formlinkwarndialog.ui @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="FormLinkWarnDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> - <property name="text" translatable="yes">This instance is linked with the form. - -The changes you make to this instance will be lost when the form is reloaded. + <property name="text" translatable="yes">This instance is linked with the form.</property> + <property name="secondary_text" translatable="yes">The changes you make to this instance will be lost when the form is reloaded. How do you want to proceed?</property> <child internal-child="vbox"> diff --git a/svx/uiconfig/ui/linkwarndialog.ui b/svx/uiconfig/ui/linkwarndialog.ui index bcc9556..676f3ed 100644 --- a/svx/uiconfig/ui/linkwarndialog.ui +++ b/svx/uiconfig/ui/linkwarndialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="LinkWarnDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Confirm Linked Graphic</property> <property name="resizable">False</property> <property name="modal">True</property> diff --git a/svx/uiconfig/ui/querydeletecontourdialog.ui b/svx/uiconfig/ui/querydeletecontourdialog.ui index 95390e3..aa30b2b 100644 --- a/svx/uiconfig/ui/querydeletecontourdialog.ui +++ b/svx/uiconfig/ui/querydeletecontourdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryDeleteContourDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Delete the contour?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/querydeleteobjectdialog.ui b/svx/uiconfig/ui/querydeleteobjectdialog.ui index f49711b..bcde1ce 100644 --- a/svx/uiconfig/ui/querydeleteobjectdialog.ui +++ b/svx/uiconfig/ui/querydeleteobjectdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryDeleteObjectDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Delete this object?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/querydeletethemedialog.ui b/svx/uiconfig/ui/querydeletethemedialog.ui index d4cf7ff..fb340d2 100644 --- a/svx/uiconfig/ui/querydeletethemedialog.ui +++ b/svx/uiconfig/ui/querydeletethemedialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryDeleteThemeDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Delete this theme?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui index c7a6a44..a77df8d 100644 --- a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui +++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryModifyImageMapChangesDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save ImageMap changes?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/querynewcontourdialog.ui b/svx/uiconfig/ui/querynewcontourdialog.ui index 9305f55..713c189 100644 --- a/svx/uiconfig/ui/querynewcontourdialog.ui +++ b/svx/uiconfig/ui/querynewcontourdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryNewContourDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Create a new contour?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/querysavecontchangesdialog.ui b/svx/uiconfig/ui/querysavecontchangesdialog.ui index df421ab..fc0a0e9 100644 --- a/svx/uiconfig/ui/querysavecontchangesdialog.ui +++ b/svx/uiconfig/ui/querysavecontchangesdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QuerySaveContourChangesDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save contour changes?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui index 2a56108..0ddac0d 100644 --- a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui +++ b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QuerySaveImageMapChangesDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save ImageMap changes?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui index 0b88403..b8f2f2d 100644 --- a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui +++ b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryUnlinkGraphicsDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Unlink the graphics?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/svx/uiconfig/ui/savemodifieddialog.ui b/svx/uiconfig/ui/savemodifieddialog.ui index c5018e2..ccc6fc5 100644 --- a/svx/uiconfig/ui/savemodifieddialog.ui +++ b/svx/uiconfig/ui/savemodifieddialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="SaveModifiedDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> diff --git a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui index eeb165e..b956e44 100644 --- a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui +++ b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui @@ -1,9 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> + <object class="GtkTextBuffer" id="textbuffer1"> + <property name="text" translatable="yes">A document with the name '%1' already exists.</property> + </object> + <object class="GtkTextBuffer" id="textbuffer2"> + <property name="text" translatable="yes">Please save this document under a different name.</property> + </object> <object class="GtkDialog" id="AlreadyExistsDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">File already exists</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> @@ -82,8 +89,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> @@ -100,16 +105,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">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -130,8 +131,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> @@ -144,16 +143,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">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -167,7 +162,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> <property name="height">2</property> </packing> </child> @@ -185,10 +179,4 @@ <action-widget response="0">cancel</action-widget> </action-widgets> </object> - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">A document with the name '%1' already exists.</property> - </object> - <object class="GtkTextBuffer" id="textbuffer2"> - <property name="text" translatable="yes">Please save this document under a different name.</property> - </object> </interface> diff --git a/sw/uiconfig/swriter/ui/asksearchdialog.ui b/sw/uiconfig/swriter/ui/asksearchdialog.ui index 32b568e..2fc387a 100644 --- a/sw/uiconfig/swriter/ui/asksearchdialog.ui +++ b/sw/uiconfig/swriter/ui/asksearchdialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="AskSearchDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> diff --git a/sw/uiconfig/swriter/ui/attachnamedialog.ui b/sw/uiconfig/swriter/ui/attachnamedialog.ui index 66dff49..eef869e 100644 --- a/sw/uiconfig/swriter/ui/attachnamedialog.ui +++ b/sw/uiconfig/swriter/ui/attachnamedialog.ui @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkTextBuffer" id="textbuffer1"> <property name="text" translatable="yes">You did not specify a new name for the attachment.</property> </object> + <object class="GtkTextBuffer" id="textbuffer2"> + <property name="text" translatable="yes">If you would like to provide one, please type it now.</property> + </object> <object class="GtkDialog" id="AttachNameDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">No Attachment Name</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> @@ -85,8 +89,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> @@ -103,16 +105,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">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -131,8 +129,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> @@ -147,16 +143,12 @@ <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">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -170,7 +162,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> <property name="height">2</property> </packing> </child> @@ -188,7 +179,4 @@ <action-widget response="0">cancel</action-widget> </action-widgets> </object> - <object class="GtkTextBuffer" id="textbuffer2"> - <property name="text" translatable="yes">If you would like to provide one, please type it now.</property> - </object> </interface> diff --git a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui index 67b6b0e..2632862 100644 --- a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui +++ b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="CannotSaveLabelDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Cannot add label</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui index c51e46a..d86e321 100644 --- a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui +++ b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="DataSourcesUnavailableDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Create a new data source?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/printmergedialog.ui b/sw/uiconfig/swriter/ui/printmergedialog.ui index b1d541b..b18f7a8 100644 --- a/sw/uiconfig/swriter/ui/printmergedialog.ui +++ b/sw/uiconfig/swriter/ui/printmergedialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="PrintMergeDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> diff --git a/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui b/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui index 23c72f7..f5bdb3a 100644 --- a/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui +++ b/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryContinueBeginDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Continue at the beginning?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/querycontinueenddialog.ui b/sw/uiconfig/swriter/ui/querycontinueenddialog.ui index b7ab825..56332a5 100644 --- a/sw/uiconfig/swriter/ui/querycontinueenddialog.ui +++ b/sw/uiconfig/swriter/ui/querycontinueenddialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryContinueEndDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Continue at the end?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui b/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui index f1565d7..378a804 100644 --- a/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui +++ b/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.6 --> + <requires lib="gtk+" version="3.6"/> <object class="GtkMessageDialog" id="QueryDefaultCompatDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Use as default?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui index b50cdd9..f6ef0a8 100644 --- a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui +++ b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryRotateIntoStandardOrientationDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Rotate into standard orientation?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> @@ -19,6 +20,7 @@ <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area4"> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="layout_style">center</property> </object> <packing> diff --git a/sw/uiconfig/swriter/ui/querysavelabeldialog.ui b/sw/uiconfig/swriter/ui/querysavelabeldialog.ui index 711879c..2474f6a 100644 --- a/sw/uiconfig/swriter/ui/querysavelabeldialog.ui +++ b/sw/uiconfig/swriter/ui/querysavelabeldialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.6 --> + <requires lib="gtk+" version="3.6"/> <object class="GtkMessageDialog" id="QuerySaveLabelDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save label?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui index b7fcd3d..905d781 100644 --- a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui +++ b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryShowChangesDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Show changes?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/saveashtmldialog.ui b/sw/uiconfig/swriter/ui/saveashtmldialog.ui index 0fff4b4..a6f2021 100644 --- a/sw/uiconfig/swriter/ui/saveashtmldialog.ui +++ b/sw/uiconfig/swriter/ui/saveashtmldialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="SaveAsHTMLDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Save as HTML?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/subjectdialog.ui b/sw/uiconfig/swriter/ui/subjectdialog.ui index d0a5dc8..c74a920 100644 --- a/sw/uiconfig/swriter/ui/subjectdialog.ui +++ b/sw/uiconfig/swriter/ui/subjectdialog.ui @@ -1,9 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> + <object class="GtkTextBuffer" id="textbuffer1"> + <property name="text" translatable="yes">You did not specify a subject for this message.</property> + </object> + <object class="GtkTextBuffer" id="textbuffer2"> + <property name="text" translatable="yes">If you would like to provide one, please type it now.</property> + </object> <object class="GtkDialog" id="SubjectDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">No Subject</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> @@ -82,8 +89,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> @@ -100,16 +105,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">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -128,8 +129,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> @@ -144,16 +143,12 @@ <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">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -167,7 +162,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> <property name="height">2</property> </packing> </child> @@ -185,10 +179,4 @@ <action-widget response="0">cancel</action-widget> </action-widgets> </object> - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">You did not specify a subject for this message.</property> - </object> - <object class="GtkTextBuffer" id="textbuffer2"> - <property name="text" translatable="yes">If you would like to provide one, please type it now.</property> - </object> </interface> diff --git a/sw/uiconfig/swriter/ui/warndatasourcedialog.ui b/sw/uiconfig/swriter/ui/warndatasourcedialog.ui index 5e67094..31f2ec8 100644 --- a/sw/uiconfig/swriter/ui/warndatasourcedialog.ui +++ b/sw/uiconfig/swriter/ui/warndatasourcedialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.6 --> + <requires lib="gtk+" version="3.6"/> <object class="GtkMessageDialog" id="WarnDataSourceDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Data source not found</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> diff --git a/sw/uiconfig/swriter/ui/warnemaildialog.ui b/sw/uiconfig/swriter/ui/warnemaildialog.ui index ba2e0fd..d7aa9ff 100644 --- a/sw/uiconfig/swriter/ui/warnemaildialog.ui +++ b/sw/uiconfig/swriter/ui/warnemaildialog.ui @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> - <!-- interface-requires gtk+ 3.6 --> + <requires lib="gtk+" version="3.6"/> <object class="GtkMessageDialog" id="WarnEmailDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">E-Mails could not be sent</property> <property name="resizable">False</property> <property name="type_hint">dialog</property>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
