Commits

commits@gajim.org

17632 discussions

[commit-gajim] r6297 - trunk/src
by dkirov＠gajim.org 08 May '06

08 May '06

Author: dkirov Date: 2006-05-08 23:16:38 +0200 (Mon, 08 May 2006) New Revision: 6297 Modified: trunk/src/dialogs.py Log: add completion for start chat dialog Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2006-05-08 14:50:38 UTC (rev 6296) +++ trunk/src/dialogs.py 2006-05-08 21:16:38 UTC (rev 6297) @@ -783,10 +783,10 @@ ok_handler = None): # if modal is True you also need to call get_response() # and ok_handler won't be used - xml = gtkgui_helpers.get_glade('input_dialog.glade') - self.dialog = xml.get_widget('input_dialog') - label = xml.get_widget('label') - self.input_entry = xml.get_widget('input_entry') + self.xml = gtkgui_helpers.get_glade('input_dialog.glade') + self.dialog = self.xml.get_widget('input_dialog') + label = self.xml.get_widget('label') + self.input_entry = self.xml.get_widget('input_entry') self.dialog.set_title(title) label.set_markup(label_str) if input_str: @@ -796,9 +796,9 @@ self.is_modal = is_modal if not is_modal and ok_handler is not None: self.ok_handler = ok_handler - okbutton = xml.get_widget('okbutton') + okbutton = self.xml.get_widget('okbutton') okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = xml.get_widget('cancelbutton') + cancelbutton = self.xml.get_widget('cancelbutton') cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.dialog.show_all() @@ -987,7 +987,7 @@ self.window.destroy() -class NewChatDialog: +class NewChatDialog(InputDialog): def __init__(self, account): self.account = account @@ -996,8 +996,46 @@ else: title = _('Start Chat') prompt_text = _('Fill in the contact ID of the contact you would like\nto send a chat message to:') + InputDialog.__init__(self, title, prompt_text, is_modal = False) + # create the completion model for input_entry + completion = gtk.EntryCompletion() + liststore = gtk.ListStore(gtk.gdk.Pixbuf, str) + + render_pixbuf = gtk.CellRendererPixbuf() + completion.pack_start(render_pixbuf, expand = False) + completion.add_attribute(render_pixbuf, 'pixbuf', 0) + + render_text = gtk.CellRendererText() + completion.pack_start(render_text, expand = True) + completion.add_attribute(render_text, 'text', 1) + completion.set_property('text_column', 1) + # add all contacts to the model + self.completion_dict = {} + for jid in gajim.contacts.get_jid_list(account): + contact = gajim.contacts.get_contact_with_highest_priority(account, jid) + self.completion_dict[jid] = contact + name = contact.name + if self.completion_dict.has_key(name): + contact1 = self.completion_dict[name] + del self.completion_dict[name] + self.completion_dict['%s (%s)' % (name, contact1.jid)] = contact1 + self.completion_dict['%s (%s)' % (name, jid)] = contact + else: + self.completion_dict[name] = contact + for jid in self.completion_dict.keys(): + contact = self.completion_dict[jid] + img = gajim.interface.roster.jabber_state_images['16'][contact.show] + liststore.append((img.get_pixbuf(), jid)) - InputDialog(title, prompt_text, is_modal = False, ok_handler = self.new_chat_response) + completion.set_model(liststore) + self.input_entry.set_completion(completion) + + self.ok_handler = self.new_chat_response + okbutton = self.xml.get_widget('okbutton') + okbutton.connect('clicked', self.on_okbutton_clicked) + cancelbutton = self.xml.get_widget('cancelbutton') + cancelbutton.connect('clicked', self.on_cancelbutton_clicked) + self.dialog.show_all() def new_chat_response(self, jid): ''' called when ok button is clicked ''' @@ -1007,6 +1045,8 @@ _('Please make sure you are connected with "%s".' % self.account)) return + if self.completion_dict.has_key(jid): + jid = self.completion_dict[jid].jid gajim.interface.roster.new_chat_from_jid(self.account, jid) class ChangePasswordDialog:

1 0

[commit-gajim] r6296 - trunk/src/common
by jim++＠gajim.org 08 May '06

08 May '06

Author: jim++ Date: 2006-05-08 16:50:38 +0200 (Mon, 08 May 2006) New Revision: 6296 Modified: trunk/src/common/config.py Log: Added various ACE descriptions. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-05-08 14:16:22 UTC (rev 6295) +++ trunk/src/common/config.py 2006-05-08 14:50:38 UTC (rev 6296) @@ -82,7 +82,7 @@ 'mergeaccounts': [ opt_bool, False, '', True ], 'sort_by_show': [ opt_bool, True, '', True ], 'use_speller': [ opt_bool, False, ], - 'print_time': [ opt_str, 'always' ], + 'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'emoticons_theme': [opt_str, 'static', '', True ], 'ascii_formatting': [ opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], @@ -96,8 +96,8 @@ 'custommailapp': [ opt_str, 'mozilla-thunderbird -compose' ], 'custom_file_manager': [ opt_str, 'xffm' ], 'gc-hpaned-position': [opt_int, 540], - 'gc_refer_to_nick_char': [opt_str, ','], - 'gc_proposed_nick_char': [opt_str, '_'], + 'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nick completion (tab) in group chat')], + 'gc_proposed_nick_char': [opt_str, '_', _('Character to propose to add after desired nickname when desired nickname is used by someone else in group chat')], 'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-width': [opt_int, 480], @@ -142,7 +142,7 @@ 'remote_control': [opt_bool, True, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], 'chat_state_notifications': [opt_str, 'all'], # 'all', 'composing_only', 'disabled' 'autodetect_browser_mailer': [opt_bool, False, '', True], - 'print_ichat_every_foo_minutes': [opt_int, 5], + 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of room jids.')], 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of room jids.')], @@ -184,7 +184,7 @@ 'print_status_in_muc': [opt_bool, True, _('If False, Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message.')], 'log_contact_status_changes': [opt_bool, False], 'restored_messages_color': [opt_str, 'grey'], - 'hide_avatar_of_transport': [opt_bool, False], + 'hide_avatar_of_transport': [opt_bool, False, _('Don\'t show avatar for the transport itself.')], 'roster_window_skip_taskbar': [opt_bool, False], 'use_urgency_hint': [opt_bool, True, _('If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events.')], 'notification_timeout': [opt_int, 5],

1 0

[commit-gajim] r6295 - trunk/po/fr/LC_MESSAGES
by jim++＠gajim.org 08 May '06

08 May '06

Author: jim++ Date: 2006-05-08 16:16:22 +0200 (Mon, 08 May 2006) New Revision: 6295 Modified: trunk/po/fr/LC_MESSAGES/gajim.po Log: Typo in fr translation Modified: trunk/po/fr/LC_MESSAGES/gajim.po =================================================================== --- trunk/po/fr/LC_MESSAGES/gajim.po 2006-05-08 13:40:04 UTC (rev 6294) +++ trunk/po/fr/LC_MESSAGES/gajim.po 2006-05-08 14:16:22 UTC (rev 6295) @@ -4137,11 +4137,11 @@ #: ../src/common/config.py:147 msgid "Always ask before closing group chat tab/window in this space separated list of room jids." -msgstr "Toujours demander avant de fermer les salons de cette liste séparée par des espaces." +msgstr "Toujours demander avant de fermer les salons de cette liste séparés par des espaces." #: ../src/common/config.py:148 msgid "Never ask before closing group chat tab/window in this space separated list of room jids." -msgstr "Ne jamais demander avant de fermer les salons de cette liste séparée par des espaces." +msgstr "Ne jamais demander avant de fermer les salons de cette liste séparés par des espaces." #: ../src/common/config.py:151 msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."

1 0

[commit-gajim] r6294 - trunk/po/fr/LC_MESSAGES
by jim++＠gajim.org 08 May '06

08 May '06

Author: jim++ Date: 2006-05-08 15:40:04 +0200 (Mon, 08 May 2006) New Revision: 6294 Modified: trunk/po/fr/LC_MESSAGES/gajim.po Log: Fix fr translation for confirm_close_muc description. Modified: trunk/po/fr/LC_MESSAGES/gajim.po =================================================================== --- trunk/po/fr/LC_MESSAGES/gajim.po 2006-05-08 08:19:20 UTC (rev 6293) +++ trunk/po/fr/LC_MESSAGES/gajim.po 2006-05-08 13:40:04 UTC (rev 6294) @@ -4133,7 +4133,7 @@ #: ../src/common/config.py:146 msgid "Ask before closing a group chat tab/window." -msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion." +msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion de salon." #: ../src/common/config.py:147 msgid "Always ask before closing group chat tab/window in this space separated list of room jids."

1 0

[commit-gajim] r6293 - in trunk/src: . common
by asterix＠gajim.org 08 May '06

08 May '06

Author: asterix Date: 2006-05-08 10:19:20 +0200 (Mon, 08 May 2006) New Revision: 6293 Modified: trunk/src/chat_control.py trunk/src/common/config.py trunk/src/conversation_textview.py Log: [Geobert] ability to remove nickname in chat when consecutive message from same person. Fixes #1942 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-05-08 08:15:37 UTC (rev 6292) +++ trunk/src/chat_control.py 2006-05-08 08:19:20 UTC (rev 6293) @@ -454,7 +454,8 @@ def print_conversation_line(self, text, kind, name, tim, other_tags_for_name = [], other_tags_for_time = [], - other_tags_for_text = [], count_as_new = True, subject = None): + other_tags_for_text = [], count_as_new = True, + subject = None, old_kind = None): '''prints 'chat' type messages''' jid = self.contact.jid full_jid = self.get_full_jid() @@ -463,7 +464,8 @@ if textview.at_the_end() or kind == 'outgoing': end = True textview.print_conversation_line(text, jid, kind, name, tim, - other_tags_for_name, other_tags_for_time, other_tags_for_text, subject) + other_tags_for_name, other_tags_for_time, other_tags_for_text, + subject, old_kind) if not count_as_new: return @@ -705,7 +707,8 @@ class ChatControl(ChatControlBase): '''A control for standard 1-1 chat''' TYPE_ID = message_control.TYPE_CHAT - + old_msg_kind = None # last kind of the printed message + def __init__(self, parent_win, contact, acct, resource = None): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, 'chat_child_vbox', (_('Chat'), _('Chats')), contact, acct, resource) @@ -1095,9 +1098,13 @@ name = contact.get_shown_name() else: kind = 'outgoing' - name = gajim.nicks[self.account] + name = gajim.nicks[self.account] ChatControlBase.print_conversation_line(self, text, kind, name, tim, - subject = subject) + subject = subject, old_kind = self.old_msg_kind) + if text.startswith('/me ') or text.startswith('/me\n'): + self.old_msg_kind = None + else: + self.old_msg_kind = kind def get_tab_label(self, chatstate): unread = '' @@ -1443,7 +1450,7 @@ rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout) - + local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message if not row[2]: # message is empty, we don't print it continue @@ -1462,7 +1469,11 @@ ['small'], ['small', 'restored_message'], ['small', 'restored_message'], - False) + False, old_kind = local_old_kind) + if row[2].startswith('/me ') or row[2].startswith('/me\n'): + local_old_kind = None + else: + local_old_kind = kind if len(rows): self.conv_textview.print_empty_line() Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-05-08 08:15:37 UTC (rev 6292) +++ trunk/src/common/config.py 2006-05-08 08:19:20 UTC (rev 6293) @@ -198,6 +198,8 @@ 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window')], 'hide_chat_banner': [opt_bool, False, _('Hides the banner in two persons chat window')], 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the room occupants list in groupchat window')], + 'chat_merge_consecutive_nickname': [opt_bool, False, _('Merge consecutive nickname in chat window')], + 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickame')], } __options_per_key = { Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2006-05-08 08:15:37 UTC (rev 6292) +++ trunk/src/conversation_textview.py 2006-05-08 08:19:20 UTC (rev 6293) @@ -567,7 +567,7 @@ def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name = [], other_tags_for_time = [], - other_tags_for_text = [], subject = None): + other_tags_for_text = [], subject = None, old_kind = None): '''prints 'chat' type messages''' # kind = info, we print things as if it was a status: same color, ... if kind == 'info': @@ -583,11 +583,14 @@ buffer.insert(end_iter, '\n') if kind == 'incoming_queue': kind = 'incoming' + if old_kind == 'incoming_queue': + old_kind = 'incoming' # print the time stamp if not tim: # We don't have tim for outgoing messages... tim = time.localtime() - if gajim.config.get('print_time') == 'always': + current_print_time = gajim.config.get('print_time') + if current_print_time == 'always': before_str = gajim.config.get('before_time') after_str = gajim.config.get('after_time') # get difference in days since epoch (86400 = 24*3600) @@ -611,7 +614,7 @@ tim_format = time.strftime(format, tim).encode('utf-8') buffer.insert_with_tags_by_name(end_iter, tim_format + ' ', *other_tags_for_time) - elif gajim.config.get('print_time') == 'sometimes': + elif current_print_time == 'sometimes': every_foo_seconds = 60 * gajim.config.get( 'print_ichat_every_foo_minutes') seconds_passed = time.mktime(tim) - self.last_time_printout @@ -627,7 +630,15 @@ if other_text_tag: text_tags.append(other_text_tag) else: # not status nor /me - self.print_name(name, kind, other_tags_for_name) + if gajim.config.get( + 'chat_merge_consecutive_nickname'): + if kind != old_kind: + self.print_name(name, kind, other_tags_for_name) + else: + self.print_real_text(gajim.config.get( + 'chat_merge_consecutive_nickname_indent')) + else: + self.print_name(name, kind, other_tags_for_name) self.print_subject(subject) self.print_real_text(text, text_tags, name)

1 0

[commit-gajim] r6292 - trunk/data/glade
by asterix＠gajim.org 08 May '06

08 May '06

Author: asterix Date: 2006-05-08 10:15:37 +0200 (Mon, 08 May 2006) New Revision: 6292 Modified: trunk/data/glade/manage_bookmarks_window.glade Log: glade for bookmark manager (goes with [6291]) Modified: trunk/data/glade/manage_bookmarks_window.glade =================================================================== --- trunk/data/glade/manage_bookmarks_window.glade 2006-05-07 21:44:57 UTC (rev 6291) +++ trunk/data/glade/manage_bookmarks_window.glade 2006-05-08 08:15:37 UTC (rev 6292) @@ -19,6 +19,7 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <signal name="button_press_event" handler="on_manage_bookmarks_window_button_press_event" last_modification_time="Sun, 12 Jun 2005 15:52:20 GMT"/> <child> @@ -118,7 +119,7 @@ <child> <widget class="GtkTable" id="table33"> <property name="visible">True</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> @@ -392,6 +393,52 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label326"> + <property name="visible">True</property> + <property name="label" translatable="yes">Show status:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="show_status_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_show_status_combobox_changed" last_modification_time="Sun, 07 May 2006 20:44:46 GMT"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property>

1 0

[commit-gajim] r6291 - in trunk/src: . common
by asterix＠gajim.org 07 May '06

07 May '06

Author: asterix Date: 2006-05-07 23:44:57 +0200 (Sun, 07 May 2006) New Revision: 6291 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/config.py trunk/src/groupchat_control.py Log: we can now configure if we want to see all status or only enter/leave in bookmarked rooms. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-05-07 19:00:38 UTC (rev 6290) +++ trunk/src/common/connection.py 2006-05-07 21:44:57 UTC (rev 6291) @@ -838,6 +838,8 @@ iq5 = iq4.setTagData('nick', bm['nick']) if bm['password']: iq5 = iq4.setTagData('password', bm['password']) + if bm['show_status']: + iq5 = iq4.setTagData('show_status', bm['show_status']) self.connection.send(iq) def get_metacontacts(self): Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-05-07 19:00:38 UTC (rev 6290) +++ trunk/src/common/connection_handlers.py 2006-05-07 21:44:57 UTC (rev 6291) @@ -1104,7 +1104,8 @@ 'jid': conf.getAttr('jid'), 'autojoin': autojoin_val, 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick') } + 'nick': conf.getTagData('nick'), + 'show_status': conf.getTagData('show_status')} self.bookmarks.append(bm) self.dispatch('BOOKMARKS', self.bookmarks) Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-05-07 19:00:38 UTC (rev 6290) +++ trunk/src/config.py 2006-05-07 21:44:57 UTC (rev 6291) @@ -181,7 +181,7 @@ theme_combobox.add_attribute(cell, 'text', 0) model = gtk.ListStore(str) theme_combobox.set_model(model) - + i = 0 for config_theme in gajim.config.get_per('themes'): theme = config_theme.replace('_', ' ') @@ -2224,15 +2224,15 @@ self.xml = gtkgui_helpers.get_glade('manage_bookmarks_window.glade') self.window = self.xml.get_widget('manage_bookmarks_window') - #Account-JID, RoomName, Room-JID, Autojoin, Passowrd, Nick - self.treestore = gtk.TreeStore(str, str, str, bool, str, str) + #Account-JID, RoomName, Room-JID, Autojoin, Passowrd, Nick, Show_Status + self.treestore = gtk.TreeStore(str, str, str, bool, str, str, str) #Store bookmarks in treeview. for account in gajim.connections: if gajim.connections[account].connected <= 1: continue iter = self.treestore.append(None, [None, account,None, - None, None, None]) + None, None, None, None]) for bookmark in gajim.connections[account].bookmarks: if bookmark['name'] == '': @@ -2251,8 +2251,22 @@ bookmark['jid'], autojoin, bookmark['password'], - bookmark['nick'] ]) + bookmark['nick'], + bookmark['show_status'] ]) + self.show_status_combobox = self.xml.get_widget('show_status_combobox') + model = gtk.ListStore(str, str) + + self.option_list = {'': '', 'all': _('All'), + 'in_and_out': _('Enter and leave only'), 'none': _('None')} + opts = self.option_list.keys() + opts.sort() + for opt in opts: + model.append([self.option_list[opt], opt]) + + self.show_status_combobox.set_model(model) + self.show_status_combobox.set_active(0) + self.view = self.xml.get_widget('bookmarks_treeview') self.view.set_model(self.treestore) self.view.expand_all() @@ -2315,7 +2329,7 @@ account = model[add_to][1].decode('utf-8') nick = gajim.nicks[account] self.treestore.append(add_to, [account, _('New Room'), '', False, '', - nick]) + nick, 'all']) self.view.expand_row(model.get_path(add_to), True) @@ -2372,7 +2386,7 @@ #create the bookmark-dict bmdict = { 'name': bm[1], 'jid': bm[2], 'autojoin': autojoin, - 'password': bm[4], 'nick': bm[5] } + 'password': bm[4], 'nick': bm[5], 'show_status': bm[6]} gajim.connections[account_unicode].bookmarks.append(bmdict) @@ -2395,7 +2409,8 @@ return widgets = [ self.title_entry, self.nick_entry, self.room_entry, - self.server_entry, self.pass_entry, self.autojoin_checkbutton ] + self.server_entry, self.pass_entry, self.autojoin_checkbutton, + self.show_status_combobox] if model.iter_parent(iter): # make the fields sensitive @@ -2437,6 +2452,14 @@ else: self.nick_entry.set_text('') + show_status = model[iter][6] + opts = self.option_list.keys() + opts.sort() + if show_status: + self.show_status_combobox.set_active(opts.index(show_status)) + else: + self.show_status_combobox.set_active(0) + def on_title_entry_changed(self, widget): (model, iter) = self.selection.get_selected() if iter: # After removing a bookmark, we got nothing selected @@ -2473,12 +2496,21 @@ if iter: model[iter][3] = self.autojoin_checkbutton.get_active() + def on_show_status_combobox_changed(self, widget): + active = widget.get_active() + model = widget.get_model() + show_status = model[active][1] + (model2, iter) = self.selection.get_selected() + if iter: + model2[iter][6] = show_status + def clear_fields(self): widgets = [ self.title_entry, self.nick_entry, self.room_entry, self.server_entry, self.pass_entry ] for field in widgets: field.set_text('') self.autojoin_checkbutton.set_active(False) + self.show_status_combobox.set_active(0) class AccountCreationWizardWindow: def __init__(self): Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-07 19:00:38 UTC (rev 6290) +++ trunk/src/groupchat_control.py 2006-05-07 21:44:57 UTC (rev 6291) @@ -531,8 +531,6 @@ # muc-specific chatstate self.parent_win.redraw_tab(self, 'newmsg') else: - if not gajim.config.get('print_status_in_muc'): - return kind = 'status' if kind == 'incoming': # it's a message NOT from us @@ -841,18 +839,33 @@ self.parent_win.redraw_tab(self) if (time.time() - self.room_creation) > 30 and \ nick != self.nick and statusCode != '303': - if show == 'offline': + st = '' + found = False + for bookmark in gajim.connections[self.account].bookmarks: + if bookmark['jid'] == self.room_jid: + found = True + break + show_status = None + if found: + show_status = bookmark['show_status'] + if not show_status: + if gajim.config.get('print_status_in_muc'): + show_status = 'all' + else: + show_status = 'none' + if show == 'offline' and show_status in ('all', 'in_and_out'): st = _('%s has left') % nick if reason: st += ' [%s]' % reason else: - if newly_created: + if newly_created and show_status in ('all', 'in_and_out'): st = _('%s has joined the room') % nick - else: + elif show_status == 'all': st = _('%s is now %s') % (nick, helpers.get_uf_show(show)) - if status: - st += ' (' + status + ')' - self.print_conversation(st) + if st: + if status: + st += ' (' + status + ')' + self.print_conversation(st) def add_contact_to_roster(self, nick, show, role, affiliation, status, jid = ''):

1 0

[commit-gajim] r6290 - trunk/src
by asterix＠gajim.org 07 May '06

07 May '06

Author: asterix Date: 2006-05-07 21:00:38 +0200 (Sun, 07 May 2006) New Revision: 6290 Modified: trunk/src/vcard.py Log: avatar size (when the original one is too big) is now 125x125 instead of 48x48 Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2006-05-07 17:36:48 UTC (rev 6289) +++ trunk/src/vcard.py 2006-05-07 19:00:38 UTC (rev 6290) @@ -175,7 +175,7 @@ # get the image at 'notification size' # and use that user did not specify in ACE crazy size scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, - 'notification') + 'tooltip') except gobject.GError, msg: # unknown format # msg should be string, not object instance msg = str(msg)

1 0

[commit-gajim] r6289 - trunk/po
by asterix＠gajim.org 07 May '06

07 May '06

Author: asterix Date: 2006-05-07 19:36:48 +0200 (Sun, 07 May 2006) New Revision: 6289 Modified: trunk/po/POTFILES.in Log: add connection_handlers.py to POTFILES.in Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2006-05-07 12:47:24 UTC (rev 6288) +++ trunk/po/POTFILES.in 2006-05-07 17:36:48 UTC (rev 6289) @@ -78,6 +78,7 @@ src/common/GnuPGInterface.py src/common/config.py src/common/connection.py +src/common/connection_handlers.py src/common/gajim.py src/common/helpers.py src/common/i18n.py

1 0

[commit-gajim] r6288 - trunk/src
by asterix＠gajim.org 07 May '06

07 May '06

Author: asterix Date: 2006-05-07 14:47:24 +0200 (Sun, 07 May 2006) New Revision: 6288 Modified: trunk/src/groupchat_control.py trunk/src/message_textview.py Log: add "clear" and "insert nickname" in message textview contact menu. Fixes #1933 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-07 12:23:28 UTC (rev 6287) +++ trunk/src/groupchat_control.py 2006-05-07 12:47:24 UTC (rev 6288) @@ -292,6 +292,9 @@ column.set_visible(False) self.list_treeview.set_expander_column(column) + id = self.msg_textview.connect('populate_popup', + self.on_msg_textview_populate_popup) + self.handlers[id] = self.msg_textview # set an empty subject to show the room_jid self.set_subject('') self.got_disconnected() #init some variables @@ -300,6 +303,29 @@ self.conv_textview.tv.grab_focus() self.widget.show_all() + def on_msg_textview_populate_popup(self, textview, menu): + '''we override the default context menu and we prepend Clear + and the ability to insert a nick''' + item = gtk.SeparatorMenuItem() + menu.prepend(item) + item = gtk.ImageMenuItem(gtk.STOCK_CLEAR) + menu.prepend(item) + id = item.connect('activate', self.msg_textview.clear) + self.handlers[id] = item + + item = gtk.MenuItem(_('Insert Nickname')) + menu.prepend(item) + submenu = gtk.Menu() + item.set_submenu(submenu) + + for nick in gajim.contacts.get_nick_list(self.account, self.room_jid): + item = gtk.MenuItem(nick) + submenu.append(item) + id = item.connect('activate', self.append_nick_in_msg_textview, nick) + self.handlers[id] = item + + menu.show_all() + def notify_on_new_messages(self): return gajim.config.get('notify_on_all_muc_messages') or \ self.attention_flag @@ -1585,22 +1611,25 @@ else: widget.expand_row(path, False) elif event.state & gtk.gdk.SHIFT_MASK: - message_buffer = self.msg_textview.get_buffer() - start_iter, end_iter = message_buffer.get_bounds() - cursor_position = message_buffer.get_insert() - end_iter = message_buffer.get_iter_at_mark(cursor_position) - text = message_buffer.get_text(start_iter, end_iter, False) - start = '' - if text: # Cursor is not at first position - if not text[-1] in (' ', '\n', '\t'): - start = ' ' - add = ' ' - else: - add = self.gc_refer_to_nick_char + ' ' - message_buffer.insert_at_cursor(start + nick + add) + self.append_nick_in_msg_textview(self.msg_textview, nick) self.msg_textview.grab_focus() return True + def append_nick_in_msg_textview(self, widget, nick): + message_buffer = self.msg_textview.get_buffer() + start_iter, end_iter = message_buffer.get_bounds() + cursor_position = message_buffer.get_insert() + end_iter = message_buffer.get_iter_at_mark(cursor_position) + text = message_buffer.get_text(start_iter, end_iter, False) + start = '' + if text: # Cursor is not at first position + if not text[-1] in (' ', '\n', '\t'): + start = ' ' + add = ' ' + else: + add = self.gc_refer_to_nick_char + ' ' + message_buffer.insert_at_cursor(start + nick + add) + def on_list_treeview_motion_notify_event(self, widget, event): model = widget.get_model() props = widget.get_path_at_pos(int(event.x), int(event.y)) Modified: trunk/src/message_textview.py =================================================================== --- trunk/src/message_textview.py 2006-05-07 12:23:28 UTC (rev 6287) +++ trunk/src/message_textview.py 2006-05-07 12:47:24 UTC (rev 6288) @@ -53,6 +53,13 @@ def destroy(self): import gc gobject.idle_add(lambda:gc.collect()) + + def clear(self, widget = None): + '''clear text in the textview''' + buffer = self.get_buffer() + start, end = buffer.get_bounds() + buffer.delete(start, end) + if gobject.pygtk_version < (2, 8, 0): gobject.type_register(MessageTextView)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits