dbaccess/uiconfig/ui/choosedatasourcedialog.ui | 14 ++++++ dbaccess/uiconfig/ui/parametersdialog.ui | 17 +++++++- dbaccess/uiconfig/ui/password.ui | 14 ++++++ dbaccess/uiconfig/ui/textconnectionsettings.ui | 19 +++++++- sfx2/uiconfig/ui/checkin.ui | 31 ++++++++++---- sfx2/uiconfig/ui/inputdialog.ui | 17 +++++++- sfx2/uiconfig/ui/linkeditdialog.ui | 14 ++++++ sfx2/uiconfig/ui/newstyle.ui | 29 +++++++++---- svx/uiconfig/ui/compressgraphicdialog.ui | 53 +++++++++++++++---------- 9 files changed, 167 insertions(+), 41 deletions(-)
New commits: commit 254c0927e669b5c488df63d07bc9eed3357e88f6 Author: Olivier Hallot <olivier.hal...@edx.srv.br> Date: Sun Aug 31 10:43:40 2014 -0300 More mushrooms... More help buttons missing in dialogs. Change-Id: I9274f3774955f5bb8a470e2e1ad25b3f5723d377 Reviewed-on: https://gerrit.libreoffice.org/11217 Reviewed-by: Thomas Arnhold <tho...@arnhold.org> Tested-by: Thomas Arnhold <tho...@arnhold.org> diff --git a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui index 22b5c6f..6e3032f 100644 --- a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui +++ b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui @@ -61,6 +61,20 @@ <property name="secondary">True</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/dbaccess/uiconfig/ui/parametersdialog.ui b/dbaccess/uiconfig/ui/parametersdialog.ui index 206bee3..24faeef 100644 --- a/dbaccess/uiconfig/ui/parametersdialog.ui +++ b/dbaccess/uiconfig/ui/parametersdialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="Parameters"> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -50,6 +51,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/dbaccess/uiconfig/ui/password.ui b/dbaccess/uiconfig/ui/password.ui index 9c01867..6e8ae87 100644 --- a/dbaccess/uiconfig/ui/password.ui +++ b/dbaccess/uiconfig/ui/password.ui @@ -46,6 +46,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/dbaccess/uiconfig/ui/textconnectionsettings.ui b/dbaccess/uiconfig/ui/textconnectionsettings.ui index 8b90769..b4b6aca 100644 --- a/dbaccess/uiconfig/ui/textconnectionsettings.ui +++ b/dbaccess/uiconfig/ui/textconnectionsettings.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="TextConnectionSettingsDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -23,7 +24,6 @@ <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> @@ -39,7 +39,6 @@ <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> @@ -48,6 +47,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui index 3880aab..7fc8392 100644 --- a/sfx2/uiconfig/ui/checkin.ui +++ b/sfx2/uiconfig/ui/checkin.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="CheckinDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -18,10 +19,12 @@ <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="cancel"> - <property name="label">gtk-cancel</property> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</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_stock">True</property> </object> @@ -32,12 +35,10 @@ </packing> </child> <child> - <object class="GtkButton" id="ok"> - <property name="label">gtk-ok</property> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</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_stock">True</property> </object> @@ -47,6 +48,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -129,8 +144,8 @@ </object> </child> <action-widgets> - <action-widget response="0">cancel</action-widget> <action-widget response="0">ok</action-widget> + <action-widget response="0">cancel</action-widget> </action-widgets> </object> </interface> diff --git a/sfx2/uiconfig/ui/inputdialog.ui b/sfx2/uiconfig/ui/inputdialog.ui index 9085b4c..3c36e66 100644 --- a/sfx2/uiconfig/ui/inputdialog.ui +++ b/sfx2/uiconfig/ui/inputdialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="InputDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -44,6 +45,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui b/sfx2/uiconfig/ui/linkeditdialog.ui index d973c62..a0af5ee 100644 --- a/sfx2/uiconfig/ui/linkeditdialog.ui +++ b/sfx2/uiconfig/ui/linkeditdialog.ui @@ -45,6 +45,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff --git a/sfx2/uiconfig/ui/newstyle.ui b/sfx2/uiconfig/ui/newstyle.ui index 7fa4448..b4fb723 100644 --- a/sfx2/uiconfig/ui/newstyle.ui +++ b/sfx2/uiconfig/ui/newstyle.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="CreateStyleDialog"> <property name="can_focus">False</property> @@ -48,6 +49,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -79,20 +94,18 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="has_entry">True</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> <property name="dropdown">False</property> <property name="max_width_chars">60</property> - <child internal-child="accessible"> - <object class="AtkObject" id="stylename-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Style Name</property> - </object> - </child> <child internal-child="entry"> <object class="GtkEntry" id="comboboxtext-entry"> <property name="can_focus">False</property> </object> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="stylename-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Style Name</property> + </object> + </child> </object> </child> </object> diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui index 0b14381..bcc9fde 100644 --- a/svx/uiconfig/ui/compressgraphicdialog.ui +++ b/svx/uiconfig/ui/compressgraphicdialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="compression-adjustment"> <property name="lower">1</property> <property name="upper">9</property> @@ -35,6 +36,20 @@ </row> </data> </object> + <object class="GtkAdjustment" id="quality-adjustment"> + <property name="lower">1</property> + <property name="upper">99</property> + <property name="value">90</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="width-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="GtkDialog" id="CompressGraphicDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -78,6 +93,20 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -247,9 +276,6 @@ </packing> </child> <child> - <placeholder/> - </child> - <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -280,6 +306,9 @@ <property name="height">1</property> </packing> </child> + <child> + <placeholder/> + </child> </object> </child> </object> @@ -444,7 +473,6 @@ <object class="GtkComboBoxText" id="combo-resolution"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_span_column">0</property> <property name="has_entry">True</property> <items> <item>50</item> @@ -527,7 +555,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â¢</property> - <property name="invisible_char_set">True</property> <property name="adjustment">compression-adjustment</property> <property name="numeric">True</property> </object> @@ -642,18 +669,4 @@ <action-widget response="0">cancel</action-widget> </action-widgets> </object> - <object class="GtkAdjustment" id="quality-adjustment"> - <property name="lower">1</property> - <property name="upper">99</property> - <property name="value">90</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkAdjustment" id="width-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> </interface>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits