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 /svx/uiconfig | |
parent | 306ebcbcf58f3c5ec065d94c8a9699db2a7c8d51 (diff) |
various efforts to consistently apply HIG rules
Change-Id: I786227d89cc441990d6bdce0acf872a73be51a7c
Diffstat (limited to 'svx/uiconfig')
-rw-r--r-- | svx/uiconfig/ui/asianphoneticguidedialog.ui | 5 | ||||
-rw-r--r-- | svx/uiconfig/ui/chineseconversiondialog.ui | 4 | ||||
-rw-r--r-- | svx/uiconfig/ui/compressgraphicdialog.ui | 448 |
3 files changed, 228 insertions, 229 deletions
diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui b/svx/uiconfig/ui/asianphoneticguidedialog.ui index 9c045ca88b46..aa1cf2c5b59a 100644 --- a/svx/uiconfig/ui/asianphoneticguidedialog.ui +++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> + <!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="AsianPhoneticGuideDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Asian Phonetic Guide</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/svx/uiconfig/ui/chineseconversiondialog.ui b/svx/uiconfig/ui/chineseconversiondialog.ui index 0d574383ab49..d4fcc92e34a6 100644 --- a/svx/uiconfig/ui/chineseconversiondialog.ui +++ b/svx/uiconfig/ui/chineseconversiondialog.ui @@ -3,14 +3,14 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="ChineseConversionDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Chinese Conversion</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/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index aff843196865..8695798fb3c9 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -1,15 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="compression-adjustment"> + <property name="lower">1</property> + <property name="upper">9</property> + <property name="value">9</property> + <property name="step_increment">1</property> + <property name="page_increment">1</property> + </object> + <object class="GtkAdjustment" id="height-adjustment"> + <property name="lower">1</property> + <property name="upper">20000</property> + <property name="value">1</property> + <property name="step_increment">100</property> + <property name="page_increment">100</property> + </object> + <object class="GtkListStore" id="interpolation-method-store"> + <columns> + <!-- column-name scale-method-name --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + <row> + <col id="0" translatable="yes">Bilinear</col> + </row> + <row> + <col id="0" translatable="yes">Bicubic</col> + </row> + <row> + <col id="0" translatable="yes">Lanczos</col> + </row> + </data> + </object> <object class="GtkDialog" id="CompressGraphicDialog"> <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> - <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> @@ -17,13 +51,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> @@ -35,11 +67,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> @@ -60,181 +90,176 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkExpander" id="expander1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="bottom_padding">20</property> + <property name="can_focus">True</property> + <property name="expanded">True</property> <child> - <object class="GtkExpander" id="expander1"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expanded">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">18</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">20</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Original Size:</property> - <property name="width_chars">15</property> - <property name="single_line_mode">True</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> - <child> - <object class="GtkLabel" id="label-original-size"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">???</property> - </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> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">View Size:</property> - <property name="width_chars">15</property> - </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="label9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Image Capacity:</property> - <property name="width_chars">15</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">New Capacity:</property> - <property name="width_chars">15</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label-view-size"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">???</property> - </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> - <object class="GtkLabel" id="label-image-capacity"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">???</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label-new-capacity"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xalign">0</property> - <property name="label">???</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="calculate"> - <property name="label" translatable="yes">Calculate</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="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Original Size:</property> + <property name="width_chars">15</property> + <property name="single_line_mode">True</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> + <child> + <object class="GtkLabel" id="label-original-size"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label">???</property> + </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> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">View Size:</property> + <property name="width_chars">15</property> + </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="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Image Capacity:</property> + <property name="width_chars">15</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">New Capacity:</property> + <property name="width_chars">15</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label-view-size"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label">???</property> + </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> + <object class="GtkLabel" id="label-image-capacity"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label">???</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label-new-capacity"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label">???</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="calculate"> + <property name="label" translatable="yes">Calculate</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">start</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <placeholder/> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Image Information</property> </object> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Image Information</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -246,16 +271,15 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="radio-lossless"> <property name="label" translatable="yes">Lossless Compression</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> @@ -270,11 +294,9 @@ <child> <object class="GtkCheckButton" id="checkbox-reduce-resolution"> <property name="label" translatable="yes">Reduce Image Resolution</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> @@ -289,9 +311,12 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spin-new-width</property> <property name="width_chars">15</property> </object> <packing> @@ -305,7 +330,6 @@ <object class="GtkSpinButton" id="spin-new-width"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="adjustment">width-adjustment</property> <property name="numeric">True</property> </object> @@ -320,9 +344,12 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Height:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spin-new-height</property> <property name="width_chars">15</property> </object> <packing> @@ -335,11 +362,9 @@ <child> <object class="GtkRadioButton" id="radio-jpeg"> <property name="label" translatable="yes">JPEG Compression</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">radio-lossless</property> @@ -355,9 +380,12 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Resolution:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">combo-resolution</property> <property name="width_chars">15</property> </object> <packing> @@ -371,7 +399,6 @@ <object class="GtkSpinButton" id="spin-new-height"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="adjustment">height-adjustment</property> <property name="numeric">True</property> </object> @@ -386,22 +413,20 @@ <object class="GtkComboBoxText" id="combo-resolution"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="column_span_column">0</property> <property name="has_entry">True</property> <items> - <item translatable="no">50</item> - <item translatable="no">75</item> - <item translatable="no">96</item> - <item translatable="no">150</item> - <item translatable="no">200</item> - <item translatable="no">300</item> - <item translatable="no">600</item> + <item>50</item> + <item>75</item> + <item>96</item> + <item>150</item> + <item>200</item> + <item>300</item> + <item>600</item> </items> <child internal-child="entry"> <object class="GtkEntry" id="comboboxtext-entry"> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="invisible_char">•</property> </object> </child> @@ -417,9 +442,12 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Quality:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spin-quality</property> <property name="width_chars">15</property> </object> <packing> @@ -433,9 +461,12 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Compression:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spin-compression</property> <property name="width_chars">15</property> </object> <packing> @@ -449,7 +480,6 @@ <object class="GtkSpinButton" id="spin-quality"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> <property name="invisible_char">•</property> <property name="adjustment">quality-adjustment</property> <property name="numeric">True</property> @@ -465,7 +495,6 @@ <object class="GtkSpinButton" id="spin-compression"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hexpand">True</property> <property name="invisible_char">•</property> <property name="invisible_char_set">True</property> <property name="adjustment">compression-adjustment</property> @@ -482,9 +511,12 @@ <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">20</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Interpolation:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">interpolation-method-combo</property> <property name="width_chars">15</property> </object> <packing> @@ -579,40 +611,6 @@ <action-widget response="0">cancel</action-widget> </action-widgets> </object> - <object class="GtkAdjustment" id="compression-adjustment"> - <property name="lower">1</property> - <property name="upper">9</property> - <property name="value">9</property> - <property name="step_increment">1</property> - <property name="page_increment">1</property> - </object> - <object class="GtkAdjustment" id="height-adjustment"> - <property name="lower">1</property> - <property name="upper">20000</property> - <property name="value">1</property> - <property name="step_increment">100</property> - <property name="page_increment">100</property> - </object> - <object class="GtkListStore" id="interpolation-method-store"> - <columns> - <!-- column-name scale-method-name --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0" translatable="yes">None</col> - </row> - <row> - <col id="0" translatable="yes">Bilinear</col> - </row> - <row> - <col id="0" translatable="yes">Bicubic</col> - </row> - <row> - <col id="0" translatable="yes">Lanczos</col> - </row> - </data> - </object> <object class="GtkAdjustment" id="quality-adjustment"> <property name="lower">1</property> <property name="upper">99</property> |