Commits

commits@gajim.org

17632 discussions

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

07 May '06

Author: asterix Date: 2006-05-07 14:23:28 +0200 (Sun, 07 May 2006) New Revision: 6287 Modified: trunk/src/groupchat_control.py Log: shift + click on a GC occupant print his nick in textview. For #1933 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-06 20:55:52 UTC (rev 6286) +++ trunk/src/groupchat_control.py 2006-05-07 12:23:28 UTC (rev 6287) @@ -140,35 +140,35 @@ widget = self.xml.get_widget('muc_window_actions_button') id = widget.connect('clicked', self.on_actions_button_clicked) self.handlers[id] = widget - + widget = self.xml.get_widget('list_treeview') id = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id] = widget - + id = widget.connect('row_collapsed', self.on_list_treeview_row_collapsed) self.handlers[id] = widget - + id = widget.connect('row_activated', self.on_list_treeview_row_activated) self.handlers[id] = widget - + id = widget.connect('button_press_event', self.on_list_treeview_button_press_event) self.handlers[id] = widget - + id = widget.connect('key_press_event', self.on_list_treeview_key_press_event) self.handlers[id] = widget - + id = widget.connect('motion_notify_event', self.on_list_treeview_motion_notify_event) self.handlers[id] = widget - + id = widget.connect('leave_notify_event', self.on_list_treeview_leave_notify_event) self.handlers[id] = widget - + self.room_jid = self.contact.jid self.nick = contact.name self.name = self.room_jid.split('@')[0] @@ -223,11 +223,11 @@ widget = xm.get_widget('compact_view_menuitem') id = widget.connect('activate', self._on_compact_view_menuitem_activate) self.handlers[id] = widget - + widget = xm.get_widget('history_menuitem') id = widget.connect('activate', self._on_history_menuitem_activate) self.handlers[id] = widget - + self.gc_popup_menu = xm.get_widget('gc_control_popup_menu') self.name_label = self.xml.get_widget('banner_name_label') @@ -1584,6 +1584,22 @@ widget.collapse_row(path) 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.msg_textview.grab_focus() + return True def on_list_treeview_motion_notify_event(self, widget, event): model = widget.get_model()

1 0

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

06 May '06

Author: asterix Date: 2006-05-06 22:55:52 +0200 (Sat, 06 May 2006) New Revision: 6286 Modified: trunk/src/groupchat_control.py Log: a[space][tab] doesn't cycle anymore Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-06 20:32:07 UTC (rev 6285) +++ trunk/src/groupchat_control.py 2006-05-06 20:55:52 UTC (rev 6286) @@ -1303,6 +1303,9 @@ 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).decode('utf-8') + if text.endswith(' '): + if not self.last_key_tabs: + return False splitted_text = text.split() # command completion

1 0

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

06 May '06

Author: asterix Date: 2006-05-06 22:32:07 +0200 (Sat, 06 May 2006) New Revision: 6285 Modified: trunk/src/groupchat_control.py Log: add , char at the end of nick at first TAB keypress. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-06 20:01:25 UTC (rev 6284) +++ trunk/src/groupchat_control.py 2006-05-06 20:32:07 UTC (rev 6285) @@ -1349,7 +1349,7 @@ # the word is the begining of a nick self.nick_hits.append(nick) if len(self.nick_hits): - if len(splitted_text) == 1: # This is the 1st word of the line + if len(splitted_text) < 2: # This is the 1st word of the line or no word add = self.gc_refer_to_nick_char + ' ' else: add = ' '

1 0

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

06 May '06

Author: asterix Date: 2006-05-06 22:01:25 +0200 (Sat, 06 May 2006) New Revision: 6284 Modified: trunk/src/groupchat_control.py Log: show "NICK has joined the room" and print reason when someone leaves it. Fixes #1933 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-06 19:43:43 UTC (rev 6283) +++ trunk/src/groupchat_control.py 2006-05-06 20:01:25 UTC (rev 6284) @@ -747,6 +747,7 @@ if not affiliation: affiliation = 'none' + newly_created = False if show in ('offline', 'error'): if statusCode == '307': if actor is None: # do not print 'kicked by None' @@ -790,8 +791,9 @@ else: iter = self.get_contact_iter(nick) if not iter: - iter = self.add_contact_to_roster(nick, show, role, - affiliation, status, jid) + iter = self.add_contact_to_roster(nick, show, role, affiliation, + status, jid) + newly_created = True if statusCode == '201': # We just created the room gajim.connections[self.account].request_gc_config(self.room_jid) else: @@ -815,8 +817,13 @@ nick != self.nick and statusCode != '303': if show == 'offline': st = _('%s has left') % nick + if reason: + st += ' [%s]' % reason else: - st = _('%s is now %s') % (nick, helpers.get_uf_show(show)) + if newly_created: + st = _('%s has joined the room') % nick + else: + st = _('%s is now %s') % (nick, helpers.get_uf_show(show)) if status: st += ' (' + status + ')' self.print_conversation(st)

1 0

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

06 May '06

Author: asterix Date: 2006-05-06 21:43:43 +0200 (Sat, 06 May 2006) New Revision: 6283 Modified: trunk/src/groupchat_control.py Log: Tab in empty message textview cycles all nicknames in the room. Fixes #1933 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-05-06 16:28:04 UTC (rev 6282) +++ trunk/src/groupchat_control.py 2006-05-06 19:43:43 UTC (rev 6283) @@ -1296,10 +1296,6 @@ 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).decode('utf-8') - if not text or text.endswith(' '): - # if we are nick cycling, last char will always be space - if not self.last_key_tabs: - return False splitted_text = text.split() # command completion @@ -1328,42 +1324,44 @@ # check if tab is pressed with empty message if len(splitted_text): # if there are any words begin = splitted_text[-1] # last word we typed + else: + begin = '' - if len(self.nick_hits) and \ - self.nick_hits[0].startswith(begin.replace( - self.gc_refer_to_nick_char, '')) and \ - self.last_key_tabs: # we should cycle - self.nick_hits.append(self.nick_hits[0]) - self.nick_hits.pop(0) + if len(self.nick_hits) and \ + self.nick_hits[0].startswith(begin.replace( + self.gc_refer_to_nick_char, '')) and \ + self.last_key_tabs: # we should cycle + self.nick_hits.append(self.nick_hits[0]) + self.nick_hits.pop(0) + else: + self.nick_hits = [] # clear the hit list + list_nick = gajim.contacts.get_nick_list(self.account, + self.room_jid) + for nick in list_nick: + if nick.lower().startswith(begin.lower()): + # the word is the begining of a nick + self.nick_hits.append(nick) + if len(self.nick_hits): + if len(splitted_text) == 1: # This is the 1st word of the line + add = self.gc_refer_to_nick_char + ' ' else: - self.nick_hits = [] # clear the hit list - list_nick = gajim.contacts.get_nick_list(self.account, - self.room_jid) - for nick in list_nick: - if nick.lower().startswith(begin.lower()): - # the word is the begining of a nick - self.nick_hits.append(nick) - if len(self.nick_hits): - if len(splitted_text) == 1: # This is the 1st word of the line - add = self.gc_refer_to_nick_char + ' ' - else: - add = ' ' - start_iter = end_iter.copy() - if self.last_key_tabs and begin.endswith(', '): - # have to accomodate for the added space from last - # completion - start_iter.backward_chars(len(begin) + 2) - elif self.last_key_tabs: - # have to accomodate for the added space from last - # completion - start_iter.backward_chars(len(begin) + 1) - else: - start_iter.backward_chars(len(begin)) + add = ' ' + start_iter = end_iter.copy() + if self.last_key_tabs and begin.endswith(', '): + # have to accomodate for the added space from last + # completion + start_iter.backward_chars(len(begin) + 2) + elif self.last_key_tabs: + # have to accomodate for the added space from last + # completion + start_iter.backward_chars(len(begin) + 1) + else: + start_iter.backward_chars(len(begin)) - message_buffer.delete(start_iter, end_iter) - message_buffer.insert_at_cursor(self.nick_hits[0] + add) - self.last_key_tabs = True - return True + message_buffer.delete(start_iter, end_iter) + message_buffer.insert_at_cursor(self.nick_hits[0] + add) + self.last_key_tabs = True + return True self.last_key_tabs = False def on_list_treeview_key_press_event(self, widget, event):

1 0

[commit-gajim] r6282 - trunk/debian
by asterix＠gajim.org 06 May '06

06 May '06

Author: asterix Date: 2006-05-06 18:28:04 +0200 (Sat, 06 May 2006) New Revision: 6282 Modified: trunk/debian/rules Log: build debian package with python2.4 Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2006-05-06 16:27:45 UTC (rev 6281) +++ trunk/debian/rules 2006-05-06 16:28:04 UTC (rev 6282) @@ -3,11 +3,12 @@ include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -PYTHONVER = `python -c 'import sys; print sys.version[:3]'` +PYTHON = python2.4 +PYTHONVER = 2.4 CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -DEB_MAKE_BUILD_TARGET := all +DEB_MAKE_BUILD_TARGET := all PYTHON=python2.4 DEB_MAKE_INSTALL_TARGET = install PYTHON=python2.4 PREFIX=/usr DESTDIR=$(DEB_DESTDIR) binary-install/gajim::

1 0

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

06 May '06

Author: asterix Date: 2006-05-06 18:27:45 +0200 (Sat, 06 May 2006) New Revision: 6281 Modified: trunk/src/Makefile trunk/src/common/Makefile Log: build idle with corre3ct python version Modified: trunk/src/Makefile =================================================================== --- trunk/src/Makefile 2006-05-05 06:29:31 UTC (rev 6280) +++ trunk/src/Makefile 2006-05-06 16:27:45 UTC (rev 6281) @@ -1,5 +1,5 @@ # Set the C flags to include the GTK+ and Python libraries -PYTHON = python +PYTHON ?= python PYTHONVER = `$(PYTHON) -c 'import sys; print sys.version[:3]'` CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER) Modified: trunk/src/common/Makefile =================================================================== --- trunk/src/common/Makefile 2006-05-05 06:29:31 UTC (rev 6280) +++ trunk/src/common/Makefile 2006-05-06 16:27:45 UTC (rev 6281) @@ -1,5 +1,6 @@ # Set the C flags to include the GTK+ and Python libraries -PYTHONVER = `python -c 'import sys; print sys.version[:3]'` +PYTHON ?= python +PYTHONVER = `$(PYTHON) -c 'import sys; print sys.version[:3]'` HAVE_XSCRNSAVER = $(shell pkg-config --exists xscrnsaver && echo 'YES')

1 0

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

05 May '06

Author: asterix Date: 2006-05-05 08:29:31 +0200 (Fri, 05 May 2006) New Revision: 6280 Modified: trunk/src/Makefile Log: use correct python version to build debian package Modified: trunk/src/Makefile =================================================================== --- trunk/src/Makefile 2006-05-04 19:05:41 UTC (rev 6279) +++ trunk/src/Makefile 2006-05-05 06:29:31 UTC (rev 6280) @@ -1,5 +1,6 @@ # Set the C flags to include the GTK+ and Python libraries -PYTHONVER = `python -c 'import sys; print sys.version[:3]'` +PYTHON = python +PYTHONVER = `$(PYTHON) -c 'import sys; print sys.version[:3]'` CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fPIC -I/usr/include/python$(PYTHONVER) -I. LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` -lpython$(PYTHONVER)

1 0

[commit-gajim] r6279 - trunk/src
by jim++＠gajim.org 04 May '06

04 May '06

Author: jim++ Date: 2006-05-04 21:05:41 +0200 (Thu, 04 May 2006) New Revision: 6279 Modified: trunk/src/roster_window.py Log: Even if we are using notifications, we still want to see awaiting chats when clicking systray -> show events or left click Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-05-04 18:37:34 UTC (rev 6278) +++ trunk/src/roster_window.py 2006-05-04 19:05:41 UTC (rev 6279) @@ -2225,8 +2225,6 @@ self.draw_contact(jid, account) # Redraw parent too self.draw_parent_contact(jid, account) - if gajim.interface.systray_enabled: - gajim.interface.systray.add_jid(fjid, account, kind) self.show_title() # we show the * or [n] if not path: self.add_contact_to_roster(jid, account) @@ -2236,6 +2234,8 @@ self.tree.expand_row(path[0:2], False) self.tree.scroll_to_cell(path) self.tree.set_cursor(path) + if gajim.interface.systray_enabled: + gajim.interface.systray.add_jid(fjid, account, kind) def on_preferences_menuitem_activate(self, widget): if gajim.interface.instances.has_key('preferences'):

1 0

[commit-gajim] r6278 - trunk/data/glade
by dkirov＠gajim.org 04 May '06

04 May '06

Author: dkirov Date: 2006-05-04 20:37:34 +0200 (Thu, 04 May 2006) New Revision: 6278 Modified: trunk/data/glade/roster_contact_context_menu.glade Log: added some underlines to contact context menu Modified: trunk/data/glade/roster_contact_context_menu.glade =================================================================== --- trunk/data/glade/roster_contact_context_menu.glade 2006-05-04 18:16:26 UTC (rev 6277) +++ trunk/data/glade/roster_contact_context_menu.glade 2006-05-04 18:37:34 UTC (rev 6278) @@ -79,7 +79,7 @@ <child> <widget class="GtkImageMenuItem" id="send_file_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">Send File</property> + <property name="label" translatable="yes">Send _File</property> <property name="use_underline">True</property> <child internal-child="image"> @@ -165,7 +165,7 @@ <child> <widget class="GtkImageMenuItem" id="resend_authorization_to_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">Allow him/her to see my status</property> + <property name="label" translatable="yes">_Allow him/her to see my status</property> <property name="use_underline">True</property> <child internal-child="image"> @@ -185,7 +185,7 @@ <child> <widget class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">Ask to see his/her status</property> + <property name="label" translatable="yes">A_sk to see his/her status</property> <property name="use_underline">True</property> <child internal-child="image"> @@ -205,7 +205,7 @@ <child> <widget class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1"> <property name="visible">True</property> - <property name="label" translatable="yes">Forbid him/her to see my status</property> + <property name="label" translatable="yes">_Forbid him/her to see my status</property> <property name="use_underline">True</property> <child internal-child="image">

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