diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-03-15 10:12:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-15 10:14:13 +0000 |
commit | 0f47c848ed3183836f4d16629c8172c1c0503d54 (patch) | |
tree | 59b40d45804c7db532981c46835b4fa944bbd776 /cui | |
parent | 306ebcbcf58f3c5ec065d94c8a9699db2a7c8d51 (diff) |
various efforts to consistently apply HIG rules
Change-Id: I786227d89cc441990d6bdce0acf872a73be51a7c
Diffstat (limited to 'cui')
-rw-r--r-- | cui/uiconfig/ui/hyphenate.ui | 7 | ||||
-rw-r--r-- | cui/uiconfig/ui/insertoleobject.ui | 23 | ||||
-rw-r--r-- | cui/uiconfig/ui/macroselectordialog.ui | 16 | ||||
-rw-r--r-- | cui/uiconfig/ui/namedialog.ui | 5 | ||||
-rw-r--r-- | cui/uiconfig/ui/newtabledialog.ui | 18 | ||||
-rw-r--r-- | cui/uiconfig/ui/objectnamedialog.ui | 6 | ||||
-rw-r--r-- | cui/uiconfig/ui/scriptorganizer.ui | 18 | ||||
-rw-r--r-- | cui/uiconfig/ui/specialcharacters.ui | 12 | ||||
-rw-r--r-- | cui/uiconfig/ui/spellingdialog.ui | 7 |
9 files changed, 44 insertions, 68 deletions
diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui index da1702ae6286..a859275aa4cc 100644 --- a/cui/uiconfig/ui/hyphenate.ui +++ b/cui/uiconfig/ui/hyphenate.ui @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="HyphenateDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Hyphenation</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> @@ -78,6 +79,8 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Word</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">worded</property> </object> <packing> <property name="left_attach">0</property> diff --git a/cui/uiconfig/ui/insertoleobject.ui b/cui/uiconfig/ui/insertoleobject.ui index 2d6e5b2fb8d3..3de6062dee5d 100644 --- a/cui/uiconfig/ui/insertoleobject.ui +++ b/cui/uiconfig/ui/insertoleobject.ui @@ -3,20 +3,21 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="InsertOLEObjectDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Insert OLE Object</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> <object class="GtkBox" id="box1"> <property name="width_request">400</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> @@ -25,11 +26,9 @@ <child> <object class="GtkRadioButton" id="createnew"> <property name="label" translatable="yes">Create new</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> <property name="group">createfromfile</property> @@ -43,11 +42,9 @@ <child> <object class="GtkRadioButton" id="createfromfile"> <property name="label" translatable="yes">Create from 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="active">True</property> <property name="draw_indicator">True</property> @@ -76,6 +73,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="GtkTreeView" id="types"> @@ -115,11 +113,14 @@ <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="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkEntry" id="urled"> <property name="visible">True</property> @@ -137,12 +138,10 @@ <child> <object class="GtkButton" id="urlbtn"> <property name="label" translatable="yes">Search ...</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="use_action_appearance">False</property> </object> <packing> <property name="left_attach">1</property> @@ -154,11 +153,9 @@ <child> <object class="GtkCheckButton" id="linktofile"> <property name="label" translatable="yes">Link 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> @@ -205,13 +202,11 @@ <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="can_default">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> @@ -223,11 +218,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> @@ -239,11 +232,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> diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui index 39776c42a548..40131bef50b5 100644 --- a/cui/uiconfig/ui/macroselectordialog.ui +++ b/cui/uiconfig/ui/macroselectordialog.ui @@ -3,13 +3,13 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="MacroSelectorDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Macro Selector</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> @@ -18,13 +18,11 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -36,13 +34,11 @@ <child> <object class="GtkButton" id="add"> <property name="label" translatable="yes">Add</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -53,11 +49,9 @@ <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -69,11 +63,9 @@ <child> <object class="GtkButton" id="close"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -85,11 +77,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> @@ -111,7 +101,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">11</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="helpmacro"> <property name="can_focus">False</property> diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui index 5837621b8ceb..39a4e29c812c 100644 --- a/cui/uiconfig/ui/namedialog.ui +++ b/cui/uiconfig/ui/namedialog.ui @@ -3,13 +3,13 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="NameDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Name</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> @@ -73,7 +73,6 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> diff --git a/cui/uiconfig/ui/newtabledialog.ui b/cui/uiconfig/ui/newtabledialog.ui index e4841d6aea91..cc7c90cf8ade 100644 --- a/cui/uiconfig/ui/newtabledialog.ui +++ b/cui/uiconfig/ui/newtabledialog.ui @@ -1,16 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="columns_value"> + <property name="lower">1</property> + <property name="upper">75</property> + <property name="value">5</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkDialog" id="NewTableDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Insert 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> @@ -166,11 +173,4 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkAdjustment" id="columns_value"> - <property name="lower">1</property> - <property name="upper">75</property> - <property name="value">5</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> </interface> diff --git a/cui/uiconfig/ui/objectnamedialog.ui b/cui/uiconfig/ui/objectnamedialog.ui index 319514746ad9..8f15934d6a06 100644 --- a/cui/uiconfig/ui/objectnamedialog.ui +++ b/cui/uiconfig/ui/objectnamedialog.ui @@ -3,14 +3,14 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="ObjectNameDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Name</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox3"> <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_area3"> <property name="can_focus">False</property> @@ -72,7 +72,6 @@ <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -82,6 +81,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_Name</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">object_name_entry</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/scriptorganizer.ui b/cui/uiconfig/ui/scriptorganizer.ui index 328f81369406..4b17afa87ee6 100644 --- a/cui/uiconfig/ui/scriptorganizer.ui +++ b/cui/uiconfig/ui/scriptorganizer.ui @@ -3,13 +3,13 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="ScriptOrganizerDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">%MACROLANG Macros</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> @@ -18,13 +18,11 @@ <child> <object class="GtkButton" id="run"> <property name="label" translatable="yes">Run</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -35,11 +33,9 @@ <child> <object class="GtkButton" id="close"> <property name="label">gtk-close</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> @@ -51,11 +47,9 @@ <child> <object class="GtkButton" id="create"> <property name="label" translatable="yes">Create...</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> @@ -67,11 +61,9 @@ <child> <object class="GtkButton" id="edit"> <property name="label">gtk-edit</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> <property name="image_position">bottom</property> </object> @@ -85,11 +77,9 @@ <child> <object class="GtkButton" id="rename"> <property name="label" translatable="yes">Rename...</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> @@ -101,11 +91,9 @@ <child> <object class="GtkButton" id="delete"> <property name="label" translatable="yes">Delete...</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> @@ -117,11 +105,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> diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index 1fe38029f367..c35b52ae737d 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -3,14 +3,14 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="SpecialCharactersDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Special Characters</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> @@ -100,12 +100,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="fontft"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Font</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">fontlb</property> </object> <packing> <property name="left_attach">0</property> @@ -119,6 +121,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Subset</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subsetlb</property> </object> <packing> <property name="left_attach">2</property> @@ -235,7 +239,7 @@ <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="symboltext"> <property name="visible">True</property> diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 50b072cf163a..bececdb18816 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -4,14 +4,14 @@ <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="SpellingDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Spelling and Grammar: $LANGUAGE ($LOCATION)</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> @@ -112,6 +112,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_Not in dictionary</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">sentence</property> </object> <packing> <property name="left_attach">0</property> @@ -157,6 +158,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">_Suggestions</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">suggestionslb</property> </object> <packing> <property name="left_attach">0</property> @@ -269,6 +271,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">Text languag_e</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">languagelb</property> </object> <packing> <property name="left_attach">0</property> |