copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix dialogs buttons. Do not "Show images on buttons". Fixes #7186

This commit is contained in:
Denis Fomin 2013-09-20 14:41:56 +04:00
parent 29c9e43f6d
commit 5aad77a6a2
7 changed files with 95 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
data/gui/blocked_contacts_window.ui
View File

@ -38,55 +38,26 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="remove_button"> <object class="GtkButton" id="remove_button">
<property name="label" translatable="yes">_Unblock</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="border_width">3</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"/> <signal name="clicked" handler="on_remove_button_clicked"/>
<child> </object>
<object class="GtkAlignment" id="alignment1"> <packing>
<property name="visible">True</property> <property name="expand">False</property>
<property name="xscale">0</property> <property name="fill">False</property>
<property name="yscale">0</property> <property name="position">1</property>
<child> </packing>
<object class="GtkHBox" id="hbox1"> </child>
<property name="visible">True</property> </object>
<property name="spacing">2</property> </child>
<child> </object>
<object class="GtkImage" id="image1"> <object class="GtkImage" id="image1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-remove</property> <property name="stock">gtk-remove</property>
</object> </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>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface> </interface>

4
data/gui/change_status_message_dialog.ui
View File

@ -354,9 +354,5 @@
</child> </child>
</object> </object>
</child> </child>
<action-widgets>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object> </object>
</interface> </interface>

44
data/gui/history_manager.ui
View File

@ -212,48 +212,16 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene
</child> </child>
<child> <child>
<object class="GtkButton" id="search_db_button"> <object class="GtkButton" id="search_db_button">
<property name="label" translatable="yes">_Search Database</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="has_default">True</property> <property name="has_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<signal name="clicked" handler="on_search_db_button_clicked"/> <property name="image">image1</property>
<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> <property name="use_underline">True</property>
</object> <property name="image_position">bottom</property>
<packing> <signal name="clicked" handler="on_search_db_button_clicked"/>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -345,4 +313,8 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene
<action-widget response="-5">save_button</action-widget> <action-widget response="-5">save_button</action-widget>
</action-widgets> </action-widgets>
</object> </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-find</property>
</object>
</interface> </interface>

133
data/gui/plugins_window.ui
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-apply</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-cancel</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-preferences</property>
</object>
<object class="GtkWindow" id="plugins_window"> <object class="GtkWindow" id="plugins_window">
<property name="width_request">650</property> <property name="width_request">650</property>
<property name="height_request">500</property> <property name="height_request">500</property>
@ -45,9 +60,6 @@
<object class="GtkTreeView" id="installed_plugins_treeview"> <object class="GtkTreeView" id="installed_plugins_treeview">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -66,43 +78,12 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<child> <child>
<object class="GtkButton" id="install_plugin_button"> <object class="GtkButton" id="install_plugin_button">
<property name="use_action_appearance">False</property> <property name="label" translatable="yes">Install from zip</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property> <property name="image">image1</property>
<signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/>
<child>
<object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-apply</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="configure_plugin_button_label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Install from zip</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -166,7 +147,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">&lt;empty&gt;</property> <property name="label">&lt;empty&gt;</property>
<property name="selectable">True</property> <property name="selectable">True</property>
</object> </object>
<packing> <packing>
@ -206,7 +187,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0</property> <property name="yalign">0</property>
<property name="label" translatable="yes">&lt;empty&gt;</property> <property name="label">&lt;empty&gt;</property>
<property name="wrap_mode">word-char</property> <property name="wrap_mode">word-char</property>
<property name="selectable">True</property> <property name="selectable">True</property>
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
@ -242,12 +223,10 @@
</child> </child>
<child> <child>
<object class="GtkLinkButton" id="plugin_homepage_linkbutton"> <object class="GtkLinkButton" id="plugin_homepage_linkbutton">
<property name="label" translatable="yes">homepage url</property> <property name="label">homepage url</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property> <property name="relief">none</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -325,43 +304,12 @@
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child> <child>
<object class="GtkButton" id="uninstall_plugin_button"> <object class="GtkButton" id="uninstall_plugin_button">
<property name="use_action_appearance">False</property> <property name="label" translatable="yes">Uninstall</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property> <property name="image">image2</property>
<signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/> <signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-cancel</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="uninstall_plugin_button_label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Uninstall</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -371,43 +319,12 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="configure_plugin_button"> <object class="GtkButton" id="configure_plugin_button">
<property name="use_action_appearance">False</property> <property name="label" translatable="yes">Configure</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property> <property name="image">image3</property>
<signal name="clicked" handler="on_configure_plugin_button_clicked" swapped="no"/> <signal name="clicked" handler="on_configure_plugin_button_clicked" swapped="no"/>
<child>
<object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-preferences</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="configure_plugin_button_label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Configure</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -462,11 +379,9 @@
<child> <child>
<object class="GtkButton" id="close_button"> <object class="GtkButton" id="close_button">
<property name="label">gtk-close</property> <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="clicked" handler="on_close_button_clicked" swapped="no"/> <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
</object> </object>

217
data/gui/preferences_window.ui
View File

@ -15,6 +15,16 @@
<property name="step_increment">1</property> <property name="step_increment">1</property>
<property name="page_increment">10</property> <property name="page_increment">10</property>
</object> </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-revert-to-saved</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
</object>
<object class="GtkListStore" id="liststore1"> <object class="GtkListStore" id="liststore1">
<columns> <columns>
<!-- column-name item --> <!-- column-name item -->
@ -214,12 +224,10 @@
<child> <child>
<object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton">
<property name="label" translatable="yes">Display a_vatars of contacts in roster</property> <property name="label" translatable="yes">Display a_vatars of contacts in roster</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -234,12 +242,10 @@
<child> <child>
<object class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton"> <object class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton">
<property name="label" translatable="yes">Display status _messages of contacts in roster</property> <property name="label" translatable="yes">Display status _messages of contacts in roster</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -254,12 +260,10 @@
<child> <child>
<object class="GtkCheckButton" id="show_pep_in_roster_checkbutton"> <object class="GtkCheckButton" id="show_pep_in_roster_checkbutton">
<property name="label" translatable="yes">Display e_xtra information of contacts in roster (mood, activity, ...)m_ood of contacts in roster</property> <property name="label" translatable="yes">Display e_xtra information of contacts in roster (mood, activity, ...)m_ood of contacts in roster</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -291,11 +295,9 @@
<child> <child>
<object class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> <object class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton">
<property name="label" translatable="yes">in _roster</property> <property name="label" translatable="yes">in _roster</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -310,11 +312,9 @@
<child> <child>
<object class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> <object class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton">
<property name="label" translatable="yes">in _group chats</property> <property name="label" translatable="yes">in _group chats</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -426,11 +426,9 @@
<child> <child>
<object class="GtkCheckButton" id="compact_view_checkbutton"> <object class="GtkCheckButton" id="compact_view_checkbutton">
<property name="label" translatable="yes">Ma_ke message windows compact</property> <property name="label" translatable="yes">Ma_ke message windows compact</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Hide all buttons in chat windows</property> <property name="tooltip_text" translatable="yes">Hide all buttons in chat windows</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -446,12 +444,10 @@
<child> <child>
<object class="GtkCheckButton" id="xhtml_checkbutton"> <object class="GtkCheckButton" id="xhtml_checkbutton">
<property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="label" translatable="yes">_Ignore rich content in incoming messages</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> <property name="tooltip_text" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -467,11 +463,9 @@
<child> <child>
<object class="GtkCheckButton" id="speller_checkbutton"> <object class="GtkCheckButton" id="speller_checkbutton">
<property name="label" translatable="yes">_Highlight misspelled words</property> <property name="label" translatable="yes">_Highlight misspelled words</property>
<property name="use_action_appearance">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -545,11 +539,9 @@
<child> <child>
<object class="GtkCheckButton" id="positive_184_ack_checkbutton"> <object class="GtkCheckButton" id="positive_184_ack_checkbutton">
<property name="label" translatable="yes">Show icon when your messages are received</property> <property name="label" translatable="yes">Show icon when your messages are received</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<signal name="toggled" handler="on_positive_184_ack_checkbutton_toggled" swapped="no"/> <signal name="toggled" handler="on_positive_184_ack_checkbutton_toggled" swapped="no"/>
@ -665,12 +657,10 @@
<child> <child>
<object class="GtkCheckButton" id="notify_on_signin_checkbutton"> <object class="GtkCheckButton" id="notify_on_signin_checkbutton">
<property name="label" translatable="yes">Notify me about contacts that sign _in</property> <property name="label" translatable="yes">Notify me about contacts that sign _in</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -685,12 +675,10 @@
<child> <child>
<object class="GtkCheckButton" id="notify_on_signout_checkbutton"> <object class="GtkCheckButton" id="notify_on_signout_checkbutton">
<property name="label" translatable="yes">Notify me about contacts that sign _out</property> <property name="label" translatable="yes">Notify me about contacts that sign _out</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out</property> <property name="tooltip_text" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -705,11 +693,9 @@
<child> <child>
<object class="GtkCheckButton" id="auto_popup_away_checkbutton"> <object class="GtkCheckButton" id="auto_popup_away_checkbutton">
<property name="label" translatable="yes">Allow popup/notifications when I'm _away/na/busy/invisible</property> <property name="label" translatable="yes">Allow popup/notifications when I'm _away/na/busy/invisible</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -742,12 +728,10 @@
<child> <child>
<object class="GtkCheckButton" id="notify_gmail_checkbutton"> <object class="GtkCheckButton" id="notify_gmail_checkbutton">
<property name="label" translatable="yes">Notify on new _GMail email</property> <property name="label" translatable="yes">Notify on new _GMail email</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -762,12 +746,10 @@
<child> <child>
<object class="GtkCheckButton" id="notify_gmail_extra_checkbutton"> <object class="GtkCheckButton" id="notify_gmail_extra_checkbutton">
<property name="label" translatable="yes">Display _extra email details</property> <property name="label" translatable="yes">Display _extra email details</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of new emails</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of new emails</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -887,11 +869,9 @@
<child> <child>
<object class="GtkCheckButton" id="play_sounds_checkbutton"> <object class="GtkCheckButton" id="play_sounds_checkbutton">
<property name="label" translatable="yes">Play _sounds</property> <property name="label" translatable="yes">Play _sounds</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -906,11 +886,9 @@
<child> <child>
<object class="GtkButton" id="manage_sounds_button"> <object class="GtkButton" id="manage_sounds_button">
<property name="label" translatable="yes">Ma_nage...</property> <property name="label" translatable="yes">Ma_nage...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="clicked" handler="on_manage_sounds_button_clicked" swapped="no"/> <signal name="clicked" handler="on_manage_sounds_button_clicked" swapped="no"/>
</object> </object>
@ -930,11 +908,9 @@
<child> <child>
<object class="GtkCheckButton" id="sound_dnd_checkbutton"> <object class="GtkCheckButton" id="sound_dnd_checkbutton">
<property name="label" translatable="yes">Allow sound when I'm _busy</property> <property name="label" translatable="yes">Allow sound when I'm _busy</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1167,12 +1143,10 @@
<child> <child>
<object class="GtkCheckButton" id="auto_away_checkbutton"> <object class="GtkCheckButton" id="auto_away_checkbutton">
<property name="label" translatable="yes">_Away after:</property> <property name="label" translatable="yes">_Away after:</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1186,12 +1160,10 @@
<child> <child>
<object class="GtkCheckButton" id="auto_xa_checkbutton"> <object class="GtkCheckButton" id="auto_xa_checkbutton">
<property name="label" translatable="yes">_Not available after:</property> <property name="label" translatable="yes">_Not available after:</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1378,11 +1350,9 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkCheckButton" id="prompt_online_status_message_checkbutton"> <object class="GtkCheckButton" id="prompt_online_status_message_checkbutton">
<property name="label" translatable="yes">Sign _in</property> <property name="label" translatable="yes">Sign _in</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1397,11 +1367,9 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkCheckButton" id="prompt_offline_status_message_checkbutton"> <object class="GtkCheckButton" id="prompt_offline_status_message_checkbutton">
<property name="label" translatable="yes">Sign _out</property> <property name="label" translatable="yes">Sign _out</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1432,16 +1400,11 @@ $T will be replaced by auto-not-available timeout</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property> <property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTreeView" id="default_msg_treeview"> <object class="GtkTreeView" id="default_msg_treeview">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1503,12 +1466,10 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkButton" id="new_msg_button"> <object class="GtkButton" id="new_msg_button">
<property name="label">gtk-new</property> <property name="label">gtk-new</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="clicked" handler="on_new_msg_button_clicked" swapped="no"/> <signal name="clicked" handler="on_new_msg_button_clicked" swapped="no"/>
</object> </object>
@ -1521,12 +1482,10 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkButton" id="delete_msg_button"> <object class="GtkButton" id="delete_msg_button">
<property name="label">gtk-delete</property> <property name="label">gtk-delete</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="clicked" handler="on_delete_msg_button_clicked" swapped="no"/> <signal name="clicked" handler="on_delete_msg_button_clicked" swapped="no"/>
</object> </object>
@ -1548,8 +1507,6 @@ $T will be replaced by auto-not-available timeout</property>
<object class="GtkScrolledWindow" id="scrolledwindow22"> <object class="GtkScrolledWindow" id="scrolledwindow22">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTreeView" id="msg_treeview"> <object class="GtkTreeView" id="msg_treeview">
@ -1560,9 +1517,6 @@ $T will be replaced by auto-not-available timeout</property>
<property name="headers_clickable">False</property> <property name="headers_clickable">False</property>
<signal name="cursor-changed" handler="on_msg_treeview_cursor_changed" swapped="no"/> <signal name="cursor-changed" handler="on_msg_treeview_cursor_changed" swapped="no"/>
<signal name="key-press-event" handler="on_msg_treeview_key_press_event" swapped="no"/> <signal name="key-press-event" handler="on_msg_treeview_key_press_event" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1657,11 +1611,9 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkFontButton" id="conversation_fontbutton"> <object class="GtkFontButton" id="conversation_fontbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<signal name="font-set" handler="on_conversation_fontbutton_font_set" swapped="no"/> <signal name="font-set" handler="on_conversation_fontbutton_font_set" swapped="no"/>
</object> </object>
<packing> <packing>
@ -1672,11 +1624,9 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkCheckButton" id="default_chat_font"> <object class="GtkCheckButton" id="default_chat_font">
<property name="label" translatable="yes">Use system _default</property> <property name="label" translatable="yes">Use system _default</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1752,12 +1702,10 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkCheckButton" id="transports_iconsets_checkbutton"> <object class="GtkCheckButton" id="transports_iconsets_checkbutton">
<property name="label" translatable="yes">Use _transports icons</property> <property name="label" translatable="yes">Use _transports icons</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -1817,12 +1765,10 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkButton" id="manage_theme_button"> <object class="GtkButton" id="manage_theme_button">
<property name="label" translatable="yes">Ma_nage...</property> <property name="label" translatable="yes">Ma_nage...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Configure color and font of the interface</property> <property name="tooltip_text" translatable="yes">Configure color and font of the interface</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="clicked" handler="on_manage_theme_button_clicked" swapped="no"/> <signal name="clicked" handler="on_manage_theme_button_clicked" swapped="no"/>
</object> </object>
@ -1886,6 +1832,12 @@ $T will be replaced by auto-not-available timeout</property>
<property name="n_columns">4</property> <property name="n_columns">4</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkLabel" id="label72"> <object class="GtkLabel" id="label72">
<property name="visible">True</property> <property name="visible">True</property>
@ -1966,53 +1918,14 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkButton" id="reset_colors_button"> <object class="GtkButton" id="reset_colors_button">
<property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Reset to Default Colors</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property> <property name="image">image1</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property> <property name="focus_on_click">False</property>
<signal name="clicked" handler="on_reset_colors_button_clicked" swapped="no"/> <signal name="clicked" handler="on_reset_colors_button_clicked" swapped="no"/>
<child>
<object class="GtkAlignment" id="alignment52">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox2936">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image439">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-revert-to-saved</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="label217">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Reset to Default Colors</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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -2064,11 +1977,9 @@ $T will be replaced by auto-not-available timeout</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkCheckButton" id="incoming_msg_checkbutton"> <object class="GtkCheckButton" id="incoming_msg_checkbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<signal name="toggled" handler="on_incoming_msg_checkbutton_toggled" swapped="no"/> <signal name="toggled" handler="on_incoming_msg_checkbutton_toggled" swapped="no"/>
@ -2081,11 +1992,9 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkColorButton" id="incoming_msg_colorbutton"> <object class="GtkColorButton" id="incoming_msg_colorbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color-set" handler="on_incoming_msg_colorbutton_color_set" swapped="no"/> <signal name="color-set" handler="on_incoming_msg_colorbutton_color_set" swapped="no"/>
@ -2113,11 +2022,9 @@ $T will be replaced by auto-not-available timeout</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkCheckButton" id="outgoing_msg_checkbutton"> <object class="GtkCheckButton" id="outgoing_msg_checkbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled" swapped="no"/> <signal name="toggled" handler="on_outgoing_msg_checkbutton_toggled" swapped="no"/>
@ -2130,11 +2037,9 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkColorButton" id="outgoing_msg_colorbutton"> <object class="GtkColorButton" id="outgoing_msg_colorbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color-set" handler="on_outgoing_msg_colorbutton_color_set" swapped="no"/> <signal name="color-set" handler="on_outgoing_msg_colorbutton_color_set" swapped="no"/>
@ -2165,11 +2070,9 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkColorButton" id="incoming_nick_colorbutton"> <object class="GtkColorButton" id="incoming_nick_colorbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color-set" handler="on_incoming_nick_colorbutton_color_set" swapped="no"/> <signal name="color-set" handler="on_incoming_nick_colorbutton_color_set" swapped="no"/>
@ -2195,11 +2098,9 @@ $T will be replaced by auto-not-available timeout</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkColorButton" id="status_msg_colorbutton"> <object class="GtkColorButton" id="status_msg_colorbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color-set" handler="on_status_msg_colorbutton_color_set" swapped="no"/> <signal name="color-set" handler="on_status_msg_colorbutton_color_set" swapped="no"/>
@ -2230,11 +2131,9 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkColorButton" id="outgoing_nick_colorbutton"> <object class="GtkColorButton" id="outgoing_nick_colorbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color-set" handler="on_outgoing_nick_colorbutton_color_set" swapped="no"/> <signal name="color-set" handler="on_outgoing_nick_colorbutton_color_set" swapped="no"/>
@ -2263,11 +2162,9 @@ $T will be replaced by auto-not-available timeout</property>
</child> </child>
<child> <child>
<object class="GtkColorButton" id="url_msg_colorbutton"> <object class="GtkColorButton" id="url_msg_colorbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color-set" handler="on_url_msg_colorbutton_color_set" swapped="no"/> <signal name="color-set" handler="on_url_msg_colorbutton_color_set" swapped="no"/>
@ -2292,6 +2189,7 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkHBox" id="hbox2"> <object class="GtkHBox" id="hbox2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
@ -2302,10 +2200,11 @@ $T will be replaced by auto-not-available timeout</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="color">#000000000000</property> <property name="color">#000000000000</property>
<signal name="color_set" handler="on_muc_highlight_colorbutton_color_set"/> <signal name="color-set" handler="on_muc_highlight_colorbutton_color_set" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property> <property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
@ -2323,6 +2222,7 @@ $T will be replaced by auto-not-available timeout</property>
<child> <child>
<object class="GtkLabel" id="label30"> <object class="GtkLabel" id="label30">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Group chat highlight:</property> <property name="label" translatable="yes">Group chat highlight:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -2334,12 +2234,6 @@ $T will be replaced by auto-not-available timeout</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -2683,11 +2577,9 @@ to discover one from server.</property>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="stun_checkbutton"> <object class="GtkCheckButton" id="stun_checkbutton">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/> <signal name="toggled" handler="on_stun_checkbutton_toggled" swapped="no"/>
@ -2948,12 +2840,10 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> <object class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
<property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -2966,12 +2856,10 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="send_os_info_checkbutton"> <object class="GtkCheckButton" id="send_os_info_checkbutton">
<property name="label" translatable="yes">Allow client / _OS information to be sent</property> <property name="label" translatable="yes">Allow client / _OS information to be sent</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the operation system you are using</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the operation system you are using</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -2985,12 +2873,10 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="send_time_info_checkbutton"> <object class="GtkCheckButton" id="send_time_info_checkbutton">
<property name="label" translatable="yes">Allow local system time information to be sent</property> <property name="label" translatable="yes">Allow local system time information to be sent</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the time on your system</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will allow others to detect the time on your system</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -3004,12 +2890,10 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> <object class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
<property name="label" translatable="yes">Log _encrypted chat session</property> <property name="label" translatable="yes">Log _encrypted chat session</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -3023,11 +2907,9 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="send_idle_time_checkbutton"> <object class="GtkCheckButton" id="send_idle_time_checkbutton">
<property name="label" translatable="yes">Allow my _idle time to be sent</property> <property name="label" translatable="yes">Allow my _idle time to be sent</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -3077,11 +2959,9 @@ to discover one from server.</property>
<child> <child>
<object class="GtkButton" id="manage_proxies_button"> <object class="GtkButton" id="manage_proxies_button">
<property name="label" translatable="yes">_Manage...</property> <property name="label" translatable="yes">_Manage...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="clicked" handler="on_manage_proxies_button_clicked" swapped="no"/> <signal name="clicked" handler="on_manage_proxies_button_clicked" swapped="no"/>
</object> </object>
@ -3137,11 +3017,9 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="log_show_changes_checkbutton"> <object class="GtkCheckButton" id="log_show_changes_checkbutton">
<property name="label" translatable="yes">_Log status changes of contacts</property> <property name="label" translatable="yes">_Log status changes of contacts</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -3156,11 +3034,9 @@ to discover one from server.</property>
<child> <child>
<object class="GtkCheckButton" id="check_default_client_checkbutton"> <object class="GtkCheckButton" id="check_default_client_checkbutton">
<property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property> <property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@ -3207,52 +3083,13 @@ to discover one from server.</property>
<property name="right_padding">335</property> <property name="right_padding">335</property>
<child> <child>
<object class="GtkButton" id="open_advanced_editor_button"> <object class="GtkButton" id="open_advanced_editor_button">
<property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Open...</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property> <property name="image">image2</property>
<signal name="clicked" handler="on_open_advanced_editor_button_clicked" swapped="no"/>
<child>
<object class="GtkAlignment" id="alignment70">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox2962">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image597">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</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="label296">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Open...</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> <signal name="clicked" handler="on_open_advanced_editor_button_clicked" swapped="no"/>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -3304,12 +3141,10 @@ to discover one from server.</property>
<child> <child>
<object class="GtkButton" id="close_button"> <object class="GtkButton" id="close_button">
<property name="label">gtk-close</property> <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="clicked" handler="on_close_button_clicked" swapped="no"/> <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
</object> </object>

87
data/gui/service_discovery_window.ui
View File

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-jump-to</property>
</object>
<object class="GtkListStore" id="liststore1"> <object class="GtkListStore" id="liststore1">
<columns> <columns>
<!-- column-name item --> <!-- column-name item -->
@ -78,56 +83,23 @@ Agent JID - node</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkButton" id="browse_button"> <object class="GtkButton" id="browse_button">
<property name="use_action_appearance">False</property> <property name="label" translatable="yes">G_o</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="has_default">True</property> <property name="has_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property> <property name="image">image1</property>
<signal name="clicked" handler="on_go_button_clicked" swapped="no"/>
<child>
<object class="GtkAlignment" id="alignment93">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox2995">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image1148">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-jump-to</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="label362">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">G_o</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> <signal name="clicked" handler="on_go_button_clicked" swapped="no"/>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
@ -150,32 +122,6 @@ Agent JID - node</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
<child>
<object class="GtkComboBoxText" id="address_comboboxtext">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<signal name="changed" handler="on_address_comboboxtext_changed" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="address_entry">
<property name="can_focus">True</property>
<property name="activates_default">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -194,9 +140,6 @@ Agent JID - node</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="headers_visible">False</property> <property name="headers_visible">False</property>
<signal name="row-activated" handler="on_services_treeview_row_activated" swapped="no"/> <signal name="row-activated" handler="on_services_treeview_row_activated" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -243,13 +186,11 @@ Agent JID - node</property>
<child> <child>
<object class="GtkButton" id="close_button"> <object class="GtkButton" id="close_button">
<property name="label">gtk-close</property> <property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="has_focus">True</property> <property name="has_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="clicked" handler="on_close_button_clicked" swapped="no"/> <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
</object> </object>

44
src/disco.py
View File

@ -927,15 +927,12 @@ class AgentBrowser:
perform perform
""" """
self.browse_button = Gtk.Button() self.browse_button = Gtk.Button()
image = Gtk.Image.new_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
label = Gtk.Label(label=_('_Browse'))
label.set_use_underline(True)
hbox = Gtk.HBox()
hbox.pack_start(image, False, True, 6)
hbox.pack_end(label, True, True, 6)
self.browse_button.add(hbox)
self.browse_button.connect('clicked', self.on_browse_button_clicked) self.browse_button.connect('clicked', self.on_browse_button_clicked)
self.window.action_buttonbox.add(self.browse_button) self.window.action_buttonbox.add(self.browse_button)
image = Gtk.Image.new_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
self.browse_button.set_image(image)
label = _('_Browse')
self.browse_button.set_label(label)
self.browse_button.show_all() self.browse_button.show_all()
def _clean_actions(self): def _clean_actions(self):
@ -1392,15 +1389,12 @@ class ToplevelAgentBrowser(AgentBrowser):
def _add_actions(self): def _add_actions(self):
AgentBrowser._add_actions(self) AgentBrowser._add_actions(self)
self.execute_button = Gtk.Button() self.execute_button = Gtk.Button()
image = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.BUTTON)
label = Gtk.Label(label=_('_Execute Command'))
label.set_use_underline(True)
hbox = Gtk.HBox()
hbox.pack_start(image, False, True, 6)
hbox.pack_end(label, True, True, 6)
self.execute_button.add(hbox)
self.execute_button.connect('clicked', self.on_execute_button_clicked) self.execute_button.connect('clicked', self.on_execute_button_clicked)
self.window.action_buttonbox.add(self.execute_button) self.window.action_buttonbox.add(self.execute_button)
image = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.BUTTON)
self.execute_button.set_image(image)
label = _('_Execute Command')
self.execute_button.set_label(label)
self.execute_button.show_all() self.execute_button.show_all()
self.register_button = Gtk.Button(label=_("Re_gister"), self.register_button = Gtk.Button(label=_("Re_gister"),
@ -1410,27 +1404,21 @@ class ToplevelAgentBrowser(AgentBrowser):
self.register_button.show_all() self.register_button.show_all()
self.join_button = Gtk.Button() self.join_button = Gtk.Button()
image = Gtk.Image.new_from_stock(Gtk.STOCK_CONNECT, Gtk.IconSize.BUTTON)
label = Gtk.Label(label=_('_Join'))
label.set_use_underline(True)
hbox = Gtk.HBox()
hbox.pack_start(image, False, True, 6)
hbox.pack_end(label, True, True, 6)
self.join_button.add(hbox)
self.join_button.connect('clicked', self.on_join_button_clicked) self.join_button.connect('clicked', self.on_join_button_clicked)
self.window.action_buttonbox.add(self.join_button) self.window.action_buttonbox.add(self.join_button)
image = Gtk.Image.new_from_stock(Gtk.STOCK_CONNECT, Gtk.IconSize.BUTTON)
self.join_button.set_image(image)
label = _('_Join')
self.join_button.set_label(label)
self.join_button.show_all() self.join_button.show_all()
self.search_button = Gtk.Button() self.search_button = Gtk.Button()
image = Gtk.Image.new_from_stock(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON)
label = Gtk.Label(label=_('_Search'))
label.set_use_underline(True)
hbox = Gtk.HBox()
hbox.pack_start(image, False, True, 6)
hbox.pack_end(label, True, True, 6)
self.search_button.add(hbox)
self.search_button.connect('clicked', self.on_search_button_clicked) self.search_button.connect('clicked', self.on_search_button_clicked)
self.window.action_buttonbox.add(self.search_button) self.window.action_buttonbox.add(self.search_button)
image = Gtk.Image.new_from_stock(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON)
self.search_button.set_image(image)
label = _('_Search')
self.search_button.set_label(label)
self.search_button.show_all() self.search_button.show_all()
def _clean_actions(self): def _clean_actions(self):