==== Patch level 2 Source: c68c8ed0-6fce-42b2-a3b7-6be8b34235d4:/local:7657 [local] Target: c4d4e39b-2f5f-9a77-1c94-36969bb79148:/trunk:8972 [mirrored] (svn://svn.gajim.org/gajim/trunk) Log: r7653@damasonium: ddanier | 2007-11-14 21:10:55 +0100 r7654@damasonium: ddanier | 2007-11-15 00:32:14 +0100 * Implemented very simple message-mode like psi: - Configuration option for default-type of new messages when clicking on an roster item - SingleMessageWindow: - Added "Next" and "Quote" button - "Next"-button to read next message waiting - "Next"-button show how many messages are waiting (by subscribing to gajim.events) - "Reply"-button does not quote, "Quote"-button does - Focus on Text by default - "RE: " only added to subject if subject is not empty - "Reply"/"Quote" does not close received message window, the parent is closed when reply window is closed and only if there are no more messages waiting r7655@damasonium: ddanier | 2007-11-15 00:33:26 +0100 * TODO for message-mode === src/config.py ================================================================== --- src/config.py (revision 8972) +++ src/config.py (patch gajim-message-mode level 2) @@ -71,6 +71,8 @@ self.notebook = self.xml.get_widget('preferences_notebook') self.treat_incoming_messages_combobox =\ self.xml.get_widget('treat_incoming_messages_combobox') + self.send_outgoing_messages_combobox =\ + self.xml.get_widget('send_outgoing_messages_combobox') self.one_window_type_combobox =\ self.xml.get_widget('one_window_type_combobox') self.iconset_combobox = self.xml.get_widget('iconset_combobox') @@ -140,6 +142,14 @@ else: self.treat_incoming_messages_combobox.set_active(0) + # Set default for send outgoing messages + choices = common.config.opt_send_outgoing_messages + type = gajim.config.get('send_outgoing_messages') + if type in choices: + self.send_outgoing_messages_combobox.set_active(choices.index(type)) + else: + self.send_outgoing_messages_combobox.set_active(0) + # Set default for single window type choices = common.config.opt_one_window_types type = gajim.config.get('one_message_window') @@ -574,6 +584,11 @@ config_type = common.config.opt_treat_incoming_messages[active] gajim.config.set('treat_incoming_messages', config_type) + def on_send_outgoing_messages_combobox_changed(self, widget): + active = widget.get_active() + config_type = common.config.opt_send_outgoing_messages[active] + gajim.config.set('send_outgoing_messages', config_type) + def on_one_window_type_combo_changed(self, widget): active = widget.get_active() config_type = common.config.opt_one_window_types[active] === src/roster_window.py ================================================================== --- src/roster_window.py (revision 8972) +++ src/roster_window.py (patch gajim-message-mode level 2) @@ -1969,14 +1969,16 @@ self.draw_account(account) def on_send_single_message_menuitem_activate(self, widget, account, - contact = None): + contact=None, resource=None): if contact is None: dialogs.SingleMessageWindow(account, action = 'send') elif type(contact) == type([]): dialogs.SingleMessageWindow(account, contact, 'send') else: jid = contact.jid - if contact.jid == gajim.get_jid_from_account(account): + if resource: + jid += '/' + resource + elif contact.jid == gajim.get_jid_from_account(account): jid += '/' + contact.resource dialogs.SingleMessageWindow(account, jid, 'send') @@ -4358,7 +4360,11 @@ c = gajim.contacts.get_contact_with_highest_priority(account, jid) if jid == gajim.get_jid_from_account(account): resource = c.resource - self.on_open_chat_window(widget, c, account, resource = resource, session = session) + send_outgoing_messages = gajim.config.get('send_outgoing_messages') + if send_outgoing_messages == 'normal': + self.on_send_single_message_menuitem_activate(widget, account, c, resource = resource) + else: + self.on_open_chat_window(widget, c, account, resource = resource, session = session) def on_roster_treeview_row_activated(self, widget, path, col = 0): '''When an iter is double clicked: open the first event window''' === src/dialogs.py ================================================================== --- src/dialogs.py (revision 8972) +++ src/dialogs.py (patch gajim-message-mode level 2) @@ -1841,6 +1841,8 @@ self.resource = resource self.session = session + self.next_count = 0 + self.xml = gtkgui_helpers.get_glade('single_message_window.glade') self.window = self.xml.get_widget('single_message_window') self.count_chars_label = self.xml.get_widget('count_chars_label') @@ -1874,7 +1876,10 @@ self.action = 'form' self.send_button = self.xml.get_widget('send_button') + self.quote_button = self.xml.get_widget('quote_button') self.reply_button = self.xml.get_widget('reply_button') + self.next_button = self.xml.get_widget('next_button') + self.next_count_label = self.xml.get_widget('next_count_label') self.send_and_close_button = self.xml.get_widget('send_and_close_button') self.cancel_button = self.xml.get_widget('cancel_button') self.close_button = self.xml.get_widget('close_button') @@ -1899,6 +1904,11 @@ self.prepare_widgets_for(self.action) + gajim.events.event_added_subscribe(self.on_event_added) + gajim.events.event_removed_subscribe(self.on_event_removed) + if self.action == 'receive': + self.update_next_count() + # set_text(None) raises TypeError exception if self.subject is None: self.subject = '' @@ -1921,9 +1931,11 @@ if gajim.config.get('saveposition'): # get window position and size from config - gtkgui_helpers.move_window(self.window, - gajim.config.get('single-msg-x-position'), - gajim.config.get('single-msg-y-position')) + # Makes absolutely no sense when dealing with multiple windows + # (for example when hitting "reply" the orig window stays) + #gtkgui_helpers.move_window(self.window, + # gajim.config.get('single-msg-x-position'), + # gajim.config.get('single-msg-y-position')) gtkgui_helpers.resize_window(self.window, gajim.config.get('single-msg-width'), gajim.config.get('single-msg-height')) @@ -1965,6 +1977,8 @@ self.to_label.show() self.to_entry.show() self.reply_button.hide() + self.quote_button.hide() + self.next_button.hide() self.from_label.hide() self.from_entry.hide() self.conversation_scrolledwindow.hide() @@ -1979,11 +1993,17 @@ else: # we write a new message (not from reply) self.close_button.hide() if self.to: # do we already have jid? - self.subject_entry.grab_focus() + # Most of the time users skip the subject + #self.subject_entry.grab_focus() + self.message_textview.grab_focus() + else: + self.to_entry.grab_focus() elif action == 'receive': # prepare UI for Receiving title = _('Received %s') % title self.reply_button.show() + self.quote_button.show() + self.next_button.show() self.from_label.show() self.from_entry.show() self.send_button.hide() @@ -2004,6 +2024,7 @@ self.reply_button.grab_focus() self.cancel_button.hide() self.close_button.show() + elif action == 'form': # prepare UI for Receiving title = _('Form %s') % title self.send_button.show() @@ -2018,6 +2039,69 @@ self.window.set_title(title) + def on_single_message_window_destroy(self, widget): + gajim.events.event_added_unsubscribe(self.on_event_added) + gajim.events.event_removed_unsubscribe(self.on_event_removed) + + def update_next_count(self): + # gajim.get_jid_without_resource(self.from_jid)? + self.next_count = len(gajim.events.get_events(self.account, \ + self.from_whom, types=('normal',))) + self.next_count_label.set_label("(%d)" % self.next_count) + + def on_event_added(self, event): + if event.type_ == 'normal': + self.update_next_count() + + def on_event_removed(self, event_list): + for event in event_list: + if event.type_ == 'normal': + self.update_next_count() + return + + def on_next_button_clicked(self, widget): + if self.next_count == 0: + return + next_event = gajim.events.get_first_event(self.account, self.from_whom, 'normal') + #if not next_event: + # next_event = gajim.events.get_first_event(self.account, self.from_whom, 'chat') + if not next_event: + return + # parameters: + # message, subject, kind, time, encrypted, resource, + # msg_id + self.action = 'receive' + self.subject = next_event.parameters[1] + self.message = next_event.parameters[0] + self.resource = next_event.parameters[5] + self.session = next_event.parameters[8] + form_node = next_event.parameters[9] + + parent_box = self.xml.get_widget('conversation_scrolledwindow').get_parent() + if form_node: + dataform = dataforms.ExtendForm(node = form_node) + self.form_widget = dataforms_widget.DataFormWidget(dataform) + self.form_widget.show_all() + parent_box.add(self.form_widget) + parent_box.child_set_property(self.form_widget, 'position', + parent_box.child_get_property(self.xml.get_widget('conversation_scrolledwindow'), 'position')) + self.action = 'form' + elif self.form_widget: + self.form_widget.hide() + parent_box.remove(self.form_widget) + self.form_widget = None + + self.conversation_textview.clear() + self.prepare_widgets_for(self.action) + + # set_text(None) raises TypeError exception + if self.subject is None: + self.subject = '' + self.subject_entry.set_text(self.subject) + + gajim.interface.remove_first_event(self.account, self.from_whom, next_event.type_) + self.update_next_count() + def on_cancel_button_clicked(self, widget): self.save_pos() self.window.destroy() @@ -2073,18 +2157,34 @@ def on_send_button_clicked(self, widget): self.send_single_message() + + def on_child_window_destroy(self, widget): + # TODO: Only close window if child send a message + if self.next_count == 0: + self.save_pos() + self.window.destroy() - def on_reply_button_clicked(self, widget): + def on_reply_button_clicked(self, widget, quote=False): # we create a new blank window to send and we preset RE: and to jid - self.subject = _('RE: %s') % self.subject - self.message = _('%s wrote:\n') % self.from_whom + self.message - # add > at the begining of each line - self.message = self.message.replace('\n', '\n> ') + '\n\n' - self.window.destroy() - SingleMessageWindow(self.account, to = self.from_whom, - action = 'send', from_whom = self.from_whom, subject = self.subject, - message = self.message, session = self.session) + if self.subject: + subject = _('RE: %s') % self.subject + else: + subject = '' + if quote: + message = _('%s wrote:\n') % self.from_whom + self.message + # add > at the begining of each line + message = message.replace('\n', '\n> ') + '\n\n' + else: + message = '' + smw = SingleMessageWindow(self.account, to = self.from_whom, + action = 'send', from_whom = self.from_whom, subject = subject, + message = message, session = self.session) + smw.window.connect('destroy', + self.on_child_window_destroy) + def on_quote_button_clicked(self, widget): + self.on_reply_button_clicked(widget, quote=True) + def on_send_and_close_button_clicked(self, widget): self.send_single_message() self.save_pos() === src/common/config.py ================================================================== --- src/common/config.py (revision 8972) +++ src/common/config.py (patch gajim-message-mode level 2) @@ -47,6 +47,7 @@ opt_color = [ 'color', '^(#[0-9a-fA-F]{6})|()$' ] opt_one_window_types = ['never', 'always', 'peracct', 'pertype'] opt_treat_incoming_messages = ['', 'chat', 'normal'] +opt_send_outgoing_messages = ['chat', 'normal'] class Config: @@ -245,6 +246,7 @@ 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], + 'send_outgoing_messages': [ opt_str, 'chat', _('Can be \'chat\' or \'normal\'. All outgoing messages have this type by default.')], 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], 'use_latex': [opt_bool, False, _('If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], === data/glade/single_message_window.glade ================================================================== --- data/glade/single_message_window.glade (revision 8972) +++ data/glade/single_message_window.glade (patch gajim-message-mode level 2) @@ -7,6 +7,7 @@ 550 280 + @@ -50,7 +51,6 @@ True True True - * 1 @@ -78,7 +78,6 @@ True True - * 1 @@ -93,7 +92,6 @@ True True True - * 1 @@ -236,6 +234,104 @@ + + 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 + + + + + + + + + 3 + + + + + True + True + True + True + Reply to this message + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-ok + + + False + False + + + + + True + _Quote + True + + + False + False + 1 + + + + + + + + + 4 + + + True True @@ -281,31 +377,31 @@ - 3 + 5 - + True True True True - Send message and close window + View next message 0 - + - + True 0 0 - + True 2 - + True - gtk-ok + gtk-media-next False @@ -313,10 +409,31 @@ - + True - _Send & Close - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + + + True + _Next + True + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + (0) + + + 1 + + False @@ -330,7 +447,7 @@ - 4 + 6 === data/glade/preferences_window.glade ================================================================== --- data/glade/preferences_window.glade (revision 8972) +++ data/glade/preferences_window.glade (patch gajim-message-mode level 2) @@ -26,7 +26,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 GTK_SHADOW_NONE @@ -111,7 +110,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 GTK_SHADOW_NONE @@ -122,51 +120,84 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 + 7 2 6 6 - + True - If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons - - - True - 0 - 1 - Emoticons: - - + Chat message +Single message + + 1 + 2 + 2 + 3 GTK_FILL - + True - + 0 + 1 + Send outgoing messages as: + 2 + 3 + GTK_FILL + + + + + True + Never +Always +Per account +Per type + + + 1 2 + 3 + 4 GTK_FILL - + + True + 0 + 1 + Use only one message _window: + True + one_window_type_combobox + + + 3 + 4 + GTK_FILL + + + + True - _Highlight misspelled words + Hides buttons in chatwindows to + _Make message windows compact True 0 True - + 2 - 5 - 6 + 4 + 5 GTK_FILL @@ -183,42 +214,37 @@ 2 - 4 - 5 + 5 + 6 GTK_FILL - + True - Hides buttons in chatwindows to - _Make message windows compact + _Highlight misspelled words True 0 True - + 2 - 3 - 4 + 6 + 7 GTK_FILL - + True - Never -Always -Per account -Per type - + 0 + 1 + Treat all incoming messages as: - 1 - 2 - 2 - 3 + 1 + 2 GTK_FILL @@ -239,30 +265,30 @@ - + True - 0 - 1 - Use only one message _window: - True - one_window_type_combobox + - 2 - 3 + 1 + 2 GTK_FILL - + True - 0 - 1 - Treat all incoming messages as: + If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons + + + True + 0 + 1 + Emoticons: + + - 1 - 2 GTK_FILL @@ -291,7 +317,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 GTK_SHADOW_NONE @@ -307,42 +332,55 @@ 6 6 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + 2 4 + 1 + 2 - + True + 0 + T_heme: + True + theme_combobox + + + GTK_FILL + GTK_FILL + + + + + True True - If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...) - Use _transports iconsets + Configure color and font of the interface + Ma_nage... True 0 - True - + - 4 - 2 - 3 + 2 + 3 + GTK_FILL + GTK_FILL - + True - + 1 2 - 1 - 2 GTK_FILL GTK_FILL @@ -363,57 +401,44 @@ - + True - + 1 2 + 1 + 2 GTK_FILL GTK_FILL - + True True - Configure color and font of the interface - Ma_nage... + If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...) + Use _transports iconsets True 0 - + True + - 2 - 3 - GTK_FILL - GTK_FILL + 4 + 2 + 3 - + True - 0 - T_heme: - True - theme_combobox - - - GTK_FILL - GTK_FILL - - - - - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + 3 4 - 1 - 2 @@ -438,9 +463,6 @@ - - False - @@ -449,7 +471,6 @@ tab - False False @@ -462,7 +483,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 GTK_SHADOW_NONE @@ -478,89 +498,89 @@ 6 6 - + True - True - Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster - _Ignore events from contacts not in the roster - True - 0 - True - - - - 2 - 2 - 3 - GTK_FILL - - - - - True All chat states Composing only Disabled - + 1 2 - 1 - 2 GTK_FILL - + True - Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows. + Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party. - + True 0 - _Display chat state notifications: + _Send chat state notifications: True - 1 - 2 GTK_FILL - + True - Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party. + Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows. - + True 0 - _Send chat state notifications: + _Display chat state notifications: True + 1 + 2 GTK_FILL - + True All chat states Composing only Disabled - + 1 2 + 1 + 2 GTK_FILL + + + True + True + Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster + _Ignore events from contacts not in the roster + True + 0 + True + + + + 2 + 2 + 3 + GTK_FILL + + @@ -584,7 +604,6 @@ True - 0 GTK_SHADOW_NONE @@ -603,79 +622,152 @@ 12 6 - + True - 0 - _Incoming message: + True + Use system _default True - GTK_JUSTIFY_CENTER - True - incoming_msg_colorbutton + 0 + True + + 2 + 4 + 3 + 4 GTK_FILL - + True - True - True - True - True - 0 - + 6 + + + True + 0 + _Font: + True + conversation_fontbutton + + + + + True + True + 0 + + + + False + 1 + + - 1 2 - - + 3 + 4 + GTK_FILL - + True - 0 - _Outgoing message: - True - GTK_JUSTIFY_CENTER - True - outgoing_msg_colorbutton + + + True + + + False + + + + + True + True + False + 0 + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-revert-to-saved + + + False + False + + + + + True + _Reset to Default Colors + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + - 2 - 3 + 4 + 2 + 3 GTK_FILL - - + True True 0 - + 3 4 + 1 + 2 GTK_FILL - + True 0 - _Status message: + _URL: True - GTK_JUSTIFY_CENTER - True - status_msg_colorbutton + url_msg_colorbutton + 2 + 3 1 2 GTK_FILL @@ -699,16 +791,16 @@ - + True 0 - _URL: + _Status message: True - url_msg_colorbutton + GTK_JUSTIFY_CENTER + True + status_msg_colorbutton - 2 - 3 1 2 GTK_FILL @@ -716,137 +808,64 @@ - + True True 0 - + 3 4 - 1 - 2 GTK_FILL - + True - - - True - - - False - - - - - True - True - False - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-revert-to-saved - - - False - False - - - - - True - _Reset to Default Colors - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - + 0 + _Outgoing message: + True + GTK_JUSTIFY_CENTER + True + outgoing_msg_colorbutton - 4 - 2 - 3 + 2 + 3 GTK_FILL + - + True - 6 - - - True - 0 - _Font: - True - conversation_fontbutton - - - - - True - True - 0 - - - - False - 1 - - + True + True + True + True + 0 + + 1 2 - 3 - 4 - GTK_FILL + + - + True - True - Use system _default + 0 + _Incoming message: True - 0 - True - + GTK_JUSTIFY_CENTER + True + incoming_msg_colorbutton - 2 - 4 - 3 - 4 GTK_FILL @@ -880,7 +899,6 @@ 1 - False @@ -891,7 +909,6 @@ tab 1 - False False @@ -903,7 +920,6 @@ True - 0 GTK_SHADOW_NONE @@ -1076,7 +1092,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 GTK_SHADOW_NONE @@ -1229,7 +1244,6 @@ 2 - False @@ -1240,7 +1254,6 @@ tab 2 - False False @@ -1257,63 +1270,56 @@ 12 6 - + True True - Auto _away after: - True - 0 - True - + The auto not available status message + - GTK_FILL - - - - - - True - True - Auto _not available after: - True - 0 - True - - - + 3 + 4 1 2 - GTK_FILL - + True - 0 - minutes + True + The auto away status message + - 2 - 3 - GTK_FILL + 3 + 4 - + True - 0 - minutes + 1 + 0 + + + 50 + True + True + 20 1 1440 1 10 10 + 1 + + + - 2 - 3 + 1 + 2 1 2 GTK_FILL - + GTK_FILL @@ -1340,58 +1346,65 @@ - + True - 1 - 0 - - - 50 - True - True - 20 1 1440 1 10 10 - 1 - - - + 0 + minutes - 1 - 2 + 2 + 3 1 2 GTK_FILL - GTK_FILL + - + True - True - The auto away status message - + 0 + minutes - 3 - 4 + 2 + 3 + GTK_FILL - + True True - The auto not available status message - + Auto _not available after: + True + 0 + True + - 3 - 4 1 2 + GTK_FILL + + + True + True + Auto _away after: + True + 0 + True + + + + GTK_FILL + + + False @@ -1522,7 +1535,6 @@ True - 0 GTK_SHADOW_NONE @@ -1638,7 +1650,6 @@ 3 - False @@ -1649,7 +1660,6 @@ tab 3 - False False @@ -1661,7 +1671,6 @@ True - 0 GTK_SHADOW_NONE @@ -1685,7 +1694,6 @@ - 0 GTK_SHADOW_NONE @@ -1700,85 +1708,85 @@ 12 6 - + True - 0 - _Browser: - True - custom_browser_entry + True + - GTK_FILL + 1 + 2 + 2 + 3 - + True 0 - _Mail client: + _File manager: True - custom_mail_client_entry + custom_file_manager_entry - 1 - 2 + 2 + 3 GTK_FILL - + True True - + 1 2 - 1 - 2 - + True True - + 1 2 + 1 + 2 - + True 0 - _File manager: + _Mail client: True - custom_file_manager_entry + custom_mail_client_entry - 2 - 3 + 1 + 2 GTK_FILL - + True - True - + 0 + _Browser: + True + custom_browser_entry - 1 - 2 - 2 - 3 + GTK_FILL @@ -1825,7 +1833,6 @@ True True - 0 GTK_SHADOW_NONE @@ -1892,7 +1899,6 @@ True - 0 GTK_SHADOW_NONE @@ -1974,7 +1980,6 @@ True - 0 GTK_SHADOW_NONE @@ -2048,7 +2053,6 @@ 4 - False @@ -2059,7 +2063,6 @@ tab 4 - False False === TODO.message-mode ================================================================== --- TODO.message-mode (revision 8972) +++ TODO.message-mode (patch gajim-message-mode level 2) @@ -0,0 +1,3 @@ + * History/UserInfos in SingleMessageWindow + * "Next"-button should change image when more messages are waiting (animate) + * Cleanup!