Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8555 - in trunk/src: . common
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-23 00:46:31 +0200 (Thu, 23 Aug 2007) New Revision: 8555 Modified: trunk/src/common/helpers.py trunk/src/notify.py trunk/src/roster_window.py trunk/src/tooltips.py Log: ability to load transport iconsets from ~/.gajim/iconsets/transports. Fixes #3390 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-08-22 22:30:59 UTC (rev 8554) +++ trunk/src/common/helpers.py 2007-08-22 22:46:31 UTC (rev 8555) @@ -1050,3 +1050,11 @@ return os.path.join(gajim.DATA_DIR, 'iconsets', iconset) elif os.path.isdir(os.path.join(gajim.MY_ICONSETS_PATH, iconset)): return os.path.join(gajim.MY_ICONSETS_PATH, iconset) + +def get_transport_path(transport): + if os.path.isdir(os.path.join(gajim.DATA_DIR, 'iconsets', 'transports', + transport)): + return os.path.join(gajim.DATA_DIR, 'iconsets', 'transports', transport) + elif os.path.isdir(os.path.join(gajim.MY_ICONSETS_PATH, 'transports', + transport)): + return os.path.join(gajim.MY_ICONSETS_PATH, 'transports', transport) Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2007-08-22 22:30:59 UTC (rev 8554) +++ trunk/src/notify.py 2007-08-22 22:46:31 UTC (rev 8555) @@ -191,12 +191,12 @@ transport_name = gajim.get_transport_name_from_jid(jid) img = None if transport_name: - img = os.path.join(gajim.DATA_DIR, 'iconsets', - 'transports', transport_name, '48x48', show_image) + img = os.path.join(helpers.get_transport_path(transport_name), + '48x48', show_image) if not img or not os.path.isfile(img): iconset = gajim.config.get('iconset') - img = os.path.join(gajim.DATA_DIR, 'iconsets', - iconset, '48x48', show_image) + img = os.path.join(helpers.get_iconset_path(iconset), '48x48', + show_image) path = gtkgui_helpers.get_path_to_generic_or_avatar(img, jid = jid, suffix = suffix) if event == 'status_change': @@ -206,7 +206,7 @@ {'nick': gajim.get_name_from_jid(account, jid),\ 'status': helpers.get_uf_show(gajim.SHOW_LIST[new_show])} if status_message: - text = text + " : " + status_message + text = text + " : " + status_message popup(_('Contact Changed Status'), jid, account, path_to_image = path, title = title, text = text) elif event == 'contact_connected': Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-22 22:30:59 UTC (rev 8554) +++ trunk/src/roster_window.py 2007-08-22 22:46:31 UTC (rev 8555) @@ -756,9 +756,9 @@ '''joins the room immediatelly''' if gajim.interface.msg_win_mgr.has_window(room_jid, account) and \ gajim.gc_connected[account][room_jid]: - win = gajim.interface.msg_win_mgr.get_window(room_jid, account) + win = gajim.interface.msg_win_mgr.get_window(room_jid, account) win.window.present() - win.set_active_tab(room_jid, account) + win.set_active_tab(room_jid, account) dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid) return minimized_control_exists = False @@ -1345,7 +1345,7 @@ ctrl.print_conversation(_('%s is now %s') % (name, uf_show), 'status') - # unset custom status + # unset custom status if gajim.interface.status_sent_to_users.has_key(account) and \ contact.jid in gajim.interface.status_sent_to_users[account]: del gajim.interface.status_sent_to_users[account][contact.jid] @@ -1564,7 +1564,7 @@ accounts.append(account) self.send_status(account, 'offline', msg, to = jid) new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', - 'value' : jid, 'child': [u'message', u'iq', u'presence-out']} + 'value' : jid, 'child': [u'message', u'iq', u'presence-out']} gajim.connections[account].blocked_list.append(new_rule) # needed for draw_contact: gajim.connections[account].blocked_contacts.append(jid) @@ -1578,8 +1578,8 @@ accounts.append(account) self.send_status(account, 'offline', msg, to=contact.jid) new_rule = {'order': u'1', 'type': u'jid', - 'action': u'deny', 'value' : contact.jid, - 'child': [u'message', u'iq', u'presence-out']} + 'action': u'deny', 'value' : contact.jid, + 'child': [u'message', u'iq', u'presence-out']} gajim.connections[account].blocked_list.append(new_rule) # needed for draw_contact: gajim.connections[account].blocked_contacts.append(contact.jid) @@ -1597,7 +1597,7 @@ self.send_status(account, 'offline', msg, to=contact.jid) self.draw_contact(contact.jid, account) new_rule = {'order': u'1', 'type': u'group', 'action': u'deny', - 'value' : group, 'child': [u'message', u'iq', u'presence-out']} + 'value' : group, 'child': [u'message', u'iq', u'presence-out']} gajim.connections[account].blocked_list.append(new_rule) for account in accounts: gajim.connections[account].set_privacy_list( @@ -3197,7 +3197,7 @@ self.make_transport_menu(event, iters[0]) elif type_ in ('contact', 'self_contact') and len(iters) == 1: self.make_contact_menu(event, iters[0]) - elif type_ == 'contact': + elif type_ == 'contact': self.make_multiple_contact_menu(event, iters) elif type_ == 'account' and len(iters) == 1: self.make_account_menu(event, iters[0]) @@ -4307,7 +4307,7 @@ self.tree.expand_row(pathG, False) self.draw_account(account) elif type_ == 'contact': - jid = model[iter][C_JID].decode('utf-8') + jid = model[iter][C_JID].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8') self.draw_contact(jid, account) @@ -4334,7 +4334,7 @@ self.collapsed_rows.append(account) self.draw_account(account) elif type_ == 'contact': - jid = model[iter][C_JID].decode('utf-8') + jid = model[iter][C_JID].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8') self.draw_contact(jid, account) @@ -4439,10 +4439,13 @@ # standard transport iconsets are loaded one time in init() t_path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports') folders = os.listdir(t_path) + t_path = os.path.join(gajim.MY_ICONSETS_PATH, 'transports') + folders += os.listdir(t_path) for transport in folders: if transport == '.svn': continue - folder = os.path.join(t_path, transport, '16x16') + folder = os.path.join(helpers.get_transport_path(transport), + '16x16') self.transports_state_images['opened'][transport] = \ self.load_iconset(folder, pixo, transport = True) self.transports_state_images['closed'][transport] = \ @@ -4913,7 +4916,7 @@ account, c, path) # Popup dialog to confirm sending prim_text = 'Send file?' - sec_text = i18n.ngettext('Do you want to send that file to %s:', + sec_text = i18n.ngettext('Do you want to send that file to %s:', 'Do you want to send those files to %s:', nb_uri) %\ c_dest.get_shown_name() for uri in uri_splitted: @@ -4998,7 +5001,7 @@ return # Is the contact we drag a meta contact? - is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source) + is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source) # Contact drop on group row or between two contacts if type_dest == 'group' or position == gtk.TREE_VIEW_DROP_BEFORE or \ @@ -5109,7 +5112,7 @@ 'closed': {}} self.last_save_dir = None - self.editing_path = None # path of row with cell in edit mode + self.editing_path = None # path of row with cell in edit mode self.add_new_contact_handler_id = False self.service_disco_handler_id = False self.new_chat_menuitem_handler_id = False @@ -5146,13 +5149,15 @@ path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports') folders = os.listdir(path) + path = os.path.join(gajim.MY_ICONSETS_PATH, 'transports') + folders += os.listdir(path) for transport in folders: if transport == '.svn': continue - folder = os.path.join(path, transport, '32x32') + folder = os.path.join(helpers.get_transport_path(transport), '32x32') self.transports_state_images['32'][transport] = self.load_iconset( folder, transport = True) - folder = os.path.join(path, transport, '16x16') + folder = os.path.join(helpers.get_transport_path(transport), '16x16') self.transports_state_images['16'][transport] = self.load_iconset( folder, transport = True) Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-08-22 22:30:59 UTC (rev 8554) +++ trunk/src/tooltips.py 2007-08-22 22:46:31 UTC (rev 8555) @@ -89,7 +89,7 @@ half_width = requisition.width / 2 + 1 if self.preferred_position[0] < half_width: self.preferred_position[0] = 0 - elif self.preferred_position[0] + requisition.width > \ + elif self.preferred_position[0] + requisition.width > \ self.screen.get_width() + half_width: self.preferred_position[0] = self.screen.get_width() - \ requisition.width @@ -99,7 +99,7 @@ if self.preferred_position[1] + requisition.height > \ self.screen.get_height(): # flip tooltip up - self.preferred_position[1] -= requisition.height + \ + self.preferred_position[1] -= requisition.height + \ self.widget_height + 8 if self.preferred_position[1] < 0: self.preferred_position[1] = 0 @@ -436,8 +436,8 @@ transport = gajim.get_transport_name_from_jid( prim_contact.jid) if transport: - file_path = os.path.join(gajim.DATA_DIR, 'iconsets', - 'transports', transport , '16x16') + file_path = os.path.join(helpers.get_transport_path(transport), + '16x16') else: iconset = gajim.config.get('iconset') if not iconset: @@ -535,7 +535,7 @@ if property[1]: label.set_markup(property[0]) vcard_table.attach(label, 1, 2, vcard_current_row, - vcard_current_row + 1, gtk.FILL, vertical_fill, 0, 0) + vcard_current_row + 1, gtk.FILL, vertical_fill, 0, 0) label = gtk.Label() label.set_alignment(0, 0) label.set_markup(property[1]) @@ -576,7 +576,7 @@ properties.append((_('Name: '), gobject.markup_escape_text(file_name))) if file_props['type'] == 'r': - type = _('Download') + type = _('Download') actor = _('Sender: ') sender = unicode(file_props['sender']).split('/')[0] name = gajim.contacts.get_first_contact_from_jid( @@ -598,7 +598,7 @@ properties.append((_('Transferred: '), helpers.convert_bytes(transfered_len))) status = '' if not file_props.has_key('started') or not file_props['started']: - status = _('Not started') + status = _('Not started') elif file_props.has_key('connected'): if file_props.has_key('stopped') and \ file_props['stopped'] == True: @@ -609,7 +609,7 @@ if file_props['completed']: status = _('Completed') else: - if file_props.has_key('paused') and \ + if file_props.has_key('paused') and \ file_props['paused'] == True: status = _('?transfer status:Paused') elif file_props.has_key('stalled') and \ @@ -619,7 +619,7 @@ else: status = _('Transferring') else: - status = _('Not started') + status = _('Not started') properties.append((_('Status: '), status)) while properties: property = properties.pop(0) @@ -628,7 +628,7 @@ label.set_alignment(0, 0) label.set_markup(property[0]) ft_table.attach(label, 1, 2, current_row, current_row + 1, - gtk.FILL, gtk.FILL, 0, 0) + gtk.FILL, gtk.FILL, 0, 0) label = gtk.Label() label.set_alignment(0, 0) label.set_line_wrap(True)

1 0

[commit-gajim] r8554 - in trunk/data/emoticons: animated static static-big
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-23 00:30:59 +0200 (Thu, 23 Aug 2007) New Revision: 8554 Modified: trunk/data/emoticons/animated/emoticons.py trunk/data/emoticons/static-big/emoticons.py trunk/data/emoticons/static/emoticons.py Log: add encoding to emoticons files. fixes #3227 Modified: trunk/data/emoticons/animated/emoticons.py =================================================================== --- trunk/data/emoticons/animated/emoticons.py 2007-08-22 22:08:04 UTC (rev 8553) +++ trunk/data/emoticons/animated/emoticons.py 2007-08-22 22:30:59 UTC (rev 8554) @@ -1,3 +1,4 @@ +# coding=utf-8 emoticons = { ':-[': 'bat.gif', ':[': 'bat.gif', Modified: trunk/data/emoticons/static/emoticons.py =================================================================== --- trunk/data/emoticons/static/emoticons.py 2007-08-22 22:08:04 UTC (rev 8553) +++ trunk/data/emoticons/static/emoticons.py 2007-08-22 22:30:59 UTC (rev 8554) @@ -1,3 +1,4 @@ +# coding=utf-8 emoticons = { ':-)': 'smile.png', ':)': 'smile.png', Modified: trunk/data/emoticons/static-big/emoticons.py =================================================================== --- trunk/data/emoticons/static-big/emoticons.py 2007-08-22 22:08:04 UTC (rev 8553) +++ trunk/data/emoticons/static-big/emoticons.py 2007-08-22 22:30:59 UTC (rev 8554) @@ -1,3 +1,4 @@ +# coding=utf-8 emoticons = { ':-)': 'smile.png', ':)': 'smile.png',

1 0

[commit-gajim] r8553 - in trunk/src: . common
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-23 00:08:04 +0200 (Thu, 23 Aug 2007) New Revision: 8553 Modified: trunk/src/chat_control.py trunk/src/common/config.py trunk/src/conversation_textview.py Log: [Geobert] Smooth scrolling of conversation textview. see #3358 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-08-22 17:20:44 UTC (rev 8552) +++ trunk/src/chat_control.py 2007-08-22 22:08:04 UTC (rev 8553) @@ -253,6 +253,8 @@ # For JEP-0172 self.user_nick = None + self.smooth = True + def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend an option to switch languages''' def _on_select_dictionary(widget, lang): @@ -812,9 +814,10 @@ self.msg_scrolledwindow.set_property('vscrollbar-policy', gtk.POLICY_NEVER) self.msg_scrolledwindow.set_property('height-request', -1) - - self.conv_textview.bring_scroll_to_end(diff_y - 18) - + self.conv_textview.bring_scroll_to_end(diff_y - 18, False) + else: + self.conv_textview.bring_scroll_to_end(diff_y - 18, self.smooth) + self.smooth = True # reinit the flag # enable scrollbar automatic policy for horizontal scrollbar # if message we have in message_textview is too big if requisition.width > message_width: @@ -895,6 +898,7 @@ 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: @@ -904,6 +908,7 @@ return self.sent_history_pos = self.sent_history_pos + 1 + self.smooth = False conv_buf.set_text(self.sent_history[self.sent_history_pos]) def lighten_color(self, color): Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-08-22 17:20:44 UTC (rev 8552) +++ trunk/src/common/config.py 2007-08-22 22:08:04 UTC (rev 8553) @@ -218,6 +218,7 @@ 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking than in previous message.')], 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickname.')], + 'use_smooth_scrolling': [opt_bool, True, _('Smooth scroll message in conversation window')], 'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#045723:#7c7c7c:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors that will be used to color nicknames in group chats.'), True ], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')], 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')], Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-08-22 17:20:44 UTC (rev 8552) +++ trunk/src/conversation_textview.py 2007-08-22 22:08:04 UTC (rev 8553) @@ -10,13 +10,14 @@ ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## import random from tempfile import gettempdir from subprocess import Popen +from threading import Timer # for smooth scrolling import gtk import pango @@ -44,6 +45,10 @@ path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png') FOCUS_OUT_LINE_PIXBUF = gtk.gdk.pixbuf_new_from_file(path_to_file) + # smooth scroll constants + MAX_SCROLL_TIME = 0.4 # seconds + SCROLL_DELAY = 33 # milliseconds + def __init__(self, account, used_in_history_window = False): '''if used_in_history_window is True, then we do not show Clear menuitem in context menu''' @@ -154,6 +159,7 @@ self.line_tooltip = tooltips.BaseTooltip() # use it for hr too self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF + self.smooth_id = None def del_handlers(self): for i in self.handlers.keys(): @@ -181,6 +187,41 @@ return True return False + # Smooth scrolling inspired by Pidgin code + def smooth_scroll(self): + parent = self.tv.get_parent() + if not parent: + return False + vadj = parent.get_vadjustment() + max_val = vadj.upper - vadj.page_size + 1 + cur_val = vadj.get_value() + # scroll by 1/3rd of remaining distance + onethird = cur_val + ((max_val - cur_val) / 3.0) + vadj.set_value(onethird) + if max_val - onethird < 0.01: + self.smooth_id = None + self.smooth_scroll_timer.cancel() + return False + return True + + def smooth_scroll_timeout(self): + gobject.source_remove(self.smooth_id) + self.smooth_id = None + parent = self.tv.get_parent() + if parent: + vadj = parent.get_vadjustment() + vadj.set_value(vadj.upper - vadj.page_size + 1) + + def smooth_scroll_to_end(self): + if None != self.smooth_id: # already scrolling + return False + self.smooth_id = gobject.timeout_add(self.SCROLL_DELAY, + self.smooth_scroll) + self.smooth_scroll_timer = Timer(self.MAX_SCROLL_TIME, + self.smooth_scroll_timeout) + self.smooth_scroll_timer.start() + return False + def scroll_to_end(self): parent = self.tv.get_parent() buffer = self.tv.get_buffer() @@ -192,7 +233,9 @@ adjustment.set_value(0) return False # when called in an idle_add, just do it once - def bring_scroll_to_end(self, diff_y = 0): + def bring_scroll_to_end(self, diff_y = 0,\ + use_smooth =\ + gajim.config.get('use_smooth_scrolling')): ''' scrolls to the end of textview if end is not visible ''' buffer = self.tv.get_buffer() end_iter = buffer.get_end_iter() @@ -200,7 +243,10 @@ visible_rect = self.tv.get_visible_rect() # scroll only if expected end is not visible if end_rect.y >= (visible_rect.y + visible_rect.height + diff_y): - gobject.idle_add(self.scroll_to_end_iter) + if use_smooth: + gobject.idle_add(self.smooth_scroll_to_end) + else: + gobject.idle_add(self.scroll_to_end_iter) def scroll_to_end_iter(self): buffer = self.tv.get_buffer() @@ -407,7 +453,7 @@ item.set_property('sensitive', False) else: item = gtk.MenuItem(_('Web _Search for it')) - link = search_link % self.selected_phrase + link = search_link % self.selected_phrase id = item.connect('activate', self.visit_url_from_menuitem, link) self.handlers[id] = item submenu.append(item) @@ -632,7 +678,7 @@ cwd=gettempdir()) exitcode = p.wait() - if exitcode == 0: + if exitcode == 0: p = Popen(['dvips', '-E', '-o', tmpfile + '.ps', tmpfile + '.dvi'], cwd=gettempdir()) exitcode = p.wait() @@ -857,7 +903,10 @@ if at_the_end or kind == 'outgoing': # we are at the end or we are sending something # scroll to the end (via idle in case the scrollbar has appeared) - gobject.idle_add(self.scroll_to_end) + if gajim.config.get('use_smooth_scrolling'): + gobject.idle_add(self.smooth_scroll_to_end) + else: + gobject.idle_add(self.scroll_to_end) buffer.end_user_action()

1 0

[commit-gajim] r8552 - trunk/src
by steve-e＠gajim.org 22 Aug '07

22 Aug '07

Author: steve-e Date: 2007-08-22 19:20:44 +0200 (Wed, 22 Aug 2007) New Revision: 8552 Modified: trunk/src/chat_control.py trunk/src/dialogs.py Log: Transform Chat2MUC via DND. Fixes #1408. See #2095 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-08-22 12:50:34 UTC (rev 8551) +++ trunk/src/chat_control.py 2007-08-22 17:20:44 UTC (rev 8552) @@ -1773,15 +1773,14 @@ def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): - # If no resource is known, we can't send a file + if not selection.data: + return if self.TYPE_ID == message_control.TYPE_PM: c = self.gc_contact else: c = self.contact - if not c.resource: - return if target_type == self.TARGET_TYPE_URI_LIST: - if not selection.data: + if not c.resource: # If no resource is known, we can't send a file return uri = selection.data.strip() uri_splitted = uri.split() # we may have more than one file dropped @@ -1790,7 +1789,27 @@ if os.path.isfile(path): # is it file? ft = gajim.interface.instances['file_transfers'] ft.send_file(self.account, c, path) + return + # chat2muc + treeview = gajim.interface.roster.tree + model = treeview.get_model() + data = selection.data + path = treeview.get_selection().get_selected_rows()[1][0] + iter = model.get_iter(path) + type = model[iter][2] + account = model[iter][4].decode('utf-8') + if type != 'contact': # source is not a contact + return + dropped_jid = data.decode('utf-8') + + dropped_transport = gajim.get_transport_name_from_jid(dropped_jid) + c_transport = gajim.get_transport_name_from_jid(c.jid) + if dropped_transport or c_transport: + return # transport contacts cannot be invited + + dialogs.TransformChatToMUC(self.account, [c.jid], [dropped_jid]) + def _on_message_tv_buffer_changed(self, textbuffer): self.kbd_activity_in_last_5_secs = True self.kbd_activity_in_last_30_secs = True Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 12:50:34 UTC (rev 8551) +++ trunk/src/dialogs.py 2007-08-22 17:20:44 UTC (rev 8552) @@ -3199,12 +3199,13 @@ self.window.destroy() class TransformChatToMUC: - def __init__(self, account, jids): + def __init__(self, account, jids, preselected = None): '''This window is used to trasform a one-to-one chat to a MUC. We do 2 things: first select the server and then make a guests list.''' self.account = account self.auto_jids = jids + self.preselected_jids = preselected self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade') self.window = self.xml.get_widget('chat_to_muc_window') @@ -3271,7 +3272,12 @@ name = contact.name if name == '': name = jid.split('@')[0] - self.store.append([img.get_pixbuf(), name, jid]) + iter = self.store.append([img.get_pixbuf(), name, jid]) + # preselect treeview rows + if self.preselected_jids and jid in self.preselected_jids: + path = self.store.get_path(iter) + self.guests_treeview.get_selection().\ + select_path(path) # show all self.window.show_all()

1 0

[commit-gajim] r8551 - in trunk: data/glade src
by steve-e＠gajim.org 22 Aug '07

22 Aug '07

Author: steve-e Date: 2007-08-22 14:50:34 +0200 (Wed, 22 Aug 2007) New Revision: 8551 Modified: trunk/data/glade/account_context_menu.glade trunk/data/glade/advanced_menuitem_menu.glade trunk/data/glade/roster_window.glade trunk/src/roster_window.py Log: Rework Actions menu. Move single message from advanced submenu to top level. Fixes #3209 Modified: trunk/data/glade/account_context_menu.glade =================================================================== --- trunk/data/glade/account_context_menu.glade 2007-08-22 12:35:07 UTC (rev 8550) +++ trunk/data/glade/account_context_menu.glade 2007-08-22 12:50:34 UTC (rev 8551) @@ -42,7 +42,7 @@ <child> <widget class="GtkImageMenuItem" id="join_group_chat_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">_Group Chat</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="use_underline">True</property> <child internal-child="image"> <widget class="GtkImage" id="image1236"> Modified: trunk/data/glade/advanced_menuitem_menu.glade =================================================================== --- trunk/data/glade/advanced_menuitem_menu.glade 2007-08-22 12:35:07 UTC (rev 8550) +++ trunk/data/glade/advanced_menuitem_menu.glade 2007-08-22 12:50:34 UTC (rev 8551) @@ -4,19 +4,6 @@ <glade-interface> <widget class="GtkMenu" id="advanced_menuitem_menu"> <child> - <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> - <property name="label" translatable="yes">_Send Single Message</property> - <property name="use_underline">True</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1466"> - <property name="visible">True</property> - <property name="stock">gtk-new</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> <widget class="GtkMenuItem" id="xml_console_menuitem"> <property name="label" translatable="yes">Show _XML Console</property> <property name="use_underline">True</property> @@ -24,7 +11,7 @@ </child> <child> <widget class="GtkMenuItem" id="privacy_lists_menuitem"> - <property name="label" translatable="yes">_Privacy Lists</property> + <property name="label" translatable="yes">Edit _Privacy Lists</property> <property name="use_underline">True</property> </widget> </child> Modified: trunk/data/glade/roster_window.glade =================================================================== --- trunk/data/glade/roster_window.glade 2007-08-22 12:35:07 UTC (rev 8550) +++ trunk/data/glade/roster_window.glade 2007-08-22 12:50:34 UTC (rev 8551) @@ -43,9 +43,22 @@ </widget> </child> <child> + <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label" translatable="yes">_Send Single Message</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image5"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> <widget class="GtkImageMenuItem" id="join_gc_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">_Group Chat</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="use_underline">True</property> <child internal-child="image"> <widget class="GtkImage" id="image1606"> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-22 12:35:07 UTC (rev 8550) +++ trunk/src/roster_window.py 2007-08-22 12:50:34 UTC (rev 8551) @@ -853,8 +853,6 @@ xml = gtkgui_helpers.get_glade('advanced_menuitem_menu.glade') advanced_menuitem_menu = xml.get_widget('advanced_menuitem_menu') - send_single_message_menuitem = xml.get_widget( - 'send_single_message_menuitem') xml_console_menuitem = xml.get_widget('xml_console_menuitem') privacy_lists_menuitem = xml.get_widget('privacy_lists_menuitem') administrator_menuitem = xml.get_widget('administrator_menuitem') @@ -875,16 +873,12 @@ privacy_lists_menuitem.set_sensitive(False) if gajim.connections[account].is_zeroconf: - send_single_message_menuitem.set_sensitive(True) administrator_menuitem.set_sensitive(False) send_server_message_menuitem.set_sensitive(False) set_motd_menuitem.set_sensitive(False) update_motd_menuitem.set_sensitive(False) delete_motd_menuitem.set_sensitive(False) else: - send_single_message_menuitem.connect('activate', - self.on_send_single_message_menuitem_activate, account) - send_server_message_menuitem.connect('activate', self.on_send_server_message_menuitem_activate, account) @@ -906,6 +900,7 @@ if not self.actions_menu_needs_rebuild: return new_chat_menuitem = self.xml.get_widget('new_chat_menuitem') + single_message_menuitem = self.xml.get_widget('send_single_message_menuitem') join_gc_menuitem = self.xml.get_widget('join_gc_menuitem') muc_icon = self.load_icon('muc_active') if muc_icon: @@ -937,6 +932,11 @@ self.new_chat_menuitem_handler_id) self.new_chat_menuitem_handler_id = None + if self.single_message_menuitem_handler_id: + single_message_menuitem.handler_disconnect( + self.single_message_menuitem_handler_id) + self.single_message_menuitem_handler_id = None + if self.profile_avatar_menuitem_handler_id: profile_avatar_menuitem.handler_disconnect( self.profile_avatar_menuitem_handler_id) @@ -947,6 +947,7 @@ add_new_contact_menuitem.remove_submenu() service_disco_menuitem.remove_submenu() join_gc_menuitem.remove_submenu() + single_message_menuitem.remove_submenu() new_chat_menuitem.remove_submenu() advanced_menuitem.remove_submenu() profile_avatar_menuitem.remove_submenu() @@ -969,6 +970,7 @@ add_sub_menu = gtk.Menu() disco_sub_menu = gtk.Menu() new_chat_sub_menu = gtk.Menu() + single_message_sub_menu = gtk.Menu() accounts_list = gajim.contacts.get_accounts() accounts_list.sort() @@ -982,10 +984,17 @@ False) new_chat_sub_menu.append(new_chat_item) new_chat_item.connect('activate', - self.on_new_chat_menuitem_activate, account) + self.on_new_chat_menuitem_activate, account) if gajim.config.get_per('accounts', account, 'is_zeroconf'): continue + + # single message + single_message_item = gtk.MenuItem(_('using account %s') % account, + False) + single_message_sub_menu.append(single_message_item) + single_message_item.connect('activate', + self.on_send_single_message_menuitem_activate, account) # join gc if gajim.connections[account].private_storage_supported: @@ -1013,6 +1022,8 @@ disco_sub_menu.show_all() new_chat_menuitem.set_submenu(new_chat_sub_menu) new_chat_sub_menu.show_all() + single_message_menuitem.set_submenu(single_message_sub_menu) + single_message_sub_menu.show_all() gc_sub_menu.show_all() elif connected_accounts == 1: # user has only one account @@ -1038,6 +1049,13 @@ self.new_chat_menuitem_handler_id = new_chat_menuitem.\ connect('activate', self.on_new_chat_menuitem_activate, account) + + # single message + if not self.single_message_menuitem_handler_id: + self.single_message_menuitem_handler_id = \ + single_message_menuitem.connect('activate', \ + self.on_send_single_message_menuitem_activate, account) + # new chat accel if not self.have_new_chat_accel: ag = gtk.accel_groups_from_object(self.window)[0] @@ -1050,20 +1068,22 @@ if connected_accounts == 0: # no connected accounts, make the menuitems insensitive for item in [new_chat_menuitem, join_gc_menuitem,\ - add_new_contact_menuitem, service_disco_menuitem]: + add_new_contact_menuitem, service_disco_menuitem,\ + single_message_menuitem]: item.set_sensitive(False) else: # we have one or more connected accounts for item in [new_chat_menuitem, join_gc_menuitem,\ - add_new_contact_menuitem, service_disco_menuitem]: + add_new_contact_menuitem, service_disco_menuitem,\ + single_message_menuitem]: item.set_sensitive(True) - # disable some fields if only local account is there if connected_accounts == 1: for account in gajim.connections: if gajim.account_is_connected(account) and \ gajim.connections[account].is_zeroconf: for item in [join_gc_menuitem,\ - add_new_contact_menuitem, service_disco_menuitem]: + add_new_contact_menuitem, service_disco_menuitem, + single_message_menuitem]: item.set_sensitive(False) if connected_accounts_with_private_storage > 0: @@ -5093,6 +5113,7 @@ self.add_new_contact_handler_id = False self.service_disco_handler_id = False self.new_chat_menuitem_handler_id = False + self.single_message_menuitem_handler_id = False self.profile_avatar_menuitem_handler_id = False self.actions_menu_needs_rebuild = True self.regroup = gajim.config.get('mergeaccounts')

1 0

[commit-gajim] r8550 - trunk/data/glade
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 14:35:07 +0200 (Wed, 22 Aug 2007) New Revision: 8550 Modified: trunk/data/glade/chat_to_muc_window.glade Log: Higher textview in Invite Friends! widow. See #2095. Modified: trunk/data/glade/chat_to_muc_window.glade =================================================================== --- trunk/data/glade/chat_to_muc_window.glade 2007-08-22 12:19:30 UTC (rev 8549) +++ trunk/data/glade/chat_to_muc_window.glade 2007-08-22 12:35:07 UTC (rev 8550) @@ -34,6 +34,7 @@ <property name="shadow_type">GTK_SHADOW_IN</property> <child> <widget class="GtkTreeView" id="guests_treeview"> + <property name="height_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property>

1 0

[commit-gajim] r8549 - in trunk/src: . common/zeroconf
by asterix＠gajim.org 22 Aug '07

22 Aug '07

Author: asterix Date: 2007-08-22 14:19:30 +0200 (Wed, 22 Aug 2007) New Revision: 8549 Modified: trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/roster_window.py Log: redraw actions menu when zeroconf account connects. Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-08-22 12:18:21 UTC (rev 8548) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-08-22 12:19:30 UTC (rev 8549) @@ -315,6 +315,7 @@ check = self.connection.announce() else: self.connected = STATUS_LIST.index(show) + self.dispatch('SIGNED_IN', ()) # 'disconnect' elif show == 'offline' and self.connected: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-22 12:18:21 UTC (rev 8548) +++ trunk/src/roster_window.py 2007-08-22 12:19:30 UTC (rev 8549) @@ -875,7 +875,7 @@ privacy_lists_menuitem.set_sensitive(False) if gajim.connections[account].is_zeroconf: - send_single_message_menuitem.set_sensitive(False) + send_single_message_menuitem.set_sensitive(True) administrator_menuitem.set_sensitive(False) send_server_message_menuitem.set_sensitive(False) set_motd_menuitem.set_sensitive(False)

1 0

[commit-gajim] r8548 - trunk/src
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 14:18:21 +0200 (Wed, 22 Aug 2007) New Revision: 8548 Modified: trunk/src/dialogs.py Log: Don't add irc transports to MUC servers in Invite Friends window. See #2095. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 12:10:06 UTC (rev 8547) +++ trunk/src/dialogs.py 2007-08-22 12:18:21 UTC (rev 8548) @@ -3230,8 +3230,8 @@ recently_groupchat = gajim.config.get('recently_groupchat').split() for g in recently_groupchat: server = gajim.get_server_from_jid(g) - if server not in server_list: - server_list.append(gajim.get_server_from_jid(g)) + if server not in server_list and not server.startswith('irc'): + server_list.append(server) # add a default server if not server_list: server_list.append('conference.jabber.org')

1 0

[commit-gajim] r8547 - trunk/src
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 14:10:06 +0200 (Wed, 22 Aug 2007) New Revision: 8547 Modified: trunk/src/dialogs.py Log: Remove transports contacts from Invite Friends! window. See #2095. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 12:08:26 UTC (rev 8546) +++ trunk/src/dialogs.py 2007-08-22 12:10:06 UTC (rev 8547) @@ -3261,9 +3261,9 @@ for jid in gajim.contacts.get_jid_list(account): contact = \ gajim.contacts.get_contact_with_highest_priority(account, jid) - contact_transport = contact.is_transport() + contact_transport = gajim.get_transport_name_from_jid(jid) if contact.jid not in self.auto_jids and \ - not contact_transport and \ + not contact_transport and not contact.is_transport() and \ contact.jid not in gajim.interface.minimized_controls[account]: if contact.show not in ('offline', 'error'): img = gajim.interface.roster.jabber_state_images['16'][

1 0

[commit-gajim] r8546 - trunk/src
by roidelapluie＠gajim.org 22 Aug '07

22 Aug '07

Author: roidelapluie Date: 2007-08-22 14:08:26 +0200 (Wed, 22 Aug 2007) New Revision: 8546 Modified: trunk/src/dialogs.py Log: Improve transport detection in "Invite Friends" window. See #2095. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-22 11:51:58 UTC (rev 8545) +++ trunk/src/dialogs.py 2007-08-22 12:08:26 UTC (rev 8546) @@ -3261,7 +3261,7 @@ for jid in gajim.contacts.get_jid_list(account): contact = \ gajim.contacts.get_contact_with_highest_priority(account, jid) - contact_transport = gajim.get_transport_name_from_jid(jid) + contact_transport = contact.is_transport() if contact.jid not in self.auto_jids and \ not contact_transport and \ contact.jid not in gajim.interface.minimized_controls[account]:

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

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 August 2007