diff options
author | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2014-09-26 22:49:20 -0500 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-27 18:30:44 +0000 |
commit | 69241123ed87d6b9974f9fb45e54377efcf7cead (patch) | |
tree | 3786560fdb210e25c98549e1de3251f318a3ad31 /sw | |
parent | b45de3ceabe258a087c55ff3f031e1d4b2d3e14c (diff) |
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 <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/uiconfig/swriter/ui/alreadyexistsdialog.ui | 30 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/asksearchdialog.ui | 4 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/attachnamedialog.ui | 24 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/printmergedialog.ui | 4 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/querycontinuebegindialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/querycontinueenddialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui | 6 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/querysavelabeldialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/queryshowchangesdialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/saveashtmldialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/subjectdialog.ui | 30 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/warndatasourcedialog.ui | 5 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/warnemaildialog.ui | 5 |
16 files changed, 62 insertions, 86 deletions
diff --git a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui index eeb165ead0c5..b956e448832f 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 32b568eeed93..2fc387aa84f7 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 66dff499389f..eef869e192d0 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 67b6b0e9f45a..26328623ab7d 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 c51e46a857e1..d86e321f55ec 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 b1d541b04785..b18f7a82a671 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 23c72f7a1e50..f5bdb3a0b006 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 b7ab82516d6c..56332a5fc1ba 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 f1565d797b33..378a804d89bc 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 b50cdd9bdf7a..f6ef0a8c05aa 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 711879ca1d5c..2474f6a744e7 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 b7fcd3dad4d3..905d781eddc3 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 0fff4b46a940..a6f2021f2fa5 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 d0a5dc8572e2..c74a920490b3 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 5e670943f8aa..31f2ec85a654 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 ba2e0fd2961c..d7aa9ff084fd 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> |