diff --git a/data/gui/blocked_contacts_window.ui b/data/gui/blocked_contacts_window.ui index 2f9f37127..5f84a9b7c 100644 --- a/data/gui/blocked_contacts_window.ui +++ b/data/gui/blocked_contacts_window.ui @@ -38,47 +38,14 @@ + _Unblock True True False 3 + image1 + True - - - True - 0 - 0 - - - True - 2 - - - True - gtk-remove - - - False - False - 0 - - - - - True - _Unblock - True - - - False - False - 1 - - - - - - False @@ -89,4 +56,8 @@ + + True + gtk-remove + diff --git a/data/gui/change_status_message_dialog.ui b/data/gui/change_status_message_dialog.ui index 1bb7921e3..e4aa96970 100644 --- a/data/gui/change_status_message_dialog.ui +++ b/data/gui/change_status_message_dialog.ui @@ -354,9 +354,5 @@ - - cancel_button - ok_button - diff --git a/data/gui/history_manager.ui b/data/gui/history_manager.ui index 1f206ecb4..27ad1d614 100644 --- a/data/gui/history_manager.ui +++ b/data/gui/history_manager.ui @@ -212,48 +212,16 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene + _Search Database True True True True False + image1 + True + bottom - - - True - 0 - 0 - - - True - 2 - - - True - gtk-find - - - False - False - 0 - - - - - True - _Search Database - True - - - False - False - 1 - - - - - - False @@ -345,4 +313,8 @@ If you plan to do massive deletions, please make sure Gajim is not running. Gene save_button + + True + gtk-find + diff --git a/data/gui/plugins_window.ui b/data/gui/plugins_window.ui index 9f362620f..2ddcd5efa 100644 --- a/data/gui/plugins_window.ui +++ b/data/gui/plugins_window.ui @@ -1,6 +1,21 @@ + + True + False + gtk-apply + + + True + False + gtk-cancel + + + True + False + gtk-preferences + 650 500 @@ -45,9 +60,6 @@ True True - - - @@ -66,43 +78,12 @@ 0 - False + Install from zip True True True - False + image1 - - - True - False - - - True - False - gtk-apply - - - True - True - 0 - - - - - True - False - 0 - Install from zip - - - True - True - 1 - - - - @@ -166,7 +147,7 @@ True False 0 - <empty> + <empty> True @@ -206,7 +187,7 @@ False 0 0 - <empty> + <empty> word-char True end @@ -242,12 +223,10 @@ - homepage url - False + homepage url True True True - False none False 0 @@ -325,43 +304,12 @@ end - False + Uninstall True True True - False + image2 - - - True - False - - - True - False - gtk-cancel - - - True - True - 0 - - - - - True - False - 0 - Uninstall - - - True - True - 1 - - - - False @@ -371,43 +319,12 @@ - False + Configure True True True - False + image3 - - - True - False - - - True - False - gtk-preferences - - - True - True - 0 - - - - - True - False - 0 - Configure - - - True - True - 1 - - - - False @@ -462,11 +379,9 @@ gtk-close - False True True True - False True diff --git a/data/gui/preferences_window.ui b/data/gui/preferences_window.ui index 00ea4155a..43068b213 100644 --- a/data/gui/preferences_window.ui +++ b/data/gui/preferences_window.ui @@ -15,6 +15,16 @@ 1 10 + + True + False + gtk-revert-to-saved + + + True + False + gtk-open + @@ -214,12 +224,10 @@ Display a_vatars of contacts in roster - False True True False If checked, Gajim will display avatars of contacts in roster window and in group chats - False True 0 True @@ -234,12 +242,10 @@ Display status _messages of contacts in roster - False True True False If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats - False True 0 True @@ -254,12 +260,10 @@ Display e_xtra information of contacts in roster (mood, activity, ...)m_ood of contacts in roster - False True True False If checked, Gajim will display the mood of contacts in the roster window - False True 0 True @@ -291,11 +295,9 @@ in _roster - False True True False - False True 0 True @@ -310,11 +312,9 @@ in _group chats - False True True False - False True 0 True @@ -426,11 +426,9 @@ Ma_ke message windows compact - False True False Hide all buttons in chat windows - False True 0 True @@ -446,12 +444,10 @@ _Ignore rich content in incoming messages - False True True False Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text. - False True 0 True @@ -467,11 +463,9 @@ _Highlight misspelled words - False True False 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. - False True 0 True @@ -545,11 +539,9 @@ Show icon when your messages are received - False True True False - False 0 True @@ -665,12 +657,10 @@ Notify me about contacts that sign _in - False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False True 0 True @@ -685,12 +675,10 @@ Notify me about contacts that sign _out - False True True False Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out - False True 0 True @@ -705,11 +693,9 @@ Allow popup/notifications when I'm _away/na/busy/invisible - False True True False - False True 0 True @@ -742,12 +728,10 @@ Notify on new _GMail email - False True True False If checked, Gajim will show a notification when a new e-mail is received via GMail - False True 0 True @@ -762,12 +746,10 @@ Display _extra email details - False True True False If checked, Gajim will also include information about the sender of new emails - False True 0 True @@ -887,11 +869,9 @@ Play _sounds - False True True False - False True 0 True @@ -906,11 +886,9 @@ Ma_nage... - False True True True - False True @@ -930,11 +908,9 @@ Allow sound when I'm _busy - False True True False - False True 0 True @@ -1167,12 +1143,10 @@ _Away after: - False True True False If checked, Gajim will change status to Away when the computer is unused. - False True 0 True @@ -1186,12 +1160,10 @@ _Not available after: - False True True False If checked, Gajim will change status to Not Available when the computer has not been used even longer - False True 0 True @@ -1378,11 +1350,9 @@ $T will be replaced by auto-not-available timeout Sign _in - False True True False - False True 0 True @@ -1397,11 +1367,9 @@ $T will be replaced by auto-not-available timeout Sign _out - False True True False - False True 0 True @@ -1432,16 +1400,11 @@ $T will be replaced by auto-not-available timeout True True If enabled, Gajim will not ask for a status message. The specified default message will be used instead. - automatic - automatic in True True - - - @@ -1503,12 +1466,10 @@ $T will be replaced by auto-not-available timeout gtk-new - False True True True False - False True @@ -1521,12 +1482,10 @@ $T will be replaced by auto-not-available timeout gtk-delete - False True True True False - False True @@ -1548,8 +1507,6 @@ $T will be replaced by auto-not-available timeout True True - automatic - automatic in @@ -1560,9 +1517,6 @@ $T will be replaced by auto-not-available timeout False - - - @@ -1657,11 +1611,9 @@ $T will be replaced by auto-not-available timeout - False True True False - False @@ -1672,11 +1624,9 @@ $T will be replaced by auto-not-available timeout Use system _default - False True True False - False True 0 True @@ -1752,12 +1702,10 @@ $T will be replaced by auto-not-available timeout Use _transports icons - False True True False 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...) - False True 0 True @@ -1817,12 +1765,10 @@ $T will be replaced by auto-not-available timeout Ma_nage... - False True True False Configure color and font of the interface - False True @@ -1886,6 +1832,12 @@ $T will be replaced by auto-not-available timeout 4 12 6 + + + + + + True @@ -1966,53 +1918,14 @@ $T will be replaced by auto-not-available timeout - False + _Reset to Default Colors True True False - False + image1 + True False - - - True - False - 0 - 0 - - - True - False - 2 - - - True - False - gtk-revert-to-saved - - - False - False - 0 - - - - - True - False - _Reset to Default Colors - True - - - False - False - 1 - - - - - - False @@ -2064,11 +1977,9 @@ $T will be replaced by auto-not-available timeout False - False True True False - False 0.5 True @@ -2081,11 +1992,9 @@ $T will be replaced by auto-not-available timeout - False True True True - False 0 #000000000000 @@ -2113,11 +2022,9 @@ $T will be replaced by auto-not-available timeout False - False True True False - False 0.5 True @@ -2130,11 +2037,9 @@ $T will be replaced by auto-not-available timeout - False True True True - False 0 #000000000000 @@ -2165,11 +2070,9 @@ $T will be replaced by auto-not-available timeout - False True True True - False 0 #000000000000 @@ -2195,11 +2098,9 @@ $T will be replaced by auto-not-available timeout False - False True True True - False 0 #000000000000 @@ -2230,11 +2131,9 @@ $T will be replaced by auto-not-available timeout - False True True True - False 0 #000000000000 @@ -2263,11 +2162,9 @@ $T will be replaced by auto-not-available timeout - False True True True - False 0 #000000000000 @@ -2292,6 +2189,7 @@ $T will be replaced by auto-not-available timeout True + False @@ -2302,10 +2200,11 @@ $T will be replaced by auto-not-available timeout True 0 #000000000000 - + False + True end 1 @@ -2323,6 +2222,7 @@ $T will be replaced by auto-not-available timeout True + False 0 Group chat highlight: True @@ -2334,12 +2234,6 @@ $T will be replaced by auto-not-available timeout - - - - - - @@ -2683,11 +2577,9 @@ to discover one from server. - False True True False - False 0.5 True @@ -2948,12 +2840,10 @@ to discover one from server. _Ignore events from contacts not in the roster - False True True False 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 - False True 0 True @@ -2966,12 +2856,10 @@ to discover one from server. Allow client / _OS information to be sent - False True True False If checked, Gajim will allow others to detect the operation system you are using - False True 0 True @@ -2985,12 +2873,10 @@ to discover one from server. Allow local system time information to be sent - False True True False If checked, Gajim will allow others to detect the time on your system - False True 0 True @@ -3004,12 +2890,10 @@ to discover one from server. Log _encrypted chat session - False True True False 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. - False True 0 True @@ -3023,11 +2907,9 @@ to discover one from server. Allow my _idle time to be sent - False True True False - False True 0 True @@ -3077,11 +2959,9 @@ to discover one from server. _Manage... - False True True True - False True @@ -3137,11 +3017,9 @@ to discover one from server. _Log status changes of contacts - False True True False - False True 0 True @@ -3156,11 +3034,9 @@ to discover one from server. Check on startup if Gajim is the _default Jabber client - False True True False - False True 0 True @@ -3207,52 +3083,13 @@ to discover one from server. 335 - False + _Open... True True False - False + image2 + True - - - True - False - 0 - 0 - - - True - False - 2 - - - True - False - gtk-open - - - False - False - 0 - - - - - True - False - _Open... - True - - - False - False - 1 - - - - - - @@ -3304,12 +3141,10 @@ to discover one from server. gtk-close - False True True True False - False True diff --git a/data/gui/service_discovery_window.ui b/data/gui/service_discovery_window.ui index 5ba311a37..0aa547cc2 100644 --- a/data/gui/service_discovery_window.ui +++ b/data/gui/service_discovery_window.ui @@ -1,6 +1,11 @@ + + True + False + gtk-jump-to + @@ -78,56 +83,23 @@ Agent JID - node + + + + + + - False + G_o True True True True False - False + image1 + True - - - True - False - 0 - 0 - - - True - False - 2 - - - True - False - gtk-jump-to - - - False - False - 0 - - - - - True - False - G_o - True - - - False - False - 1 - - - - - - 2 @@ -150,32 +122,6 @@ Agent JID - node - - - True - False - True - 0 - 1 - - - - True - True - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - False @@ -194,9 +140,6 @@ Agent JID - node True False - - - @@ -243,13 +186,11 @@ Agent JID - node gtk-close - False True True True True False - False True diff --git a/src/disco.py b/src/disco.py index e698fb552..fcc717f56 100644 --- a/src/disco.py +++ b/src/disco.py @@ -927,15 +927,12 @@ class AgentBrowser: perform """ 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.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() def _clean_actions(self): @@ -1392,15 +1389,12 @@ class ToplevelAgentBrowser(AgentBrowser): def _add_actions(self): AgentBrowser._add_actions(self) 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.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.register_button = Gtk.Button(label=_("Re_gister"), @@ -1410,27 +1404,21 @@ class ToplevelAgentBrowser(AgentBrowser): self.register_button.show_all() 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.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.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.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() def _clean_actions(self):