changeset dc160c9bd526 in /home/hg/repos/gajim
author: Denis Fomin fominde@gmail.com branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dc160c9bd526 description: fix dialogs buttons. Do not "Show images on buttons". Fixes #7186
diffstat:
data/gui/blocked_contacts_window.ui | 43 ++------------ data/gui/change_status_message_dialog.ui | 43 ++------------ data/gui/esession_info_window.ui | 44 ++------------ data/gui/history_manager.ui | 44 ++------------ data/gui/plugins_window.ui | 93 +++++++------------------------ data/gui/preferences_window.ui | 86 ++++------------------------ data/gui/service_discovery_window.ui | 47 +++------------- src/disco.py | 44 +++++--------- 8 файлов изменено, 89 вставок(+), 355 удалений(-)
различия (урезанные с 673 до 300 строк):
diff -r 426803745353 -r dc160c9bd526 data/gui/blocked_contacts_window.ui --- a/data/gui/blocked_contacts_window.ui Fri Sep 20 13:09:52 2013 +0400 +++ b/data/gui/blocked_contacts_window.ui Fri Sep 20 14:41:56 2013 +0400 @@ -38,47 +38,14 @@ </child> <child> <object class="GtkButton" id="remove_button"> + <property name="label" translatable="yes">_Unblock</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="border_width">3</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_remove_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-remove</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Unblock</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -89,4 +56,8 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> </interface> diff -r 426803745353 -r dc160c9bd526 data/gui/change_status_message_dialog.ui --- a/data/gui/change_status_message_dialog.ui Fri Sep 20 13:09:52 2013 +0400 +++ b/data/gui/change_status_message_dialog.ui Fri Sep 20 14:41:56 2013 +0400 @@ -54,48 +54,15 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="save_as_preset_button"> + <property name="label" translatable="yes">Save as Preset...</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_save_as_preset_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment106"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox3021"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1369"> - <property name="visible">True</property> - <property name="stock">gtk-save-as</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label380"> - <property name="visible">True</property> - <property name="label" translatable="yes">Save as Preset...</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -313,4 +280,8 @@ <action-widget response="-5">ok_button</action-widget> </action-widgets> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-save-as</property> + </object> </interface> diff -r 426803745353 -r dc160c9bd526 data/gui/esession_info_window.ui --- a/data/gui/esession_info_window.ui Fri Sep 20 13:09:52 2013 +0400 +++ b/data/gui/esession_info_window.ui Fri Sep 20 14:41:56 2013 +0400 @@ -7,7 +7,6 @@ <property name="border_width">5</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> @@ -72,46 +71,13 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="verify_now_button"> + <property name="label" translatable="yes">_Verify</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_verify_now_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="button_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Verify</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -148,4 +114,8 @@ <action-widget response="-7">close_button3</action-widget> </action-widgets> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> </interface> diff -r 426803745353 -r dc160c9bd526 data/gui/history_manager.ui --- a/data/gui/history_manager.ui Fri Sep 20 13:09:52 2013 +0400 +++ b/data/gui/history_manager.ui Fri Sep 20 14:41:56 2013 +0400 @@ -212,48 +212,16 @@ </child> <child> <object class="GtkButton" id="search_db_button"> + <property name="label" translatable="yes">_Search Database</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">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <property name="image_position">bottom</property> <signal name="clicked" handler="on_search_db_button_clicked"/> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Search Database</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> </object> <packing> <property name="expand">False</property> @@ -345,4 +313,8 @@ <action-widget response="-5">save_button</action-widget> </action-widgets> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + </object> </interface> diff -r 426803745353 -r dc160c9bd526 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Fri Sep 20 13:09:52 2013 +0400 +++ b/data/gui/plugins_window.ui Fri Sep 20 14:41:56 2013 +0400 @@ -59,34 +59,13 @@ <property name="xalign">0</property> <child> <object class="GtkButton" id="install_plugin_button"> + <property name="label" translatable="yes">Install from zip</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="image">image1</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_install_plugin_button_clicked"/> - <child> - <object class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="configure_plugin_button_label2"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Install from zip</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child>