[Libreoffice-commits] core.git: sw/uiconfig tubes/uiconfig uui/uiconfig vcl/uiconfig xmlsecurity/uiconfig
Caolán McNamara
caolanm at redhat.com
Wed Feb 20 12:23:27 PST 2013
sw/uiconfig/swriter/ui/autotext.ui | 6 +-
sw/uiconfig/swriter/ui/columndialog.ui | 4 -
sw/uiconfig/swriter/ui/splittable.ui | 8 +-
tubes/uiconfig/ui/contacts.ui | 62 +++++++++++----------
uui/uiconfig/ui/masterpassworddlg.ui | 2
vcl/uiconfig/ui/printdialog.ui | 51 ++++++++++++++---
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui | 5 -
xmlsecurity/uiconfig/ui/macrosecuritydialog.ui | 4 -
xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 4 -
9 files changed, 93 insertions(+), 53 deletions(-)
New commits:
commit 76bc43823a53d76e49260a601e893bc1a791fb03
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 20 20:21:30 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88
diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index 6689142..85c820f 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="AutoTextDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">AutoText</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="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>
@@ -115,7 +115,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="row_spacing">12</property>
<property name="column_spacing">18</property>
<child>
<object class="GtkFrame" id="frame1">
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui b/sw/uiconfig/swriter/ui/columndialog.ui
index 914c626..73f23a0 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ColumnDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Columns</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="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>
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/uui/uiconfig/ui/masterpassworddlg.ui b/uui/uiconfig/ui/masterpassworddlg.ui
index b03a85a..29ef847 100644
--- a/uui/uiconfig/ui/masterpassworddlg.ui
+++ b/uui/uiconfig/ui/masterpassworddlg.ui
@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="MasterPasswordDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Enter Master Password</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index a49737e..8f76126 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -22,14 +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>
@@ -95,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>
@@ -114,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>
@@ -192,6 +193,7 @@
<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>
@@ -202,6 +204,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">
@@ -411,12 +414,14 @@
<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>
@@ -450,6 +455,7 @@
<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>
@@ -457,7 +463,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -606,6 +611,7 @@
<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>
@@ -716,17 +722,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>
@@ -775,6 +784,7 @@
<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">
@@ -786,12 +796,14 @@
<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>
@@ -821,12 +833,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>
@@ -850,6 +864,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>
@@ -938,6 +954,7 @@
<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>
@@ -948,13 +965,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="row_spacing">6</property>
- <property name="column_spacing">7</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkComboBox" id="paperspersheetlb">
<property name="visible">True</property>
@@ -1032,6 +1050,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>
@@ -1047,6 +1067,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>
@@ -1062,6 +1084,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>
@@ -1077,6 +1101,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>
@@ -1176,6 +1202,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,6 +1265,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>
@@ -1312,6 +1342,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>
@@ -1378,6 +1410,7 @@
<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">
diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index a56bc24..3085c25 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="DigitalSignaturesDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Digital Signatures</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>
@@ -61,7 +61,6 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="dochint">
<property name="can_focus">False</property>
diff --git a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui
index 08cc254..15d7e8c 100644
--- a/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui
+++ b/xmlsecurity/uiconfig/ui/macrosecuritydialog.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="MacroSecurityDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Macro Security</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>
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 26128ee..621bc4f 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="SelectCertificateDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Select Certificate</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>
More information about the Libreoffice-commits
mailing list