Commits October 2007

commits@gajim.org

3 participants
54 discussions

[commit-gajim] r8922 - branches/gajim_0.11.2/src
by asterix＠gajim.org 21 Oct '07

21 Oct '07

Author: asterix Date: 2007-10-21 18:08:53 +0200 (Sun, 21 Oct 2007) New Revision: 8922 Modified: branches/gajim_0.11.2/src/roster_window.py Log: draw groupchat menu even if bookmarks are not supported Modified: branches/gajim_0.11.2/src/roster_window.py =================================================================== --- branches/gajim_0.11.2/src/roster_window.py 2007-10-21 13:20:01 UTC (rev 8921) +++ branches/gajim_0.11.2/src/roster_window.py 2007-10-21 16:08:53 UTC (rev 8922) @@ -992,7 +992,7 @@ newitem.connect('activate', self.on_manage_bookmarks_menuitem_activate) gc_sub_menu.append(newitem) - gc_sub_menu.show_all() + gc_sub_menu.show_all() connected_accounts_with_vcard = [] for account in gajim.connections:

1 0

[commit-gajim] r8921 - trunk/src
by asterix＠gajim.org 21 Oct '07

21 Oct '07

Author: asterix Date: 2007-10-21 15:20:01 +0200 (Sun, 21 Oct 2007) New Revision: 8921 Modified: trunk/src/roster_window.py Log: fix removal of several contacts Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-10-21 13:05:12 UTC (rev 8920) +++ trunk/src/roster_window.py 2007-10-21 13:20:01 UTC (rev 8921) @@ -3375,7 +3375,7 @@ 'authorization resulting in them always seeing you as offline.') % \ jids dialogs.ConfirmationDialog(pritext, sectext, - on_response_ok = (on_ok, list_)) + on_response_ok = (on_ok2, list_)) def forget_gpg_passphrase(self, keyid):

1 0

[commit-gajim] r8920 - trunk/src
by asterix＠gajim.org 21 Oct '07

21 Oct '07

Author: asterix Date: 2007-10-21 15:05:12 +0200 (Sun, 21 Oct 2007) New Revision: 8920 Modified: trunk/src/conversation_textview.py Log: [thopi] improve emoticons in textview. fixes #2933 Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-10-21 09:40:09 UTC (rev 8919) +++ trunk/src/conversation_textview.py 2007-10-21 13:05:12 UTC (rev 8920) @@ -38,6 +38,107 @@ from htmltextview import HtmlTextView from common.exceptions import GajimGeneralException + +def is_selection_modified(mark): + name = mark.get_name() + if name and name in ('selection_bound', 'insert'): + return True + else: + return False + +def has_focus(widget): + return widget.flags() & gtk.HAS_FOCUS == gtk.HAS_FOCUS + +class TextViewImage(gtk.Image): + + def __init__(self, anchor): + super(TextViewImage, self).__init__() + self.anchor = anchor + self._selected = False + self._disconnect_funcs = [] + self.connect("parent-set", self.on_parent_set) + self.connect("expose-event", self.on_expose) + + def _get_selected(self): + parent = self.get_parent() + if not parent or not self.anchor: return False + buffer = parent.get_buffer() + position = buffer.get_iter_at_child_anchor(self.anchor) + bounds = buffer.get_selection_bounds() + if bounds and position.in_range(*bounds): + return True + else: + return False + + def get_state(self): + parent = self.get_parent() + if not parent: + return gtk.STATE_NORMAL + if self._selected: + if has_focus(parent): + return gtk.STATE_SELECTED + else: + return gtk.STATE_ACTIVE + else: + return gtk.STATE_NORMAL + + def _update_selected(self): + selected = self._get_selected() + if self._selected != selected: + self._selected = selected + self.queue_draw() + + def _do_connect(self, widget, signal, callback): + id = widget.connect(signal, callback) + def disconnect(): + widget.disconnect(id) + self._disconnect_funcs.append(disconnect) + + def _disconnect_signals(self): + for func in self._disconnect_funcs: + func() + self._disconnect_funcs = [] + + def on_parent_set(self, widget, old_parent): + parent = self.get_parent() + if not parent: + self._disconnect_signals() + return + + self._do_connect(parent, "style-set", self.do_queue_draw) + self._do_connect(parent, "focus-in-event", self.do_queue_draw) + self._do_connect(parent, "focus-out-event", self.do_queue_draw) + + textbuf = parent.get_buffer() + self._do_connect(textbuf, "mark-set", self.on_mark_set) + self._do_connect(textbuf, "mark-deleted", self.on_mark_deleted) + + def do_queue_draw(self, *args): + self.queue_draw() + return False + + def on_mark_set(self, buf, iterat, mark): + self.on_mark_modified(mark) + return False + + def on_mark_deleted(self, buf, mark): + self.on_mark_modified(mark) + return False + + def on_mark_modified(self, mark): + if is_selection_modified(mark): + self._update_selected() + + def on_expose(self, widget, event): + state = self.get_state() + if state != gtk.STATE_NORMAL: + gc = widget.get_style().base_gc[state] + area = widget.allocation + widget.window.draw_rectangle(gc, True, area.x, area.y, + area.width, area.height) + return False + + class ConversationTextview: '''Class for the conversation textview (where user reads already said messages) for chat/groupchat windows''' @@ -67,6 +168,8 @@ self.tv.set_left_margin(2) self.tv.set_right_margin(2) self.handlers = {} + self.images = [] + self.image_cache = {} # connect signals id = self.tv.connect('motion_notify_event', @@ -77,7 +180,12 @@ id = self.tv.connect('button_press_event', self.on_textview_button_press_event) self.handlers[id] = self.tv + + id = self.tv.connect("expose-event", + self.on_textview_expose_event) + self.handlers[id] = self.tv + self.account = account self.change_cursor = None self.last_time_printout = 0 @@ -337,6 +445,32 @@ self.line_tooltip.show_tooltip(_('Text below this line is what has ' 'been said since the last time you paid attention to this group chat'), 8, position[1] + pointer[1]) + def on_textview_expose_event(self, widget, event): + expalloc = event.area + exp_x0 = expalloc.x + exp_y0 = expalloc.y + exp_x1 = exp_x0 + expalloc.width + exp_y1 = exp_y0 + expalloc.height + + try: + tryfirst = [self.image_cache[(exp_x0, exp_y0)]] + except KeyError: + tryfirst = [] + + for image in tryfirst + self.images: + imgalloc = image.allocation + img_x0 = imgalloc.x + img_y0 = imgalloc.y + img_x1 = img_x0 + imgalloc.width + img_y1 = img_y0 + imgalloc.height + + if img_x0 <= exp_x0 and img_y0 <= exp_y0 and \ + exp_x1 <= img_x1 and exp_y1 <= img_y1: + self.image_cache[(img_x0, img_y0)] = image + widget.propagate_expose(image, event) + return True + return False + def on_textview_motion_notify_event(self, widget, event): '''change the cursor to a hand when we are over a mail or an url''' pointer_x, pointer_y, spam = self.tv.window.get_pointer() @@ -720,13 +854,14 @@ emot_ascii = possible_emot_ascii_caps end_iter = buffer.get_end_iter() anchor = buffer.create_child_anchor(end_iter) - img = gtk.Image() + img = TextViewImage(anchor) animations = gajim.interface.emoticons_animations if not emot_ascii in animations: animations[emot_ascii] = gtk.gdk.PixbufAnimation( gajim.interface.emoticons[emot_ascii]) img.set_from_animation(animations[emot_ascii]) img.show() + self.images.append(img) # add with possible animation self.tv.add_child_at_anchor(img, anchor) #FIXME: one day, somehow sync with regexp in gajim.py

1 0

[commit-gajim] r8919 - trunk/src
by asterix＠gajim.org 21 Oct '07

21 Oct '07

Author: asterix Date: 2007-10-21 11:40:09 +0200 (Sun, 21 Oct 2007) New Revision: 8919 Modified: trunk/src/gajim.py Log: fix check of presence of X server. Fixes #3481 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-10-21 09:28:34 UTC (rev 8918) +++ trunk/src/gajim.py 2007-10-21 09:40:09 UTC (rev 8919) @@ -113,6 +113,17 @@ common.configpaths.gajimpaths.init_profile(profile) del profile +# PyGTK2.10+ only throws a warning +import warnings +warnings.filterwarnings('error', module='gtk') +try: + import gtk +except Warning, msg: + if str(msg) == 'could not open display': + print >> sys.stderr, _('Gajim needs X server to run. Quiting...') + sys.exit() +warnings.resetwarnings() + import message_control from chat_control import ChatControlBase @@ -134,12 +145,6 @@ except: pass -try: - import gtk -except RuntimeError, msg: - if str(msg) == 'could not open display': - print >> sys.stderr, _('Gajim needs X server to run. Quiting...') - sys.exit() pritext = '' if gtk.pygtk_version < (2, 8, 0): pritext = _('Gajim needs PyGTK 2.8 or above')

1 0

[commit-gajim] r8918 - trunk/src
by asterix＠gajim.org 21 Oct '07

21 Oct '07

Author: asterix Date: 2007-10-21 11:28:34 +0200 (Sun, 21 Oct 2007) New Revision: 8918 Modified: trunk/src/groupchat_control.py Log: fix unicode error in groupchat. Fixes #3480 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-10-21 08:05:54 UTC (rev 8917) +++ trunk/src/groupchat_control.py 2007-10-21 09:28:34 UTC (rev 8918) @@ -194,7 +194,7 @@ self.handlers[id] = widget self.room_jid = self.contact.jid - self.nick = contact.name + self.nick = contact.name.decode('utf-8') self.new_nick = '' self.name = self.room_jid.split('@')[0]

1 0

[commit-gajim] r8917 - trunk/src
by asterix＠gajim.org 21 Oct '07

21 Oct '07

Author: asterix Date: 2007-10-21 10:05:54 +0200 (Sun, 21 Oct 2007) New Revision: 8917 Modified: trunk/src/search_window.py Log: don't crash when there is no result in search window. Fixes #3507 Modified: trunk/src/search_window.py =================================================================== --- trunk/src/search_window.py 2007-10-18 16:42:48 UTC (rev 8916) +++ trunk/src/search_window.py 2007-10-21 08:05:54 UTC (rev 8917) @@ -191,6 +191,11 @@ return self.dataform = dataforms.ExtendForm(node = form) + if len(self.dataform.items) == 0: + # No result + self.label.set_text(_('No result')) + self.label.show() + return self.data_form_widget.set_sensitive(True) try:

1 0

[commit-gajim] r8916 - trunk/src
by asterix＠gajim.org 18 Oct '07

18 Oct '07

Author: asterix Date: 2007-10-18 18:42:48 +0200 (Thu, 18 Oct 2007) New Revision: 8916 Modified: trunk/src/roster_window.py Log: [shivan] show in status combobox that accounts status are not synchronized. fixes #3489 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-10-17 15:16:26 UTC (rev 8915) +++ trunk/src/roster_window.py 2007-10-18 16:42:48 UTC (rev 8916) @@ -3582,8 +3582,10 @@ self.update_status_combobox() return status = model[active][2].decode('utf-8') - - if active == 7: # We choose change status message (7 is that) + statuses_unified = helpers.statuses_unified() + if (active == 7 and statuses_unified) or (active == 9 and not statuses_unified): + print active + # We choose change status message (7 is that, or 9 if there is the "desync'ed" option) # do not change show, just show change status dialog status = model[self.previous_status_combobox_active][2].decode('utf-8') dlg = dialogs.ChangeStatusMessageDialog(status) @@ -3725,6 +3727,12 @@ # table to change index in connection.connected to index in combobox table = {'offline':9, 'connecting':9, 'online':0, 'chat':1, 'away':2, 'xa':3, 'dnd':4, 'invisible':5} + + # we check if there are more options in the combobox that it should + # if yes, we remove the first ones + while len(self.status_combobox.get_model()) > len(table)+2: + self.status_combobox.remove_text(0) + show = helpers.get_global_show() # temporarily block signal in order not to send status that we show # in the combobox @@ -3732,7 +3740,12 @@ if helpers.statuses_unified(): self.status_combobox.set_active(table[show]) else: - self.status_combobox.set_active(-1) + uf_show = helpers.get_uf_show(show) + liststore = self.status_combobox.get_model() + liststore.prepend(['SEPARATOR', None, '', True]) + liststore.prepend([uf_show+" "+"(desync'ed)", self.jabber_state_images['16'][show], + show, False]) + self.status_combobox.set_active(0) self._change_awn_icon_status(show) self.combobox_callback_active = True if gajim.interface.systray_enabled:

1 0

[commit-gajim] r8915 - trunk/src
by asterix＠gajim.org 17 Oct '07

17 Oct '07

Author: asterix Date: 2007-10-17 17:16:26 +0200 (Wed, 17 Oct 2007) New Revision: 8915 Modified: trunk/src/groupchat_control.py Log: jid when destroying room is optional Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-10-17 15:12:28 UTC (rev 8914) +++ trunk/src/groupchat_control.py 2007-10-17 15:16:26 UTC (rev 8915) @@ -1668,18 +1668,19 @@ if response == gtk.RESPONSE_OK: reason = instance.input_entry1.get_text().decode('utf-8') jid = instance.input_entry2.get_text().decode('utf-8') - # Test jid - try: - jid = helpers.parse_jid(jid) - except: - dialogs.ErrorDialog(_('Invalid group chat Jabber ID'), - _('The group chat Jabber ID has not allowed characters.')) - return + if jid: + # Test jid + try: + jid = helpers.parse_jid(jid) + except: + dialogs.ErrorDialog(_('Invalid group chat Jabber ID'), + _('The group chat Jabber ID has not allowed characters.')) + return else: # Abord destroy operation return gajim.connections[self.account].destroy_gc_room(self.room_jid, reason, - jid) + jid) def _on_bookmark_room_menuitem_activate(self, widget): bm = {

1 0

[commit-gajim] r8914 - trunk/src
by asterix＠gajim.org 17 Oct '07

17 Oct '07

Author: asterix Date: 2007-10-17 17:12:28 +0200 (Wed, 17 Oct 2007) New Revision: 8914 Modified: trunk/src/roster_window.py Log: missing assignement Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-10-17 14:58:54 UTC (rev 8913) +++ trunk/src/roster_window.py 2007-10-17 15:12:28 UTC (rev 8914) @@ -4956,7 +4956,7 @@ for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) sec_text += '\n' + os.path.basename(path) - dialogs.NonModalConfirmationDialog(prim_text, sec_text, + dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text, on_response_ok = (_on_send_files, account_dest, jid_dest, uri_splitted)) dialog.popup()

1 0

[commit-gajim] r8913 - in trunk/src: . common
by asterix＠gajim.org 17 Oct '07

17 Oct '07

Author: asterix Date: 2007-10-17 16:58:54 +0200 (Wed, 17 Oct 2007) New Revision: 8913 Modified: trunk/src/common/connection.py trunk/src/roster_window.py Log: improve speed when quitting Gajim, and prevent to send twice STATUS event when we quit Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-10-17 14:31:26 UTC (rev 8912) +++ trunk/src/common/connection.py 2007-10-17 14:58:54 UTC (rev 8913) @@ -203,8 +203,8 @@ # after we auth to server self.old_show = STATUS_LIST[self.connected] self.connected = 0 - self.dispatch('STATUS', 'offline') if not self.on_purpose: + self.dispatch('STATUS', 'offline') self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-10-17 14:31:26 UTC (rev 8912) +++ trunk/src/roster_window.py 2007-10-17 14:58:54 UTC (rev 8913) @@ -3762,17 +3762,19 @@ self.quit_on_next_offline -= 1 if self.quit_on_next_offline < 1: self.quit_gtkgui_interface() - if accountIter: - model[accountIter][C_SECPIXBUF] = None - if gajim.con_types.has_key(account): - gajim.con_types[account] = None - for jid in gajim.contacts.get_jid_list(account): - lcontact = gajim.contacts.get_contacts(account, jid) - lcontact_copy = [] - for contact in lcontact: - lcontact_copy.append(contact) - for contact in lcontact_copy: - self.chg_contact_status(contact, 'offline', '', account) + else: + # No need to redraw contacts if we're quitting + if accountIter: + model[accountIter][C_SECPIXBUF] = None + if gajim.con_types.has_key(account): + gajim.con_types[account] = None + for jid in gajim.contacts.get_jid_list(account): + lcontact = gajim.contacts.get_contacts(account, jid) + lcontact_copy = [] + for contact in lcontact: + lcontact_copy.append(contact) + for contact in lcontact_copy: + self.chg_contact_status(contact, 'offline', '', account) self.actions_menu_needs_rebuild = True self.update_status_combobox()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2007