diff --git a/data/glade/account_creation_wizard_window.glade b/data/glade/account_creation_wizard_window.glade index 50d61e400..93ba1cb8b 100644 --- a/data/glade/account_creation_wizard_window.glade +++ b/data/glade/account_creation_wizard_window.glade @@ -53,6 +53,7 @@ to the Jabber network. True I already have an account I want to use True + 0 True @@ -66,6 +67,7 @@ to the Jabber network. True I want to _register for a new account True + 0 True use_existing_account_radiobutton @@ -142,96 +144,30 @@ to the Jabber network. - + True True - 0 - True - True - - - 1 - 3 - 3 - 4 - GTK_FILL - - - - - - True - 0 - Your JID: - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - _Username: - True - username_entry - - - GTK_FILL - - - - - - True - True - False + True * - True + + 1 2 - 2 - 3 - - True - True - If checked, Gajim will remember the password for this account - Save pass_word - True - False - True - True - - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - + True 0 - _Password: + _Server: True - password_entry - 2 - 3 + 1 + 2 GTK_FILL @@ -255,31 +191,98 @@ to the Jabber network. - + True 0 - _Server: + _Password: True + password_entry - 1 - 2 + 2 + 3 GTK_FILL - + True True - True + If checked, Gajim will remember the password for this account + Save pass_word + True + False + 0 + True + True + + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + True + False * - - + True 1 2 + 2 + 3 + + + + + + True + 0 + _Username: + True + username_entry + + + GTK_FILL + + + + + + True + 0 + Your JID: + + + 3 + 4 + GTK_FILL + + + + + + True + True + 0 + True + True + + + 1 + 3 + 3 + 4 + GTK_FILL @@ -357,6 +360,7 @@ to the Jabber network. Click to see features (like MSN, ICQ transports) of jabber servers Servers Features True + 0 @@ -384,6 +388,62 @@ to the Jabber network. 3 5 5 + + + True + 0 + Prox_y: + True + + + GTK_FILL + + + + + + True + None + + + 1 + 2 + GTK_FILL + + + + + True + True + Manage... + True + 0 + + + + 2 + 3 + + + + + + + True + True + Use custom hostname/port + True + 0 + True + + + + 3 + 1 + 2 + + + True @@ -446,60 +506,6 @@ to the Jabber network. GTK_FILL - - - True - True - Use custom hostname/port - True - True - - - - 3 - 1 - 2 - - - - - - True - True - Manage... - True - - - - 2 - 3 - - - - - - - True - None - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Prox_y: - True - - - GTK_FILL - - - @@ -637,6 +643,7 @@ Please wait... True Connect when I press Finish True + 0 True True @@ -652,6 +659,7 @@ Please wait... True Set my profile when I connect True + 0 True True @@ -692,6 +700,7 @@ Please wait... True gtk-cancel True + 0 @@ -703,6 +712,7 @@ Please wait... True gtk-go-back True + 0 @@ -717,6 +727,7 @@ Please wait... True gtk-go-forward True + 0 @@ -727,6 +738,8 @@ Please wait... True True + True + 0 @@ -772,6 +785,8 @@ Please wait... True True + True + 0 diff --git a/data/glade/add_new_contact_window.glade b/data/glade/add_new_contact_window.glade index c3a608e87..cd10d283e 100644 --- a/data/glade/add_new_contact_window.glade +++ b/data/glade/add_new_contact_window.glade @@ -87,6 +87,7 @@ True + True @@ -101,38 +102,50 @@ True + True 6 3 2 6 6 - + True - - - - - + 0 + _User ID: + True + uid_entry + + + GTK_FILL + + + + + + True + True + * + True + 1 2 - 2 - 3 - GTK_FILL + - + True 0 - _Group: + _Nickname: True + nickname_entry - 2 - 3 + 1 + 2 GTK_FILL @@ -153,45 +166,34 @@ - + True 0 - _Nickname: + _Group: True - nickname_entry - 1 - 2 + 2 + 3 GTK_FILL - + True - True - * - True - + + + + + 1 2 - - - - - - True - 0 - _User ID: - True - uid_entry - - + 2 + 3 GTK_FILL - @@ -206,6 +208,7 @@ True A_llow this contact to view my status True + 0 True True @@ -219,6 +222,7 @@ True True + True 6 GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC @@ -239,6 +243,7 @@ True + True 6 @@ -258,6 +263,7 @@ proceed. True _Register True + 0 @@ -274,6 +280,7 @@ proceed. True + True You must be connected to the transport to be able to add a contact from this protocol. @@ -296,6 +303,7 @@ to add a contact from this protocol. True gtk-cancel True + 0 @@ -307,6 +315,7 @@ to add a contact from this protocol. True gtk-add True + 0 diff --git a/data/glade/advanced_notifications_window.glade b/data/glade/advanced_notifications_window.glade index 46c78b20c..eed865ceb 100644 --- a/data/glade/advanced_notifications_window.glade +++ b/data/glade/advanced_notifications_window.glade @@ -1,283 +1,188 @@ - - - + + + - - - 6 - Advanced Notifications Control - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - Advanced Notifications Control - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 12 - - - - True - False - 0 - - - - True - Hi SVN users ! This window does nothing for the moment. Discussions about this take place in ticket #1005. - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - False - 5 - - - - 90 - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - - 0 - False - False - - - - - - True - 1 - 0.5 - 1 - 1 - 0 - 0 - 212 - 0 - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 10 - - - - True - True - True - gtk-new - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-go-up - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-go-down - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-delete - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - False - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 5 - - - - True - <b>Conditions</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 5 - - - - True - False - 5 - - - - True - When - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Receive a Message + + 6 + Advanced Notifications Control + Advanced Notifications Control + False + True + + + True + 12 + 12 + + + True + + + True + Hi SVN users ! This window does nothing for the moment. Discussions about this take place in ticket #1005. + True + + + False + False + + + + + + + + False + False + + + + + True + 5 + + + 90 + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + + + + + + False + False + + + + + True + 1 + 212 + + + True + + + True + 10 + + + True + True + True + gtk-new + True + 0 + + + + + + True + True + True + gtk-go-up + True + 0 + + + + 1 + + + + + True + True + True + gtk-go-down + True + 0 + + + + 2 + + + + + True + True + True + gtk-delete + True + 0 + + + + 3 + + + + + False + + + + + + + False + False + 1 + + + + + 1 + + + + + True + 5 + + + True + <b>Conditions</b> + True + + + False + False + + + + + True + 5 + + + True + 5 + + + True + When + True + + + False + False + + + + + True + Receive a Message Contact Disconnected Contact Change Status Group Chat Message Highlight @@ -285,994 +190,679 @@ Group Chat Message Received File Transfer Request File Transfer Started File Transfer Finished - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 5 - - - - True - for - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - contact(s) + + + + False + False + 1 + + + + + + + True + 5 + + + True + for + True + + + False + False + + + + + True + contact(s) group(s) everybody - False - True - - - - 0 - False - True - - - - - - True - True - True - True - 0 - - True - * - False - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - when I'm in - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 3 - - - - True - True - All statuses - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - One or more special statuses... - True - GTK_RELIEF_NORMAL - True - False - False - True - all_status_rb - - - 0 - False - False - - - - - - True - True - Online / Free For Chat - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Away - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Not Available - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Busy - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Invisible - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - and I - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - Have - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Don't have - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - a window/tab opened with that contact - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - <b>Actions</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - False - 6 - - - - True - True - _Inform me with a popup window - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - _Disable existing popup window - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 6 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - 6 - - - - True - True - Play a sound - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - True - True - - - - - - True - False - False - 6 - - - - True - True - True - True - 0 - - True - * - False - - - - 0 - True - True - - - - - - True - True - ... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - gtk-media-play - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - _Disable existing sound for this event - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - - - - - True - <b>Sounds</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - label_item - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - _Open chat window with user - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - _Disable auto opening chat window - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - True - 0 - - - - True - False - 5 - - - - True - False - 6 - - - - True - True - Launch a command - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - True - - - - - - True - False - True - True - True - 0 - - True - * - False - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - _Show event in systray - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - _Disable showing event in systray - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - _Show event in roster - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - _Disable showing event in roster - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - _Activate window manager's UrgencyHint to make chat window in taskbar flash - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - - - True - Advanced Actions - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 413 - 0 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - - - - - - + + + + False + 1 + + + + + True + True + True + * + + + + 2 + + + + + 1 + + + + + True + + + True + when I'm in + True + + + False + False + + + + + True + 3 + + + True + True + All statuses + True + 0 + True + + + + False + False + + + + + True + True + One or more special statuses... + True + 0 + True + all_status_rb + + + False + False + 1 + + + + + True + True + True + Online / Free For Chat + True + 0 + True + + + + False + False + 2 + + + + + True + True + True + Away + True + 0 + True + + + + False + False + 3 + + + + + True + True + True + Not Available + True + 0 + True + + + + False + False + 4 + + + + + True + True + True + Busy + True + 0 + True + + + + False + False + 5 + + + + + True + True + True + Invisible + True + 0 + True + + + + False + False + 6 + + + + + 1 + + + + + 2 + + + + + True + + + True + and I + True + + + False + False + + + + + True + True + Have + True + 0 + True + + + + False + False + 1 + + + + + True + True + Don't have + True + 0 + True + + + + False + False + 2 + + + + + True + a window/tab opened with that contact + True + + + False + False + 3 + + + + + 3 + + + + + 1 + + + + + True + <b>Actions</b> + True + + + False + False + 2 + + + + + True + 0 + GTK_SHADOW_NONE + + + True + 6 + + + True + True + _Inform me with a popup window + True + 0 + True + + + + False + False + + + + + True + True + _Disable existing popup window + True + 0 + True + + + + False + False + 1 + + + + + + + True + 0 + GTK_SHADOW_NONE + + + True + 6 + 12 + + + True + 6 + + + True + 6 + True + + + True + True + Play a sound + True + 0 + True + + + + + + True + False + 6 + + + True + True + * + + + + + + True + True + ... + True + 0 + + + + False + False + 1 + + + + + True + True + 0 + + + + True + gtk-media-play + + + + + False + False + 2 + + + + + 1 + + + + + False + False + + + + + True + True + _Disable existing sound for this event + True + 0 + True + + + + False + False + 1 + + + + + + + + + True + <b>Sounds</b> + True + + + label_item + + + + + label_item + + + + + 3 + + + + + True + 6 + + + True + True + _Open chat window with user + True + 0 + True + + + + False + False + + + + + True + True + _Disable auto opening chat window + True + 0 + True + + + + False + False + 1 + + + + + 4 + + + + + True + True + True + + + True + 5 + + + True + 6 + + + True + True + Launch a command + True + 0 + True + + + + False + + + + + True + False + True + * + + + + 1 + + + + + False + False + + + + + True + 6 + + + True + True + _Show event in systray + True + 0 + True + + + + False + False + + + + + True + True + _Disable showing event in systray + True + 0 + True + + + + False + False + 1 + + + + + 1 + + + + + True + 6 + + + True + True + _Show event in roster + True + 0 + True + + + + False + False + + + + + True + True + _Disable showing event in roster + True + 0 + True + + + + False + False + 1 + + + + + 2 + + + + + True + True + _Activate window manager's UrgencyHint to make chat window in taskbar flash + True + 0 + True + + + + False + False + 3 + + + + + + + True + Advanced Actions + + + label_item + + + + + 5 + + + + + 2 + + + + + True + 413 + + + True + True + True + gtk-close + True + 0 + + + + + + False + 3 + + + + + diff --git a/data/glade/filetransfers.glade b/data/glade/filetransfers.glade index cc629da4e..3106b3663 100644 --- a/data/glade/filetransfers.glade +++ b/data/glade/filetransfers.glade @@ -1,392 +1,281 @@ - - - + + + - - - 12 - File Transfers - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - File Transfers - Shows a list of file transfers between you and others - - - - - - - True - False - 6 - - - - 460 - 150 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - True - False - False - False - False - False - - file transfers list - A list of active, completed and stopped file transfers - - - - - - - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - False - Removes completed, cancelled and failed file transfers from the list - True - True - GTK_RELIEF_NORMAL - True - - Remove file transfer from the list. - This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed - - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-clear - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Clean _up - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - False - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-media-pause - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Pause - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - False - Cancels the selected file transfer and removes incomplete file - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - Cancel file transfer - Cancels the selected file transfer - - - - - - - - True - Hides the window - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - True - _Notify me when a file transfer is complete - True - GTK_RELIEF_NORMAL - True - False - False - True - - When a file transfer is complete show a popup notification - - - - - 0 - False - False - - - - - - - - - - - gtk-remove - True - - - - - - - _Continue - True - - - - - True - gtk-media-play - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - _Pause - True - - - - - True - gtk-media-pause - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - gtk-cancel - True - - - - - - - True - - - - - - _Open Containing Folder - True - - - - - True - gtk-directory - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - + + 12 + File Transfers + + File Transfers + Shows a list of file transfers between you and others + + + + + + True + 6 + + + 460 + 150 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + False + + file transfers list + A list of active, completed and stopped file transfers + + + + + + + + + + + + + + True + True + _Notify me when a file transfer is complete + True + 0 + True + + When a file transfer is complete show a popup notification + + + + + False + False + 2 + + + + + True + 6 + GTK_BUTTONBOX_END + + + True + False + True + True + Removes completed, cancelled and failed file transfers from the list + 0 + + Remove file transfer from the list. + This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed + + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-clear + + + False + False + + + + + True + Clean _up + True + + + False + False + 1 + + + + + + + + + + + True + False + True + True + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-media-pause + + + False + False + + + + + True + _Pause + True + + + False + False + 1 + + + + + + + + + 1 + + + + + True + False + True + True + Cancels the selected file transfer and removes incomplete file + gtk-cancel + True + 0 + + Cancel file transfer + Cancels the selected file transfer + + + + + 2 + + + + + True + True + True + True + Hides the window + gtk-close + True + 0 + + + + 3 + + + + + False + GTK_PACK_END + 1 + + + + + + + + + gtk-remove + True + True + + + + + + True + _Continue + True + + + + True + gtk-media-play + 1 + + + + + + + _Pause + True + + + + True + gtk-media-pause + 1 + + + + + + + gtk-cancel + True + True + + + + + + True + + + + + _Open Containing Folder + True + + + + True + gtk-missing-image + 1 + + + + + diff --git a/data/glade/history_manager.glade b/data/glade/history_manager.glade index 49225bf27..2d7802f95 100644 --- a/data/glade/history_manager.glade +++ b/data/glade/history_manager.glade @@ -1,392 +1,249 @@ - - - + + + - - - 6 - Gajim History Logs Manager - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 650 - 500 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - - True - False - 6 - - - - True - True - 200 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - True - False - True - False - False - False - - - - - - - True - False - - - - - - True - False - 0 - - - - True - <big><b>Welcome to Gajim History Logs Manager</b></big> + + 6 + Gajim History Logs Manager + 650 + 500 + + + + True + 6 + + + True + True + 200 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + + + + + + + False + True + + + + + True + + + True + 0 + <big><b>Welcome to Gajim History Logs Manager</b></big> You can select logs from the left and/or search database from below. <b>WARNING:</b> If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with. - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - True - False - False - False - False - False - - - - - - - 0 - True - True - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - True - False - True - False - False - False - - - - - - - 0 - True - True - - - - - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - - True - True - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-find - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Search Database - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - False - True - - - - - - - - - - - True - Export - True - - - - - - - True - Delete - True - - - - True - gtk-remove - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - GTK_FILE_CHOOSER_ACTION_SAVE - True - False - False - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - - - - True - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-save - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - + True + True + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + False + + + + + + + 1 + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + True + + + + + + + 2 + + + + + True + True + + + + + + + True + 6 + + + True + True + * + True + + + + + True + True + True + True + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-find + + + False + False + + + + + True + _Search Database + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + 1 + + + + + + + + + True + Export + True + + + + + + True + Delete + True + + + True + gtk-remove + 1 + + + + + + + GDK_WINDOW_TYPE_HINT_DIALOG + GTK_FILE_CHOOSER_ACTION_SAVE + + + True + 24 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-save + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade index 52063908a..f82682c62 100644 --- a/data/glade/preferences_window.glade +++ b/data/glade/preferences_window.glade @@ -976,8 +976,9 @@ Single message - + True + True True @@ -1896,6 +1897,7 @@ Custom True + True 0 GTK_SHADOW_NONE diff --git a/data/glade/privacy_list_window.glade b/data/glade/privacy_list_window.glade index 5e857a72c..d2d527c76 100644 --- a/data/glade/privacy_list_window.glade +++ b/data/glade/privacy_list_window.glade @@ -1,757 +1,526 @@ - - - + + + - - - 6 - True - Privacy List - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - 600 - True - False - 0 - - - - True - True - 0 - - - - True - <i>Privacy List</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - Active for this session - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Active on each startup - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - - - 5 - False - False - - - - - - True - <b>List of rules</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - - False - True - - - - 5 - False - True - - - - - - True - True - 0 - - - - 5 - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 5 - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - - 6 - True - True - gtk-edit - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - False - True - - - - - - 5 - False - 0 - - - - True - - - 5 - True - True - - - - - - True - <b>Add / Edit a rule</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - False - 0 - - - - True - True - 0 - - - - True - True - Allow - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Deny - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_allow_radiobutton - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - 5 - True - False - 0 - - - - True - True - JabberID - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 5 - False - False - - - - - - True - True - True - True - 0 - - True - ● - False - - - 5 - True - True - - - - - 0 - True - True - - - - - - 5 - True - False - 0 - - - - True - True - all in the group - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_type_jabberid_radiobutton - - - 5 - False - False - - - - - - True - - False - True - - - 5 - True - True - - - - - 0 - True - True - - - - - - 5 - True - False - 0 - - - - True - True - all by subscription - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_type_jabberid_radiobutton - - - 5 - False - False - - - - - - True - none + + True + 6 + Privacy List + + + + 600 + True + + + True + True + + + True + <i>Privacy List</i> + True + + + False + False + + + + + True + True + Active for this session + True + 0 + True + + + + False + False + 1 + + + + + True + True + Active on each startup + True + 0 + True + + + + False + False + 2 + + + + + False + + + + + True + + + False + False + 5 + 1 + + + + + True + <b>List of rules</b> + True + + + False + False + 5 + 2 + + + + + True + + + + + False + 5 + 3 + + + + + True + True + + + True + True + 5 + gtk-add + True + 0 + + + + False + False + + + + + True + True + 5 + gtk-remove + True + 0 + + + + False + False + 1 + + + + + True + True + 6 + gtk-edit + True + 0 + + + + False + False + 2 + + + + + False + 4 + + + + + True + 5 + + + True + + + 5 + + + + + True + <b>Add / Edit a rule</b> + True + + + False + False + 5 + 1 + + + + + True + + + True + True + + + True + True + Allow + True + 0 + True + + + False + False + + + + + True + True + Deny + True + 0 + True + edit_allow_radiobutton + + + False + False + 1 + + + + + + + True + True + + + True + 5 + + + True + True + JabberID + True + 0 + True + + + False + False + 5 + + + + + True + True + + + 5 + 1 + + + + + + + True + 5 + + + True + True + all in the group + True + 0 + True + edit_type_jabberid_radiobutton + + + False + False + 5 + + + + + True + + + + 5 + 1 + + + + + 1 + + + + + True + 5 + + + True + True + all by subscription + True + 0 + True + edit_type_jabberid_radiobutton + + + False + False + 5 + + + + + True + none both from to - False - True - - - 5 - True - True - - - - - 0 - True - True - - - - - - 10 - True - False - 0 - - - - True - True - All - True - GTK_RELIEF_NORMAL - True - False - False - True - edit_type_jabberid_radiobutton - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - True - to send me messages - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - to send me queries - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - to view my status - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - to send me status - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - False - 0 - - - - True - Order: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 5 - False - False - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - True - - - - - 0 - True - True - - - - - - 5 - True - True - gtk-save - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - - - 0 - False - True - - - - - - 6 - True - GTK_BUTTONBOX_END - 0 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - - + + + 5 + 1 + + + + + 2 + + + + + True + 10 + + + True + True + All + True + 0 + True + edit_type_jabberid_radiobutton + + + False + False + + + + + False + False + 3 + + + + + 1 + + + + + True + True + + + True + True + to send me messages + True + 0 + True + + + False + False + + + + + True + True + to send me queries + True + 0 + True + + + False + False + 1 + + + + + True + True + to view my status + True + 0 + True + + + False + False + 2 + + + + + True + True + to send me status + True + 0 + True + + + False + False + 3 + + + + + 2 + + + + + 2 + + + + + True + True + + + True + + + True + Order: + + + False + False + 5 + + + + + True + True + 1 0 100 1 10 10 + 1 + + + False + 1 + + + + + + + True + True + 5 + gtk-save + True + 0 + + + + False + False + 1 + + + + + 3 + + + + + 5 + + + + + True + + + False + 6 + + + + + True + 6 + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + 0 + + + + + + 7 + + + + + diff --git a/data/glade/profile_window.glade b/data/glade/profile_window.glade index 960496bcf..6f033ba58 100644 --- a/data/glade/profile_window.glade +++ b/data/glade/profile_window.glade @@ -1,1943 +1,1156 @@ - - - + + + - - - Personal Information - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - - True - False - 12 - - - - 6 - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - 7 - 4 - False - 6 - 12 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 4 - 4 - 5 - - - - - - - True - True - False - 0 - - - - 6 - True - 3 - 4 - False - 6 - 12 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 2 - 3 - - - - - - - True - Family: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Middle: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Prefix: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Given: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Suffix: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - - - True - Full Name - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - False - 0 - - - - 6 - True - 3 - 4 - False - 5 - 5 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 2 - 3 - - - - - - - True - Street: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - City: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - State: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Extra Address: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Postal Code: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - Country: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - - - True - Address - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - 4 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 5 - 6 - - - - - - - True - Homepage: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 4 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 5 - 6 - - - - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Nickname: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Phone No.: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - Format: YYYY-MM-DD - True - False - - - - True - Birthday: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - 2 - 3 - 5 - 6 - fill - - - - - - - True - E-Mail: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - Avatar: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - False - 0 - - - - True - GTK_RELIEF_NORMAL - True - - - - - True - False - False - - - - True - 0.5 - 0 - 0 - 0 - - - - - - - 0 - False - False - - - - - - True - True - Click to set your avatar - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 1 - 4 - 6 - 7 - - expand - - - - - False - True - - - - - - True - Personal Info - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - 5 - 4 - False - 6 - 12 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 4 - 3 - 4 - - - - - - - True - True - False - 0 - - - - 6 - True - 3 - 4 - False - 5 - 5 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 3 - 4 - 2 - 3 - - - - - - - True - Street: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - City: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - State: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Extra Address: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Postal Code: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - Country: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - - - True - Address - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - 4 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 4 - 5 - - - - - - - True - Company: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Position: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Department: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Role: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - E-Mail: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Phone No.: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - False - True - - - - - - True - Work - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 6 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - 70 - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - False - True - - - - - - True - About - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - 6 - True - False - 0 - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - - - 0 - False - False - - - - - - + + Personal Information + + + + + True + 12 + + + True + 6 + + + True + 12 + 7 + 4 + 12 + 6 + + + True + + + True + 0 + + + + True + False + + + True + 0 + gtk-missing-image + + + + + + + False + False + + + + + True + True + True + Click to set your avatar + True + 0 + + + + False + False + 1 + + + + + 1 + 4 + 6 + 7 + + GTK_EXPAND + + + + + True + 0 + Avatar: + + + 6 + 7 + GTK_FILL + + + + + + True + 0 + E-Mail: + + + 4 + 5 + GTK_FILL + + + + + + True + Format: YYYY-MM-DD + + + True + 0 + 0 + Birthday: + + + + + 2 + 3 + 5 + 6 + GTK_FILL + + + + + + True + 0 + 0 + Phone No.: + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + 0 + Nickname: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Name: + + + GTK_FILL + + + + + + True + True + * + + + 1 + 2 + 5 + 6 + + + + + + True + True + * + + + 1 + 4 + 3 + 4 + + + + + + True + 0 + 0 + Homepage: + + + 3 + 4 + + + + + + + True + True + * + + + 3 + 4 + 5 + 6 + + + + + + True + True + + + True + 6 + 3 + 4 + 5 + 5 + + + True + 0 + 0 + Country: + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Postal Code: + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Extra Address: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + State: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + City: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Street: + + + GTK_FILL + + + + + + True + True + * + + + 3 + 4 + 2 + 3 + + + + + + True + True + * + + + 1 + 2 + 2 + 3 + + + + + + True + True + * + + + 3 + 4 + 1 + 2 + + + + + + True + True + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + * + + + 3 + 4 + + + + + + True + True + * + + + 1 + 2 + + + + + + + + True + 0 + 0 + Address + + + label_item + + + + + 4 + 2 + 3 + + + + + + True + True + * + + + 3 + 4 + + + + + + True + True + + + True + 6 + 3 + 4 + 12 + 6 + + + + + + + + + True + 0 + 0 + Suffix: + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Given: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Prefix: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Middle: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Family: + + + GTK_FILL + + + + + + True + True + * + + + 3 + 4 + 2 + 3 + + + + + + True + True + * + + + 1 + 2 + 2 + 3 + + + + + + True + True + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + * + + + 3 + 4 + + + + + + True + True + * + + + 1 + 2 + + + + + + + + True + 0 + 0 + Full Name + + + label_item + + + + + 4 + 1 + 2 + + + + + + True + True + * + + + 1 + 4 + 4 + 5 + + + + + + True + True + * + + + 1 + 2 + + + + + + False + + + + + True + 0 + 0 + Personal Info + + + tab + False + False + + + + + True + 12 + 5 + 4 + 12 + 6 + + + + + + + + + True + 0 + 0 + Phone No.: + + + 4 + 5 + GTK_FILL + + + + + + True + 0 + 0 + E-Mail: + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + 0 + Role: + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Department: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Position: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Company: + + + GTK_FILL + + + + + + True + True + * + + + 1 + 2 + 4 + 5 + + + + + + True + True + + + True + 6 + 3 + 4 + 5 + 5 + + + True + 0 + 0 + Country: + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + Postal Code: + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Extra Address: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + State: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + City: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + Street: + + + GTK_FILL + + + + + + True + True + * + + + 3 + 4 + 2 + 3 + + + + + + True + True + * + + + 1 + 2 + 2 + 3 + + + + + + True + True + * + + + 3 + 4 + 1 + 2 + + + + + + True + True + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + * + + + 3 + 4 + + + + + + True + True + * + + + 1 + 2 + + + + + + + + True + 0 + 0 + Address + + + label_item + + + + + 4 + 2 + 3 + + + + + + True + True + * + + + 1 + 4 + 3 + 4 + + + + + + True + True + * + + + 3 + 4 + 1 + 2 + + + + + + True + True + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + * + + + 3 + 4 + + + + + + True + True + * + + + 1 + 2 + + + + + + 1 + False + + + + + True + 0 + 0 + Work + + + tab + 1 + False + False + + + + + True + True + 6 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + 70 + True + True + GTK_WRAP_WORD + + + + + 2 + False + + + + + True + 0 + 0 + About + + + tab + 2 + False + False + + + + + + + True + 6 + + + True + 0.10000000149 + + + False + False + + + + + True + 12 + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + 0 + + + + + + True + True + True + gtk-ok + True + 0 + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + True + False + + + False + False + 2 + + + + + diff --git a/data/glade/roster_contact_context_menu.glade b/data/glade/roster_contact_context_menu.glade index 445b7403e..0d35d74a6 100644 --- a/data/glade/roster_contact_context_menu.glade +++ b/data/glade/roster_contact_context_menu.glade @@ -136,7 +136,7 @@ True - gtk-dialog-authentication + gtk-missing-image 1 @@ -161,6 +161,7 @@ True + True Add Special _Notification True diff --git a/data/glade/service_discovery_window.glade b/data/glade/service_discovery_window.glade index e5b471c7e..197b18a9a 100644 --- a/data/glade/service_discovery_window.glade +++ b/data/glade/service_discovery_window.glade @@ -1,421 +1,269 @@ - - - + + + - - - 6 - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 450 - 420 - True - False - Service Discovery - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - True - False - 6 - - - + + False + False + + + + + True + 3 + 3 + 6 + + + + + + + + + True + _Address: + True + address_comboboxentry + + + 3 + GTK_FILL + + + + + + True + True + True + True + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-jump-to + + + False + False + + + + + True + G_o + True + + + False + False + 1 + + + + + + + + + 2 + 3 + 3 + GTK_FILL + + + + + + True + + + + + + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + False + 1 + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_IN + + + True + True + False + + + + + + 2 + + + + + True + True + 6 + + + True + _Filter: + True + filter_entry + + + False + False + + + + + True + True + * + + + + 1 + + + + + False + False + 3 + + + + + True + 12 + + + True + True + 0.10000000149 + + + False + False + + + + + True + + + 1 + + + + + True + 6 + + + True + True + True + True + gtk-close + True + 0 + + + + False + False + GTK_PACK_END + + + + + False + 2 + + + + + False + 2 + 4 + + + + + diff --git a/data/glade/single_message_window.glade b/data/glade/single_message_window.glade index 955bc9bc1..6c3f06641 100644 --- a/data/glade/single_message_window.glade +++ b/data/glade/single_message_window.glade @@ -1,548 +1,346 @@ - - - + + + - - - 6 - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 550 - 280 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - - - True - False - 6 - - - - True - 3 - 3 - False - 6 - 12 - - - - True - Subject: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 3 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - 0 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 3 - 1 - 2 - - - - - - - True - From: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - To: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - 0 - False - True - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - - - - 0 - True - True - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - - True - Send message - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-jump-to - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Sen_d - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - Reply to this message - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Reply - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - Send message and close window - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Send & Close - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 6 - False - True - - - - - - + + 6 + 550 + 280 + + + + + True + 6 + + + True + 3 + 3 + 12 + 6 + + + True + True + 0 + To: + + + 1 + 2 + GTK_FILL + + + + + + True + True + 0 + From: + + + GTK_FILL + + + + + + True + True + True + * + + + 1 + 3 + 1 + 2 + + + + + + True + 0 + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + True + * + + + 1 + 2 + 2 + 3 + + + + + + True + True + True + * + + + 1 + 3 + + + + + + True + Subject: + + + 2 + 3 + GTK_FILL + + + + + + False + + + + + True + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + + + + 1 + + + + + True + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + GTK_WRAP_WORD + + + + + 2 + + + + + True + 12 + GTK_BUTTONBOX_END + + + True + True + True + True + gtk-close + True + 0 + + + + + + True + True + True + True + gtk-cancel + True + 0 + + + + 1 + + + + + True + True + True + True + Send message + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-jump-to + + + False + False + + + + + True + Sen_d + True + + + False + False + 1 + + + + + + + + + 2 + + + + + True + True + True + True + Reply to this message + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-ok + + + False + False + + + + + True + _Reply + True + + + False + False + 1 + + + + + + + + + 3 + + + + + True + True + True + True + Send message and close window + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-ok + + + False + False + + + + + True + _Send & Close + True + + + False + False + 1 + + + + + + + + + 4 + + + + + False + 6 + 3 + + + + + diff --git a/data/glade/zeroconf_contact_context_menu.glade b/data/glade/zeroconf_contact_context_menu.glade index edbb0f064..4ad215baa 100644 --- a/data/glade/zeroconf_contact_context_menu.glade +++ b/data/glade/zeroconf_contact_context_menu.glade @@ -1,153 +1,113 @@ - - - + + + - - - - - - True - Start _Chat - True - - - - True - gtk-jump-to - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - _Rename - True - - - - True - gtk-refresh - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - Edit _Groups - True - - - - - - True - - - - - - True - Send _File - True - - - - True - gtk-file - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - Assign Open_PGP Key - True - - - - - True - gtk-dialog-authentication - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Add Special _Notification - True - - - - True - gtk-info - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - gtk-info - True - - - - - - _History - True - - - - True - gtk-justify-fill - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - + + + + True + Start _Chat + True + + + True + gtk-jump-to + 1 + + + + + + + _Rename + True + + + True + gtk-refresh + 1 + + + + + + + Edit _Groups + True + + + + + True + + + + + True + Send _File + True + + + True + gtk-missing-image + 1 + + + + + + + Assign Open_PGP Key + True + + + + True + gtk-missing-image + 1 + + + + + + + True + True + Add Special _Notification + True + + + True + gtk-info + 1 + + + + + + + True + + + + + gtk-info + True + True + + + + + _History + True + + + True + gtk-justify-fill + 1 + + + + + diff --git a/src/config.py b/src/config.py index 30f2c1f74..9bc19b540 100644 --- a/src/config.py +++ b/src/config.py @@ -89,10 +89,7 @@ class PreferencesWindow: self.treat_incoming_messages_combobox =\ self.xml.get_widget('treat_incoming_messages_combobox') - #FIXME: remove when ANC will be implemented - w = self.xml.get_widget('hbox3020') - w.set_no_show_all(True) - w.hide() + w = self.xml.get_widget('anc_hbox') # trayicon if gajim.interface.systray_capabilities: @@ -506,8 +503,7 @@ class PreferencesWindow: notify_gmail_checkbutton = self.xml.get_widget('notify_gmail_checkbutton') notify_gmail_extra_checkbutton = self.xml.get_widget( 'notify_gmail_extra_checkbutton') - frame_gmail.set_no_show_all(True) - + for account in gajim.config.get_per('accounts'): jid = gajim.get_jid_from_account(account) if gajim.get_server_from_jid(jid) in gajim.gmail_domains: @@ -3039,8 +3035,6 @@ class AccountCreationWizardWindow: self.update_progressbar_timeout_id = None self.notebook.set_current_page(0) - self.advanced_button.set_no_show_all(True) - self.finish_button.set_no_show_all(True) self.xml.signal_autoconnect(self) self.window.show_all() diff --git a/src/dialogs.py b/src/dialogs.py index a6eb762c7..abf807442 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -546,15 +546,7 @@ _('Please fill in the data of the contact you want to add in account %s') %accou else: liststore.append([type_, img, type_]) self.protocol_combobox.set_active(0) - self.protocol_jid_combobox.set_no_show_all(True) - self.protocol_jid_combobox.hide() - self.subscription_table.set_no_show_all(True) self.auto_authorize_checkbutton.show() - self.message_scrolledwindow.set_no_show_all(True) - self.register_hbox.set_no_show_all(True) - self.register_hbox.hide() - self.connected_label.set_no_show_all(True) - self.connected_label.hide() liststore = gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) self.xml.signal_autoconnect(self) @@ -1768,17 +1760,6 @@ class SingleMessageWindow: spell2.set_language(lang) except gobject.GError, msg: dialogs.AspellDictError(lang) - self.send_button.set_no_show_all(True) - self.reply_button.set_no_show_all(True) - self.send_and_close_button.set_no_show_all(True) - self.to_label.set_no_show_all(True) - self.to_entry.set_no_show_all(True) - self.from_label.set_no_show_all(True) - self.from_entry.set_no_show_all(True) - self.close_button.set_no_show_all(True) - self.cancel_button.set_no_show_all(True) - self.message_scrolledwindow.set_no_show_all(True) - self.conversation_scrolledwindow.set_no_show_all(True) self.prepare_widgets_for(self.action) @@ -2141,7 +2122,6 @@ class PrivacyListWindow: self.window.set_title(title) - self.add_edit_vbox.set_no_show_all(True) self.window.show_all() self.add_edit_vbox.hide() @@ -2905,9 +2885,6 @@ class AdvancedNotificationsWindow: self.delete_button.set_sensitive(False) self.down_button.set_sensitive(False) self.up_button.set_sensitive(False) - self.recipient_list_entry.set_no_show_all(True) - for st in ['online', 'away', 'xa', 'dnd', 'invisible']: - self.__dict__[st + '_cb'].set_no_show_all(True) self.window.show_all() diff --git a/src/disco.py b/src/disco.py index fb8880aa0..7446447e5 100644 --- a/src/disco.py +++ b/src/disco.py @@ -438,8 +438,6 @@ _('Without a connection, you can not browse available services')) self.on_services_treeview_selection_changed) self.services_scrollwin = self.xml.get_widget('services_scrollwin') self.progressbar = self.xml.get_widget('services_progressbar') - self.progressbar.set_no_show_all(True) - self.progressbar.hide() self.banner = self.xml.get_widget('banner_agent_label') self.banner_icon = self.xml.get_widget('banner_agent_icon') self.banner_eventbox = self.xml.get_widget('banner_agent_eventbox') @@ -447,8 +445,6 @@ _('Without a connection, you can not browse available services')) self.banner.realize() self.paint_banner() self.filter_hbox = self.xml.get_widget('filter_hbox') - self.filter_hbox.set_no_show_all(True) - self.filter_hbox.hide() self.action_buttonbox = self.xml.get_widget('action_buttonbox') # Address combobox diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index b2d92df3f..8de1e4a74 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -116,8 +116,6 @@ class FileTransfersWindow: self.cancel_menuitem = self.xml.get_widget('cancel_menuitem') self.pause_menuitem = self.xml.get_widget('pause_menuitem') self.continue_menuitem = self.xml.get_widget('continue_menuitem') - self.continue_menuitem.hide() - self.continue_menuitem.set_no_show_all(True) self.remove_menuitem = self.xml.get_widget('remove_menuitem') self.xml.signal_autoconnect(self) diff --git a/src/history_manager.py b/src/history_manager.py index c861d395d..569d0e8bd 100755 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -76,10 +76,7 @@ class HistoryManager: self.search_results_scrolledwindow = xml.get_widget( 'search_results_scrolledwindow') self.welcome_label = xml.get_widget('welcome_label') - - self.logs_scrolledwindow.set_no_show_all(True) - self.search_results_scrolledwindow.set_no_show_all(True) - + self.jids_already_in = [] # holds jids that we already have in DB self.AT_LEAST_ONE_DELETION_DONE = False diff --git a/src/profile_window.py b/src/profile_window.py index b56329aa4..94a4cde4f 100644 --- a/src/profile_window.py +++ b/src/profile_window.py @@ -77,10 +77,6 @@ class ProfileWindow: # Create Image for avatar button image = gtk.Image() self.xml.get_widget('PHOTO_button').set_image(image) - text_button = self.xml.get_widget('NOPHOTO_button') - # We use 2 buttons because some GTK theme don't show images in buttons - text_button.set_no_show_all(True) - text_button.hide() self.xml.signal_autoconnect(self) self.window.show_all() diff --git a/src/roster_window.py b/src/roster_window.py index 941658918..42615a039 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1959,9 +1959,6 @@ class RosterWindow: add_special_notification_menuitem = xml.get_widget( 'add_special_notification_menuitem') - add_special_notification_menuitem.hide() - add_special_notification_menuitem.set_no_show_all(True) - if not our_jid: # add a special img for rename menuitem path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps', @@ -2087,9 +2084,6 @@ class RosterWindow: execute_command_menuitem = xml.get_widget( 'execute_command_menuitem') - add_special_notification_menuitem.hide() - add_special_notification_menuitem.set_no_show_all(True) - # send custom status icon blocked = False if jid in gajim.connections[account].blocked_contacts: