Commits

commits@gajim.org

17632 discussions

gajim: set the focus when the first tab is opened
by Fomin Denis 24 Aug '12

24 Aug '12

changeset df0845a7b449 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=df0845a7b449 description: set the focus when the first tab is opened diffstat: data/gui/message_window.ui | 1 - src/message_window.py | 3 +-- 2 files changed, 1 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 0e4f8195b061 -r df0845a7b449 data/gui/message_window.ui --- a/data/gui/message_window.ui Fri Aug 24 17:26:00 2012 +0400 +++ b/data/gui/message_window.ui Fri Aug 24 18:21:38 2012 +0400 @@ -12,7 +12,6 @@ <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="scrollable">True</property> <property name="tab_border">0</property> </object> diff -r 0e4f8195b061 -r df0845a7b449 src/message_window.py --- a/src/message_window.py Fri Aug 24 17:26:00 2012 +0400 +++ b/src/message_window.py Fri Aug 24 18:21:38 2012 +0400 @@ -144,8 +144,6 @@ self.notebook.set_show_border(gajim.config.get('tabs_border')) self.show_icon() - gobject.idle_add(self.notebook.grab_focus) - def change_account_name(self, old_name, new_name): if old_name in self._controls: self._controls[new_name] = self._controls[old_name] @@ -307,6 +305,7 @@ # NOTE: we do not call set_control_active(True) since we don't know # whether the tab is the active one. self.show_title() + gobject.timeout_add(500, control.msg_textview.grab_focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click

1 0

gajim: Add Keyboard Shortcuts menuitem to Help menu
by Fomin Denis 24 Aug '12

24 Aug '12

changeset 0e4f8195b061 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e4f8195b061 description: Add Keyboard Shortcuts menuitem to Help menu diffstat: data/gui/roster_window.ui | 17 ++++++++++++++++- src/roster_window.py | 4 ++++ 2 files changed, 20 insertions(+), 1 deletions(-) diffs (55 lines): diff -r 7719b4c17326 -r 0e4f8195b061 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Fri Aug 24 13:33:27 2012 +0200 +++ b/data/gui/roster_window.ui Fri Aug 24 17:26:00 2012 +0400 @@ -12,9 +12,9 @@ <accel-groups> <group name="accelgroup1"/> </accel-groups> - <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/> <signal name="key_press_event" handler="on_roster_window_key_press_event"/> <signal name="delete_event" handler="on_roster_window_delete_event"/> + <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/> <signal name="focus_out_event" handler="on_roster_window_focus_out_event"/> <signal name="popup_menu" handler="on_roster_window_popup_menu"/> <child> @@ -283,6 +283,16 @@ </object> </child> <child> + <object class="GtkImageMenuItem" id="keyboard_shortcuts_menuitem"> + <property name="label" translatable="yes">Keyboard Shortcuts</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="image">image14</property> + <property name="use_stock">False</property> + <signal name="activate" handler="on_keyboard_shortcuts_menuitem_activate"/> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="menuitem1"> <property name="visible">True</property> </object> @@ -467,4 +477,9 @@ <property name="stock">gtk-disconnect</property> <property name="icon-size">1</property> </object> + <object class="GtkImage" id="image14"> + <property name="visible">True</property> + <property name="stock">gtk-info</property> + <property name="icon-size">1</property> + </object> </interface> diff -r 7719b4c17326 -r 0e4f8195b061 src/roster_window.py --- a/src/roster_window.py Fri Aug 24 13:33:27 2012 +0200 +++ b/src/roster_window.py Fri Aug 24 17:26:00 2012 +0400 @@ -3978,6 +3978,10 @@ helpers.launch_browser_mailer('url', 'http://trac.gajim.org/wiki/GajimFaq') + def on_keyboard_shortcuts_menuitem_activate(self, widget): + helpers.launch_browser_mailer('url', + 'http://trac.gajim.org/wiki/KeyboardShortcuts') + def on_features_menuitem_activate(self, widget): features_window.FeaturesWindow()

1 0

gajim: add ctrl+s shortcut to change status message.
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset 7719b4c17326 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7719b4c17326 description: add ctrl+s shortcut to change status message. diffstat: src/roster_window.py | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diffs (56 lines): diff -r e9d7e4a394ea -r 7719b4c17326 src/roster_window.py --- a/src/roster_window.py Fri Aug 24 12:54:27 2012 +0200 +++ b/src/roster_window.py Fri Aug 24 13:33:27 2012 +0200 @@ -3540,6 +3540,27 @@ self.on_row_activated(widget, path) self.clicked_path = None + def accel_group_func(self, accel_group, acceleratable, keyval, modifier): + # CTRL mask + if modifier & gtk.gdk.CONTROL_MASK: + if keyval == gtk.keysyms.s: # CTRL + s + model = self.status_combobox.get_model() + accounts = gajim.connections.keys() + status = model[self.previous_status_combobox_active][2].decode( + 'utf-8') + def on_response(message, pep_dict): + if message is not None: # None if user pressed Cancel + for account in accounts: + if not gajim.config.get_per('accounts', account, + 'sync_with_global_status'): + continue + current_show = gajim.SHOW_LIST[ + gajim.connections[account].connected] + self.send_status(account, current_show, message) + self.send_pep(account, pep_dict) + dialogs.ChangeStatusMessageDialog(on_response, status) + return + def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed self.tooltip.hide_tooltip() @@ -6359,8 +6380,8 @@ # activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_pixbuf, # padlock_pixbuf] self.columns = [gtk.Image, str, str, str, str, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf] + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf] self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') self.hpaned = self.xml.get_object('roster_hpaned') @@ -6630,6 +6651,13 @@ new_chat_menuitem.add_accelerator('activate', accel_group, gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + # Setting CTRL+S to be the shortcut to change status message + accel_group = gtk.AccelGroup() + keyval, mod = gtk.accelerator_parse('<Control>s') + accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) + self.window.add_accel_group(accel_group) + # Setting the search stuff self.rfilter_entry = self.xml.get_object('rfilter_entry') self.rfilter_string = ''

1 0

gajim: improve decline implementation
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset e9d7e4a394ea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9d7e4a394ea description: improve decline implementation diffstat: src/common/connection_handlers.py | 8 ++++---- src/gui_interface.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diffs (37 lines): diff -r cb290fb85f36 -r e9d7e4a394ea src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 24 10:37:24 2012 +0200 +++ b/src/common/connection_handlers.py Fri Aug 24 12:54:27 2012 +0200 @@ -1035,10 +1035,6 @@ self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp) return True - elif obj.mtype == 'groupchat': - gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, - conn=self, msg_obj=obj)) - return True elif obj.invite_tag is not None: gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, conn=self, msg_obj=obj)) @@ -1047,6 +1043,10 @@ gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None, conn=self, msg_obj=obj)) return True + elif obj.mtype == 'groupchat': + gajim.nec.push_incoming_event(GcMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + return True # process and dispatch an error message def dispatch_error_message(self, msg, msgtxt, session, frm, tim): diff -r cb290fb85f36 -r e9d7e4a394ea src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 10:37:24 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 12:54:27 2012 +0200 @@ -621,7 +621,7 @@ if gc_control: gc_control.print_conversation( _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': obj.room_jid, 'reason': obj.reason}, graphics=False) + 'jid': obj.jid_from, 'reason': obj.reason}, graphics=False) def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))

1 0

gajim: finish renaming type properties to type_. Fixes #7222
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset cb290fb85f36 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb290fb85f36 description: finish renaming type properties to type_. Fixes #7222 diffstat: src/common/dataforms.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 797ac319baa9 -r cb290fb85f36 src/common/dataforms.py --- a/src/common/dataforms.py Fri Aug 24 10:27:51 2012 +0200 +++ b/src/common/dataforms.py Fri Aug 24 10:37:24 2012 +0200 @@ -132,7 +132,7 @@ self.options = options @nested_property - def type(): + def type_(): """ Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', 'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi', @@ -598,7 +598,7 @@ self.instructions=instructions @nested_property - def type(): + def type_(): """ Type of the form. Must be one of: 'form', 'submit', 'cancel', 'result'. 'form' - this form is to be filled in; you will be able soon to do:

1 0

gajim: store full from jid in gc-invite event.
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset 797ac319baa9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=797ac319baa9 description: store full from jid in gc-invite event. fix receiving decline tag diffstat: src/common/connection_handlers_events.py | 3 ++- src/gui_interface.py | 2 +- src/roster_window.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diffs (46 lines): diff -r 59be13833475 -r 797ac319baa9 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Aug 24 10:13:55 2012 +0200 +++ b/src/common/connection_handlers_events.py Fri Aug 24 10:27:51 2012 +0200 @@ -1207,7 +1207,7 @@ def generate(self): self.room_jid = self.msg_obj.fjid - item = self.msg_obj.invite_tag.getTag('decline') + item = self.msg_obj.decline_tag.getTag('decline') try: self.jid_from = helpers.parse_jid(item.getAttr('from')) except helpers.InvalidFormat: @@ -1234,6 +1234,7 @@ self.resource = self.msg_obj.resource self.mtype = self.msg_obj.mtype self.invite_tag = self.msg_obj.invite_tag + self.decline_tag = self.msg_obj.decline_tag self.thread_id = self.msg_obj.thread_id self.msgtxt = self.msg_obj.msgtxt self.gc_control = self.msg_obj.gc_control diff -r 59be13833475 -r 797ac319baa9 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 10:13:55 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 10:27:51 2012 +0200 @@ -633,7 +633,7 @@ return self.add_event(account, obj.jid_from, 'gc-invitation', (obj.room_jid, - obj.reason, obj.password, obj.is_continued)) + obj.reason, obj.password, obj.is_continued, obj.jid_from)) if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-gc_invitation', 48) diff -r 59be13833475 -r 797ac319baa9 src/roster_window.py --- a/src/roster_window.py Fri Aug 24 10:13:55 2012 +0200 +++ b/src/roster_window.py Fri Aug 24 10:27:51 2012 +0200 @@ -1985,8 +1985,8 @@ gajim.events.remove_events(account, jid, event) return True elif event.type_ == 'gc-invitation': - dialogs.InvitationReceivedDialog(account, data[0], jid, data[2], - data[1]) + dialogs.InvitationReceivedDialog(account, data[0], data[4], data[2], + data[1], is_continued=data[3]) gajim.events.remove_events(account, jid, event) return True elif event.type_ == 'subscription_request':

1 0

gajim: missing commit
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset 59be13833475 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59be13833475 description: missing commit diffstat: src/common/connection_handlers.py | 4 ++++ src/gui_interface.py | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r a80a9012088f -r 59be13833475 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 24 09:50:50 2012 +0200 +++ b/src/common/connection_handlers.py Fri Aug 24 10:13:55 2012 +0200 @@ -1043,6 +1043,10 @@ gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, conn=self, msg_obj=obj)) return True + elif obj.decline_tag is not None: + gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None, + conn=self, msg_obj=obj)) + return True # process and dispatch an error message def dispatch_error_message(self, msg, msgtxt, session, frm, tim): diff -r a80a9012088f -r 59be13833475 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 09:50:50 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 10:13:55 2012 +0200 @@ -625,7 +625,6 @@ def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued)) - jid = gajim.get_jid_without_resource(obj.jid_from) account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: dialogs.InvitationReceivedDialog(account, obj.room_jid,

1 0

gajim: fix var name
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset a80a9012088f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a80a9012088f description: fix var name diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 59e1207ca9eb -r a80a9012088f src/dialogs.py --- a/src/dialogs.py Fri Aug 24 09:37:40 2012 +0200 +++ b/src/dialogs.py Fri Aug 24 09:50:50 2012 +0200 @@ -4482,7 +4482,7 @@ sectext = _('$Contact has invited you to group chat %(room_jid)s')\ % {'room_jid': room_jid} contact = gajim.contacts.get_first_contact_from_jid(account, jid) - contact_text = contact and contact.name or contact_jid + contact_text = contact and contact.name or jid sectext = sectext.replace('$Contact', contact_text) if comment: # only if not None and not ''

1 0

gajim: send decline to the same jid (bare or full) from which we...
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset 59e1207ca9eb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59e1207ca9eb description: send decline to the same jid (bare or full) from which we received he invite diffstat: src/dialogs.py | 14 ++++++++------ src/gui_interface.py | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diffs (71 lines): diff -r a3784e043e77 -r 59e1207ca9eb src/dialogs.py --- a/src/dialogs.py Fri Aug 24 09:27:31 2012 +0200 +++ b/src/dialogs.py Fri Aug 24 09:37:40 2012 +0200 @@ -4463,14 +4463,16 @@ PrivacyListWindow(self.account, name, 'EDIT') class InvitationReceivedDialog: - def __init__(self, account, room_jid, contact_jid, password=None, - comment=None, is_continued=False): + def __init__(self, account, room_jid, contact_fjid, password=None, + comment=None, is_continued=False): self.room_jid = room_jid self.account = account self.password = password self.is_continued = is_continued - self.contact_jid = contact_jid + self.contact_fjid = contact_fjid + + jid = gajim.get_jid_without_resource(contact_fjid) pritext = _('''You are invited to a groupchat''') #Don't translate $Contact @@ -4478,8 +4480,8 @@ sectext = _('$Contact has invited you to join a discussion') else: sectext = _('$Contact has invited you to group chat %(room_jid)s')\ - % {'room_jid': room_jid} - contact = gajim.contacts.get_first_contact_from_jid(account, contact_jid) + % {'room_jid': room_jid} + contact = gajim.contacts.get_first_contact_from_jid(account, jid) contact_text = contact and contact.name or contact_jid sectext = sectext.replace('$Contact', contact_text) @@ -4501,7 +4503,7 @@ def on_no(text): gajim.connections[account].decline_invitation(self.room_jid, - self.contact_jid, text) + self.contact_fjid, text) YesNoDialog(pritext, sectext, text_label=_('Reason:'), on_response_yes=on_yes, on_response_no=on_no) diff -r a3784e043e77 -r 59e1207ca9eb src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 09:27:31 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 09:37:40 2012 +0200 @@ -628,18 +628,19 @@ jid = gajim.get_jid_without_resource(obj.jid_from) account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: - dialogs.InvitationReceivedDialog(account, obj.room_jid, jid, - obj.password, obj.reason, is_continued=obj.is_continued) + dialogs.InvitationReceivedDialog(account, obj.room_jid, + obj.jid_from, obj.password, obj.reason, + is_continued=obj.is_continued) return - self.add_event(account, jid, 'gc-invitation', (obj.room_jid, + self.add_event(account, obj.jid_from, 'gc-invitation', (obj.room_jid, obj.reason, obj.password, obj.is_continued)) if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-gc_invitation', 48) event_type = _('Groupchat Invitation') - notify.popup(event_type, jid, account, 'gc-invitation', path, - event_type, obj.room_jid) + notify.popup(event_type, obj.jid_from, account, 'gc-invitation', + path, event_type, obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase:

1 0

gajim: print decline reason in groupchat
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset a3784e043e77 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a3784e043e77 description: print decline reason in groupchat diffstat: src/gui_interface.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r cd07cd473ab3 -r a3784e043e77 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 09:14:08 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 09:27:31 2012 +0200 @@ -620,8 +620,8 @@ gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, account) if gc_control: gc_control.print_conversation( - _('%(jid)s declined the invitation') % {'jid': obj.room_jid}, - graphics=False) + _('%(jid)s declined the invitation: %(reason)s') % { + 'jid': obj.room_jid, 'reason': obj.reason}, graphics=False) def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))

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