Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: minimize to the Systray, by a click (Left-click) at the S...
by Denis Fomin 20 May '11

20 May '11

changeset 0b3285b1e32a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0b3285b1e32a description: minimize to the Systray, by a click (Left-click) at the Systray icon, when it is set to be a Stick window (to be appear at every Workspace). Fixes #6838 diffstat: src/statusicon.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f74241af558a -r 0b3285b1e32a src/statusicon.py --- a/src/statusicon.py Wed Mar 16 11:46:12 2011 +0300 +++ b/src/statusicon.py Mon Mar 21 11:49:42 2011 +0300 @@ -400,7 +400,7 @@ x, y = win.get_position() gajim.config.set('roster_x-position', x) gajim.config.set('roster_y-position', y) - win.hide() # else we hide it from VD that was visible in + win.hide() # else we hide it from VD that was visible in else: if not win.get_property('visible'): win.show_all()

1 0

gajim: [Slava]do not lose received history position when a new i...
by Denis Fomin 20 May '11

20 May '11

changeset f74241af558a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f74241af558a description: [Slava]do not lose received history position when a new incoming message arrives. Fixes #6822 diffstat: src/chat_control.py | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diffs (35 lines): diff -r d2f12d849000 -r f74241af558a src/chat_control.py --- a/src/chat_control.py Thu Mar 10 13:55:15 2011 +0300 +++ b/src/chat_control.py Wed Mar 16 11:46:12 2011 +0300 @@ -804,19 +804,27 @@ # save the message, so user can scroll though the list with key up/down if msg_type == 'sent': history = self.sent_history + pos = self.sent_history_pos else: history = self.received_history - size = len(self.sent_history) + pos = self.received_history_pos + size = len(history) + scroll = False if pos == size else True # are we scrolling? # we don't want size of the buffer to grow indefinately max_size = gajim.config.get('key_up_lines') for i in xrange(size - max_size + 1): + if pos == 0: + break history.pop(0) + pos -= 1 history.append(message) + if not scroll or msg_type == 'sent': + pos = len(history) if msg_type == 'sent': - self.sent_history_pos = len(history) + self.sent_history_pos = pos + self.orig_msg = None else: - self.received_history_pos = len(history) - self.orig_msg = None + self.received_history_pos = pos def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[],

1 0

gajim: [slava]Quoting the recieved messages with the keyboard sh...
by Denis Fomin 20 May '11

20 May '11

changeset d2f12d849000 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2f12d849000 description: [slava]Quoting the recieved messages with the keyboard shortcuts. Fixes #6822 diffstat: src/chat_control.py | 181 +++++++++++++++++++++++++++++---------------------- 1 files changed, 101 insertions(+), 80 deletions(-) diffs (truncated from 483 to 300 lines): diff -r 31f41ae3e222 -r d2f12d849000 src/chat_control.py --- a/src/chat_control.py Fri Mar 18 10:09:06 2011 +0100 +++ b/src/chat_control.py Thu Mar 10 13:55:15 2011 +0300 @@ -88,6 +88,7 @@ spell.detach() del tv + ################################################################################ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ @@ -103,6 +104,7 @@ keycode_ins = keymap.get_entries_for_keyval(gtk.keysyms.Insert)[0][0] except TypeError: keycode_ins = 118 + def make_href(self, match): url_color = gajim.config.get('urlmsgcolor') url = match.group() @@ -245,7 +247,7 @@ lb = gtk.ListStore(str) self.seclabel_combo.set_model(lb) cell = gtk.CellRendererText() - cell.set_property('xpad', 5) # padding for status text + cell.set_property('xpad', 5) # padding for status text self.seclabel_combo.pack_start(cell, True) # text to show is in in first column of liststore self.seclabel_combo.add_attribute(cell, 'text', 0) @@ -303,7 +305,7 @@ # Init DND self.TARGET_TYPE_URI_LIST = 80 - self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ), + self.dnd_list = [('text/uri-list', 0, self.TARGET_TYPE_URI_LIST), ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)] id_ = self.widget.connect('drag_data_received', self._on_drag_data_received) @@ -384,6 +386,8 @@ # the following vars are used to keep history of user's messages self.sent_history = [] self.sent_history_pos = 0 + self.received_history = [] + self.received_history_pos = 0 self.orig_msg = None # Emoticons menu @@ -500,14 +504,14 @@ """ If right-clicked, show popup """ - if event.button == 3: # right click + if event.button == 3: # right click self.parent_win.popup_menu(event) def _on_send_button_clicked(self, widget): """ When send button is pressed: send the current message """ - if gajim.connections[self.account].connected < 2: # we are not connected + if gajim.connections[self.account].connected < 2: # we are not connected dialogs.ErrorDialog(_('A connection is not available'), _('Your message can not be sent until you are connected.')) return @@ -563,7 +567,7 @@ del self.handlers[id_] break - def connect_style_event(self, widget, set_fg = False, set_bg = False): + def connect_style_event(self, widget, set_fg=False, set_bg=False): self.disconnect_style_event(widget) id_ = widget.connect('style-set', self._on_style_set_event, set_fg, set_bg) @@ -599,7 +603,8 @@ def show_emoticons_menu(self): if not gajim.config.get('emoticons_theme'): return - def set_emoticons_menu_position(w, msg_tv = self.msg_textview): + + def set_emoticons_menu_position(w, msg_tv=self.msg_textview): window = msg_tv.get_window(gtk.TEXT_WINDOW_WIDGET) # get the window position origin = window.get_origin() @@ -624,7 +629,7 @@ y -= menu_height + (msg_tv.allocation.height / buf.get_line_count()) #else: # move menu just below cursor # y -= (msg_tv.allocation.height / buf.get_line_count()) - return (x, y, True) # push_in True + return (x, y, True) # push_in True gajim.interface.emoticon_menuitem_clicked = self.append_emoticon gajim.interface.emoticons_menu.popup(None, None, set_emoticons_menu_position, 1, 0) @@ -660,7 +665,7 @@ self.conv_textview.tv.emit('key_press_event', event) return True elif event.state & gtk.gdk.CONTROL_MASK: - if event.keyval == gtk.keysyms.Tab: # CTRL + TAB + if event.keyval == gtk.keysyms.Tab: # CTRL + TAB self.parent_win.move_to_next_unread_tab(True) return True return False @@ -681,19 +686,25 @@ xhtml = self.msg_textview.get_xhtml() # construct event instance from binding - event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here + event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here event.keyval = event_keyval event.state = event_keymod - event.time = 0 # assign current time + event.time = 0 # assign current time if event.keyval == gtk.keysyms.Up: - if event.state & gtk.gdk.CONTROL_MASK: # Ctrl+UP - self.sent_messages_scroll('up', widget.get_buffer()) + if event.state == gtk.gdk.CONTROL_MASK: # Ctrl+UP + self.scroll_messages('up', message_buffer, 'sent') + # Ctrl+Shift+UP + elif event.state == (gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK): + self.scroll_messages('up', message_buffer, 'received') elif event.keyval == gtk.keysyms.Down: - if event.state & gtk.gdk.CONTROL_MASK: # Ctrl+Down - self.sent_messages_scroll('down', widget.get_buffer()) + if event.state == gtk.gdk.CONTROL_MASK: # Ctrl+Down + self.scroll_messages('down', message_buffer, 'sent') + # Ctrl+Shift+Down + elif event.state == (gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK): + self.scroll_messages('down', message_buffer, 'received') elif event.keyval == gtk.keysyms.Return or \ - event.keyval == gtk.keysyms.KP_Enter: # ENTER + event.keyval == gtk.keysyms.KP_Enter: # ENTER # NOTE: SHIFT + ENTER is not needed to be emulated as it is not # binding at all (textview's default action is newline) @@ -701,14 +712,14 @@ # here, we emulate GTK default action on ENTER (add new line) # normally I would add in keypress but it gets way to complex # to get instant result on changing this advanced setting - if event.state == 0: # no ctrl, no shift just ENTER add newline + if event.state == 0: # no ctrl, no shift just ENTER add newline end_iter = message_buffer.get_end_iter() message_buffer.insert_at_cursor('\n') send_message = False - elif event.state & gtk.gdk.CONTROL_MASK: # CTRL + ENTER + elif event.state & gtk.gdk.CONTROL_MASK: # CTRL + ENTER send_message = True else: # send on Enter, do newline on Ctrl Enter - if event.state & gtk.gdk.CONTROL_MASK: # Ctrl + ENTER + if event.state & gtk.gdk.CONTROL_MASK: # Ctrl + ENTER end_iter = message_buffer.get_end_iter() message_buffer.insert_at_cursor('\n') send_message = False @@ -779,8 +790,8 @@ label=label, callback=callback, callback_args=callback_args) - # Record message history - self.save_sent_message(message) + # Record the history of sent messages + self.save_message(message, 'sent') # Be sure to send user nickname only once according to JEP-0172 self.user_nick = None @@ -789,21 +800,22 @@ message_buffer = self.msg_textview.get_buffer() message_buffer.set_text('') # clear message buffer (and tv of course) - def save_sent_message(self, message): + def save_message(self, message, msg_type): # save the message, so user can scroll though the list with key up/down + if msg_type == 'sent': + history = self.sent_history + else: + history = self.received_history size = len(self.sent_history) # we don't want size of the buffer to grow indefinately max_size = gajim.config.get('key_up_lines') - if size >= max_size: - for i in xrange(0, size - 1): - self.sent_history[i] = self.sent_history[i + 1] - self.sent_history[max_size - 1] = message - # self.sent_history_pos has changed if we browsed sent_history, - # reset to real value - self.sent_history_pos = max_size + for i in xrange(size - max_size + 1): + history.pop(0) + history.append(message) + if msg_type == 'sent': + self.sent_history_pos = len(history) else: - self.sent_history.append(message) - self.sent_history_pos = size + 1 + self.received_history_pos = len(history) self.orig_msg = None def print_conversation_line(self, text, kind, name, tim, @@ -839,6 +851,10 @@ # other_tags_for_text == ['marked'] --> highlighted gc message gajim.last_message_time[self.account][full_jid] = time.time() + if kind in ('incoming', 'incoming_queue'): + # Record the history of received messages + self.save_message(text, 'received') + if kind in ('incoming', 'incoming_queue', 'error'): gc_message = False if self.type_id == message_control.TYPE_GC: @@ -867,8 +883,8 @@ self.account, self.contact, type_) event = gajim.events.create_event(type_, (self,), - show_in_roster = show_in_roster, - show_in_systray = show_in_systray) + show_in_roster=show_in_roster, + show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster if show_in_roster: @@ -979,7 +995,6 @@ font_dialog.fontsel) font_dialog.show_all() - def on_actions_button_clicked(self, widget): """ Popup action menu @@ -1002,7 +1017,7 @@ start, end = buffer_.get_bounds() buffer_.delete(start, end) - def _on_history_menuitem_activate(self, widget = None, jid = None): + def _on_history_menuitem_activate(self, widget=None, jid=None): """ When history menuitem is pressed: call history window """ @@ -1038,8 +1053,8 @@ prim_text = _('Really send file?') sec_text = _('If you send a file to %s, he/she will know your ' 'real Jabber ID.') % gc_contact.name - dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text, - on_response_ok = (_on_ok, gc_contact)) + dialog = dialogs.NonModalConfirmationDialog(prim_text, + sec_text, on_response_ok=(_on_ok, gc_contact)) dialog.popup() return _on_ok(gc_contact) @@ -1073,12 +1088,11 @@ if self.type_id == message_control.TYPE_GC: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not gajim.events.remove_events(self.account, self.get_full_jid(), - types = type_): + types=type_): # There were events to remove self.redraw_after_event_removed(jid) - - def bring_scroll_to_end(self, textview, diff_y = 0): + def bring_scroll_to_end(self, textview, diff_y=0): """ Scroll to the end of textview if end is not visible """ @@ -1227,31 +1241,39 @@ gajim.interface.roster.draw_contact(jid, self.account) gajim.interface.roster.show_title() - def sent_messages_scroll(self, direction, conv_buf): - size = len(self.sent_history) + def scroll_messages(self, direction, msg_buf, msg_type): + if msg_type == 'sent': + history = self.sent_history + pos = self.sent_history_pos + self.received_history_pos = len(self.received_history) + else: + history = self.received_history + pos = self.received_history_pos + self.sent_history_pos = len(self.sent_history) + size = len(history) if self.orig_msg is None: # user was typing something and then went into history, so save # whatever is already typed - start_iter = conv_buf.get_start_iter() - end_iter = conv_buf.get_end_iter() - self.orig_msg = conv_buf.get_text(start_iter, end_iter, 0).decode( + start_iter = msg_buf.get_start_iter() + end_iter = msg_buf.get_end_iter() + self.orig_msg = msg_buf.get_text(start_iter, end_iter, 0).decode( 'utf-8') - if direction == 'up': - if self.sent_history_pos == 0: - return - self.sent_history_pos = self.sent_history_pos - 1 - self.smooth = False - conv_buf.set_text(self.sent_history[self.sent_history_pos]) - elif direction == 'down': - if self.sent_history_pos >= size - 1: - conv_buf.set_text(self.orig_msg) - self.orig_msg = None - self.sent_history_pos = size - return - - self.sent_history_pos = self.sent_history_pos + 1

1 0

gajim: don't allow to invite pm contacts to other MUC if we don'...
by Yann Leboulanger 20 May '11

20 May '11

changeset 31f41ae3e222 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31f41ae3e222 description: don't allow to invite pm contacts to other MUC if we don't know his real JID. see #4443 diffstat: src/groupchat_control.py | 15 +++++++++++++++ src/gui_menu_builder.py | 11 +++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diffs (60 lines): diff -r 3a2269c112ad -r 31f41ae3e222 src/groupchat_control.py --- a/src/groupchat_control.py Tue May 17 18:57:37 2011 +0400 +++ b/src/groupchat_control.py Fri Mar 18 10:09:06 2011 +0100 @@ -34,6 +34,7 @@ import pango import gobject import gtkgui_helpers +import gui_menu_builder import message_control import tooltips import dialogs @@ -196,6 +197,20 @@ self.session.negotiate_e2e(False) + def prepare_context_menu(self, hide_buttonbar_items=False): + """ + Set compact view menuitem active state sets active and sensitivity state + for toggle_gpg_menuitem sets sensitivity for history_menuitem (False for + tranasports) and file_transfer_menuitem and hide()/show() for + add_to_roster_menuitem + """ + menu = gui_menu_builder.get_contact_menu(self.contact, self.account, + use_multiple_contacts=False, show_start_chat=False, + show_encryption=True, control=self, + show_buttonbar_items=not hide_buttonbar_items, + gc_contact=self.gc_contact) + return menu + class GroupchatControl(ChatControlBase): TYPE_ID = message_control.TYPE_GC diff -r 3a2269c112ad -r 31f41ae3e222 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue May 17 18:57:37 2011 +0400 +++ b/src/gui_menu_builder.py Fri Mar 18 10:09:06 2011 +0100 @@ -151,7 +151,7 @@ def get_contact_menu(contact, account, use_multiple_contacts=True, show_start_chat=True, show_encryption=False, show_buttonbar_items=True, -control=None): +control=None, gc_contact=None): """ Build contact popup menu for roster and chat window. If control is not set, we hide invite_contacts_menuitem @@ -368,7 +368,14 @@ if muc_icon: invite_menuitem.set_image(muc_icon) - build_invite_submenu(invite_menuitem, [(contact, account)]) + if gc_contact: + if not gc_contact.jid: + # it's a pm and we don't know real JID + invite_menuitem.set_sensitive(False) + else: + build_invite_submenu(invite_menuitem, [(gc_contact, account)]) + else: + build_invite_submenu(invite_menuitem, [(contact, account)]) # One or several resource, we do the same for send_custom_status status_menuitems = gtk.Menu()

1 0

gajim: htmltextview. jump to newline if inline element started. ...
by Denis Fomin 20 May '11

20 May '11

changeset 3a2269c112ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3a2269c112ad description: htmltextview. jump to newline if inline element started. Fixes #6880 diffstat: src/htmltextview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 83e7b7f1c792 -r 3a2269c112ad src/htmltextview.py --- a/src/htmltextview.py Sun May 01 18:31:44 2011 +0200 +++ b/src/htmltextview.py Tue May 17 18:57:37 2011 +0400 @@ -753,7 +753,7 @@ elif name in ('a', 'img', 'body', 'html'): pass elif name in INLINE: - pass + self._jump_line() else: warnings.warn('Unhandled element "%s"' % name)

1 0

gajim: Fix the function that checks if we should log message. Fi...
by Yann Leboulanger 20 May '11

20 May '11

changeset 83e7b7f1c792 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=83e7b7f1c792 description: Fix the function that checks if we should log message. Fixes #6873 diffstat: src/common/stanza_session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 37b3176f7157 -r 83e7b7f1c792 src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Apr 26 14:29:07 2011 +0200 +++ b/src/common/stanza_session.py Sun May 01 18:31:44 2011 +0200 @@ -78,7 +78,8 @@ self.negotiated = {} def is_loggable(self): - return self.loggable and gajim.config.should_log(self.conn.name, self.jid) + return self.loggable and gajim.config.should_log(self.conn.name, + self.jid.getStripped()) def get_to(self): to = str(self.jid)

1 0

gajim: [adminX] don't send wrong mode value when sending bytestr...
by Yann Leboulanger 20 May '11

20 May '11

changeset 37b3176f7157 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37b3176f7157 description: [adminX] don't send wrong mode value when sending bytestreams. Fixes #6868 diffstat: src/common/protocol/bytestream.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 29d2fc8db4c4 -r 37b3176f7157 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Apr 12 16:30:26 2011 +0200 +++ b/src/common/protocol/bytestream.py Tue Apr 26 14:29:07 2011 +0200 @@ -348,7 +348,6 @@ file_props['request-id'] = 'id_' + file_props['sid'] iq.setID(file_props['request-id']) query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) - query.setAttr('mode', 'plain') query.setAttr('sid', file_props['sid']) self._add_addiditional_streamhosts_to_query(query, file_props)

1 0

gajim: fix for showing URL in chat banner. Fixes #6856
by Yann Leboulanger 20 May '11

20 May '11

changeset 29d2fc8db4c4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=29d2fc8db4c4 description: fix for showing URL in chat banner. Fixes #6856 diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 89ee48c11c9a -r 29d2fc8db4c4 src/chat_control.py --- a/src/chat_control.py Wed Apr 06 21:56:42 2011 +0200 +++ b/src/chat_control.py Tue Apr 12 16:30:26 2011 +0200 @@ -1912,7 +1912,7 @@ if status_escaped: status_text = self.urlfinder.sub(self.make_href, status_escaped) - status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped) + status_text = '<span %s>%s</span>' % (font_attrs_small, status_text) self.banner_status_label.set_tooltip_text(status) self.banner_status_label.set_no_show_all(False) self.banner_status_label.show()

1 0

gajim: [herfik] keep aspect ratio when resizing video window. Fi...
by Yann Leboulanger 20 May '11

20 May '11

changeset 89ee48c11c9a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89ee48c11c9a description: [herfik] keep aspect ratio when resizing video window. Fixes #6852 diffstat: src/common/jingle_rtp.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (18 lines): diff -r ab1aeece859f -r 89ee48c11c9a src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Mar 29 18:26:54 2011 +0400 +++ b/src/common/jingle_rtp.py Wed Apr 06 21:56:42 2011 +0200 @@ -390,10 +390,12 @@ #src_bin.link(caps) self.sink = self.make_bin_from_config('video_output_device', - 'videoscale ! ffmpegcolorspace ! %s', _("video output")) + 'videoscale ! ffmpegcolorspace ! %s force-aspect-ratio=True', + _("video output")) self.pipeline.add(self.sink) - self.src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad')) + self.src_bin.get_pad('src').link(self.p2psession.get_property( + 'sink-pad')) self.p2pstream.connect('src-pad-added', self._on_src_pad_added) # The following is needed for farsight to process ICE requests:

1 0

gajim: Correctly printing error message. Fixes #6850
by Denis Fomin 20 May '11

20 May '11

changeset ab1aeece859f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab1aeece859f description: Correctly printing error message. Fixes #6850 diffstat: src/gajim-remote.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 52c9f9a1b4ad -r ab1aeece859f src/gajim-remote.py --- a/src/gajim-remote.py Tue Mar 29 17:18:50 2011 +0400 +++ b/src/gajim-remote.py Tue Mar 29 18:26:54 2011 +0400 @@ -52,7 +52,7 @@ # test if dbus-x11 is installed bus = dbus.SessionBus() except Exception: - print str(exceptions.DbusNotSupported()) + print _('D-Bus is not present on this machine or python module is missing') sys.exit(1) OBJ_PATH = '/org/gajim/dbus/RemoteObject'

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011