sw/uiconfig/swriter/ui/splittable.ui | 8 +- tubes/uiconfig/ui/contacts.ui | 62 +++++++++++---------- vcl/uiconfig/ui/printdialog.ui | 103 ++++++++++++++++++----------------- 3 files changed, 92 insertions(+), 81 deletions(-)
New commits: commit b2e55c2f4dc2bdc780e70f771650b82819166953 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Feb 20 20:21:30 2013 +0000 Related: fdo#60920 various efforts to consistently apply HIG rules (cherry picked from commit 76bc43823a53d76e49260a601e893bc1a791fb03) Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88 Reviewed-on: https://gerrit.libreoffice.org/2301 Reviewed-by: Miklos Vajna <vmik...@suse.cz> Tested-by: Miklos Vajna <vmik...@suse.cz> diff --git a/sw/uiconfig/swriter/ui/splittable.ui b/sw/uiconfig/swriter/ui/splittable.ui index 06b12ab..a10c5f1 100644 --- a/sw/uiconfig/swriter/ui/splittable.ui +++ b/sw/uiconfig/swriter/ui/splittable.ui @@ -3,14 +3,14 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="SplitTableDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Split Table</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -76,14 +76,14 @@ <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">5</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">5</property> + <property name="column_spacing">6</property> <child> <object class="GtkRadioButton" id="copyheading"> <property name="label" translatable="yes">Copy heading</property> diff --git a/tubes/uiconfig/ui/contacts.ui b/tubes/uiconfig/ui/contacts.ui index 5500c0d..25fc400 100644 --- a/tubes/uiconfig/ui/contacts.ui +++ b/tubes/uiconfig/ui/contacts.ui @@ -3,24 +3,13 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="ContactsDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Select a contact to collaborate with</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -28,11 +17,9 @@ <child> <object class="GtkButton" id="listen"> <property name="label" translatable="yes">Listen</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -43,11 +30,9 @@ <child> <object class="GtkButton" id="invite"> <property name="label" translatable="yes">Invite</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -58,11 +43,9 @@ <child> <object class="GtkButton" id="demo"> <property name="label" translatable="yes">StartDemoSession</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -73,11 +56,9 @@ <child> <object class="GtkButton" id="buddy"> <property name="label" translatable="yes">StartBuddySession</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -88,11 +69,9 @@ <child> <object class="GtkButton" id="group"> <property name="label" translatable="yes">StartGroupSession</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -109,11 +88,40 @@ </packing> </child> <child> - <object class="GtkTreeView" id="contacts"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkTreeView" id="contacts"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> + </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> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select a contact to collaborate with</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> diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 575eda9..4417212 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -22,13 +22,14 @@ </object> <object class="GtkDialog" id="PrintDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Print</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -36,12 +37,10 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -53,11 +52,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -69,11 +66,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -100,6 +95,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="vcllo:PrintPreviewWindow" id="preview"> <property name="width_request">235</property> @@ -119,7 +115,7 @@ <property name="can_focus">False</property> <property name="margin_left">30</property> <property name="margin_right">30</property> - <property name="spacing">5</property> + <property name="spacing">6</property> <child> <object class="GtkSpinButton" id="pageedit-nospin"> <property name="visible">True</property> @@ -147,11 +143,9 @@ <child> <object class="GtkButton" id="forward"> <property name="label">gtk-media-next</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -164,11 +158,9 @@ <child> <object class="GtkButton" id="backward"> <property name="label">gtk-media-previous</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -200,7 +192,9 @@ <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -211,6 +205,7 @@ <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid4"> @@ -334,13 +329,11 @@ <child> <object class="GtkButton" id="setup"> <property name="label" translatable="yes">Properties...</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">end</property> <property name="valign">start</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="left_attach">1</property> @@ -415,16 +408,19 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">7</property> <property name="label" translatable="yes">Number of copies</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">copycount</property> </object> <packing> <property name="expand">False</property> @@ -458,16 +454,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <property name="spacing">12</property> <child> <object class="GtkCheckButton" id="collate"> <property name="label" translatable="yes">Collate</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="margin_right">7</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -518,14 +512,13 @@ <property name="can_focus">False</property> <property name="margin_left">6</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="printallsheets"> <property name="label" translatable="yes">All sheets</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -540,11 +533,9 @@ <child> <object class="GtkRadioButton" id="printselectedsheets"> <property name="label" translatable="yes">Selected sheets</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">printselectedcells</property> @@ -558,11 +549,9 @@ <child> <object class="GtkRadioButton" id="printselectedcells"> <property name="label" translatable="yes">Selected cells</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">printallsheets</property> @@ -599,14 +588,13 @@ <property name="can_focus">False</property> <property name="margin_left">6</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="printallpages"> <property name="label" translatable="yes">All pages</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">printpages</property> @@ -621,14 +609,13 @@ <object class="GtkBox" id="box13"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="printpages"> <property name="label" translatable="yes">Pages</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">printselection</property> @@ -662,11 +649,9 @@ <child> <object class="GtkRadioButton" id="printselection"> <property name="label" translatable="yes">Selection</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">printallpages</property> @@ -680,11 +665,9 @@ <child> <object class="GtkCheckButton" id="reverseorder"> <property name="label" translatable="yes">Print in reverse page order</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -737,17 +720,20 @@ <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkBox" id="box7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">7</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Comments</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">writercomments</property> </object> <packing> <property name="expand">False</property> @@ -796,23 +782,26 @@ <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkBox" id="box5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">3</property> + <property name="spacing">6</property> <child> <object class="GtkBox" id="box17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">7</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Document</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">impressdocument</property> </object> <packing> <property name="expand">False</property> @@ -842,12 +831,14 @@ <object class="GtkBox" id="box18"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">7</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Slides per page</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">slidesperpage</property> </object> <packing> <property name="expand">False</property> @@ -871,6 +862,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Order</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">slidesperpageorder</property> </object> <packing> <property name="expand">False</property> @@ -932,6 +925,7 @@ <object class="GtkBox" id="customcontents"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -956,7 +950,9 @@ <object class="GtkBox" id="box9"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame5"> <property name="visible">True</property> @@ -967,12 +963,14 @@ <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">7</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkComboBox" id="paperspersheetlb"> <property name="visible">True</property> @@ -993,11 +991,9 @@ <child> <object class="GtkRadioButton" id="pagespersheetbtn"> <property name="label" translatable="yes">Pages per sheet</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -1030,11 +1026,9 @@ <child> <object class="GtkRadioButton" id="brochure"> <property name="label" translatable="yes">Brochure</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> @@ -1054,6 +1048,8 @@ <property name="halign">start</property> <property name="margin_left">12</property> <property name="label" translatable="yes">Pages</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">pagecols</property> </object> <packing> <property name="left_attach">0</property> @@ -1069,6 +1065,8 @@ <property name="halign">start</property> <property name="margin_left">12</property> <property name="label" translatable="yes">Margin</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sheetmarginsb:0mm</property> </object> <packing> <property name="left_attach">0</property> @@ -1084,6 +1082,8 @@ <property name="halign">start</property> <property name="margin_left">12</property> <property name="label" translatable="yes">Orientation</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">orientationlb</property> </object> <packing> <property name="left_attach">0</property> @@ -1099,6 +1099,8 @@ <property name="halign">start</property> <property name="margin_left">12</property> <property name="label" translatable="yes">Distance</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">pagemarginsb:0mm</property> </object> <packing> <property name="left_attach">0</property> @@ -1198,6 +1200,8 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">by</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">pagerows</property> </object> <packing> <property name="left_attach">2</property> @@ -1237,13 +1241,11 @@ <child> <object class="GtkCheckButton" id="bordercb"> <property name="label" translatable="yes">Draw a border around each page</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="halign">start</property> <property name="margin_left">12</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -1261,6 +1263,8 @@ <property name="halign">start</property> <property name="margin_left">12</property> <property name="label" translatable="yes">Order</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">orderlb</property> </object> <packing> <property name="left_attach">0</property> @@ -1335,6 +1339,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Include</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">brochureinclude</property> </object> <packing> <property name="expand">False</property> @@ -1394,25 +1400,26 @@ <object class="GtkFrame" id="frame6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="printtofile"> <property name="label" translatable="yes">Print to file</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -1426,11 +1433,9 @@ <child> <object class="GtkCheckButton" id="singleprintjob"> <property name="label" translatable="yes">Create single print jobs for collated output</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -1444,10 +1449,8 @@ <child> <object class="GtkCheckButton" id="printpaperfromsetup"> <property name="label" translatable="yes">Use only paper tray from printer preferences</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits