Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r9989 - trunk/src
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-23 01:03:33 +0200 (Wed, 23 Jul 2008) New Revision: 9989 Modified: trunk/src/tooltips.py Log: Make user tune tooltip translatable. @whoever did that: _() has to be around the format string, NOT the result of the sprintf! Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-22 22:20:51 UTC (rev 9988) +++ trunk/src/tooltips.py 2008-07-22 23:03:33 UTC (rev 9989) @@ -612,8 +612,10 @@ source = gobject.markup_escape_text(source) else: source = _('Unknown Source') - tune_string = _('Tune:') + ' ' + _('"%(title)s" by %(artist)s\nfrom %(source)s' %\ - {'title': title, 'artist': artist, 'source': source}) + tune_string = _('Tune:') + ' ' + _('"%(title)s"' + + ' by %(artist)s\nfrom ' + + '%(source)s') % {'title': title, + 'artist': artist, 'source': source} properties.append((tune_string, None))

1 0

[commit-gajim] r9988 - in trunk: data/glade src
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-23 00:20:51 +0200 (Wed, 23 Jul 2008) New Revision: 9988 Modified: trunk/data/glade/change_mood_dialog.glade trunk/src/dialogs.py Log: Better User Mood dialog. Modified: trunk/data/glade/change_mood_dialog.glade =================================================================== --- trunk/data/glade/change_mood_dialog.glade 2008-07-22 21:43:19 UTC (rev 9987) +++ trunk/data/glade/change_mood_dialog.glade 2008-07-22 22:20:51 UTC (rev 9988) @@ -14,14 +14,15 @@ <child> <widget class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">2</property> + <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="description_entry"> + <widget class="GtkLabel" id="mood_label"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">None</property> </widget> <packing> <property name="left_attach">1</property> @@ -32,21 +33,248 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="type_combobox"> + <widget class="GtkTable" id="mood_icons_table"> <property name="visible">True</property> + <property name="n_rows">6</property> + <property name="n_columns">11</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <widget class="GtkRadioButton" id="no_mood_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text">No mood</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="response_id">0</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> </widget> <packing> + <property name="right_attach">2</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="description_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> <widget class="GtkLabel" id="label"> <property name="visible">True</property> - <property name="label" translatable="yes">Type:</property> + <property name="label" translatable="yes">Mood:</property> + <property name="use_markup">True</property> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options"></property> <property name="y_options"></property> </packing> @@ -54,11 +282,12 @@ <child> <widget class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="label" translatable="yes">Message:</property> + <property name="label" translatable="yes">Message:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options"></property> <property name="y_options"></property> </packing> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-22 21:43:19 UTC (rev 9987) +++ trunk/src/dialogs.py 2008-07-22 22:20:51 UTC (rev 9988) @@ -37,7 +37,7 @@ import dataforms_widget from random import randrange -from common.pep import MOODS +from common import pep try: import gtkspell @@ -431,7 +431,6 @@ message = self.entry.get_text().decode('utf-8') if subactivity is None: subactivity = '' - from common import pep if activity == 'None': pep.user_retract_activity(self.account) else: @@ -443,52 +442,82 @@ self.window.destroy() class ChangeMoodDialog: - moods = MOODS + COLS = 11 + def __init__(self, account): self.account = account self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') + self.mood = None + self.window = self.xml.get_widget('change_mood_dialog') self.window.set_transient_for(gajim.interface.roster.window) self.window.set_title(_('Set Mood')) + table = self.xml.get_widget('mood_icons_table') + self.label = self.xml.get_widget('mood_label') self.entry = self.xml.get_widget('description_entry') - self.combo = self.xml.get_widget('type_combobox') - self.liststore = gtk.ListStore(str, str) # translated, english - self.combo.set_model(self.liststore) + no_mood_button = self.xml.get_widget('no_mood_button') + no_mood_button.set_mode(False) + no_mood_button.connect('clicked', + self.on_mood_button_clicked, None) - for mood in self.moods: - self.liststore.append((helpers.get_uf_mood(mood), mood)) + x = 1 + y = 0 + self.mood_buttons = {} + for mood in pep.MOODS: + self.mood_buttons[mood] = gtk.RadioButton( + no_mood_button) + self.mood_buttons[mood].set_mode(False) + self.mood_buttons[mood].add( + gtkgui_helpers.load_mood_icon(mood)) + self.mood_buttons[mood].set_relief(gtk.RELIEF_NONE) + self.mood_buttons[mood].set_tooltip_text(_(mood)) + self.mood_buttons[mood].connect('clicked', + self.on_mood_button_clicked, mood) + table.attach(self.mood_buttons[mood], + x, x + 1, y, y + 1) + + # Calculate the next position + x += 1 + if x >= self.COLS: + x = 0 + y += 1 con = gajim.connections[account] - if 'mood' in con.mood and con.mood['mood'] in self.moods: - self.combo.set_active(self.moods.index(con.mood['mood'])) - else: - self.combo.set_active(0) + if 'mood' in con.mood: + self.mood = con.mood['mood'] + self.label.set_text(con.mood['mood']) + if con.mood['mood'] in pep.MOODS: + self.mood_buttons[con.mood['mood']]. \ + set_active(True) + self.entry.set_sensitive(True if self.mood else False) + if 'text' in con.mood: self.entry.set_text(con.mood['text']) - cellrenderertext = gtk.CellRendererText() - self.combo.pack_start(cellrenderertext, True) - self.combo.add_attribute(cellrenderertext, 'text', 0) self.xml.signal_autoconnect(self) self.window.show_all() + def on_mood_button_clicked(self, widget, data): + self.label.set_text(_(data)) + + if data: + self.entry.set_sensitive(True) + else: + self.entry.set_text('') + self.entry.set_sensitive(False) + self.mood = data + def on_ok_button_clicked(self, widget): '''Return mood and messsage (None if no mood selected)''' - mood = None - message = None - active = self.combo.get_active() - if active > -1: - mood = self.liststore[active][1].decode('utf-8') - message = self.entry.get_text().decode('utf-8') - from common import pep - if mood == 'None': - pep.user_retract_mood(self.account) - else: - pep.user_send_mood(self.account, mood, message) - self.window.destroy() + message = self.entry.get_text().decode('utf-8') + if self.mood is None: + pep.user_retract_mood(self.account) + else: + pep.user_send_mood(self.account, self.mood, message) + self.window.destroy() def on_cancel_button_clicked(self, widget): self.window.destroy()

1 0

[commit-gajim] r9987 - trunk/src/common
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 23:43:19 +0200 (Tue, 22 Jul 2008) New Revision: 9987 Modified: trunk/src/common/pep.py Log: 'None' is not a mood! Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-22 21:08:52 UTC (rev 9986) +++ trunk/src/common/pep.py 2008-07-22 21:43:19 UTC (rev 9987) @@ -1,6 +1,6 @@ from common import gajim, xmpp -MOODS = ['None', 'afraid', 'amazed', 'angry', 'annoyed', 'anxious', 'aroused', +MOODS = ['afraid', 'amazed', 'angry', 'annoyed', 'anxious', 'aroused', 'ashamed', 'bored', 'brave', 'calm', 'cold', 'confused', 'contented', 'cranky', 'curious', 'depressed', 'disappointed', 'disgusted', 'distracted', 'embarrassed', 'excited', 'flirtatious', 'frustrated',

1 0

[commit-gajim] r9986 - in trunk: data/glade src src/common
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 23:08:52 +0200 (Tue, 22 Jul 2008) New Revision: 9986 Modified: trunk/data/glade/message_window.glade trunk/src/chat_control.py trunk/src/common/config.py trunk/src/common/configpaths.py trunk/src/common/gajim.py trunk/src/common/helpers.py trunk/src/common/pep.py trunk/src/dialogs.py trunk/src/gtkgui_helpers.py Log: Show mood in chat window. Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/data/glade/message_window.glade 2008-07-22 21:08:52 UTC (rev 9986) @@ -64,6 +64,42 @@ </packing> </child> <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="mood_image"> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + </widget> + </child> + <child> + <widget class="GtkImage" id="activity_image"> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkImage" id="tune_image"> + <property name="no_show_all">True</property> + <property name="stock">gtk-missing-image</property> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">15</property> + <property name="position">2</property> + </packing> + </child> + <child> <widget class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> @@ -77,7 +113,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </widget> @@ -111,23 +147,22 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkButton" id="authentication_button"> - <property name="no_show_all">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> - <child> - <widget class="GtkImage" id="lock_image"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> + <widget class="GtkButton" id="authentication_button"> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="focus_on_click">False</property> + <property name="response_id">0</property> + <child> + <widget class="GtkImage" id="lock_image"> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> <packing> <property name="expand">False</property> - <property name="padding">0</property> </packing> </child> <child> Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/chat_control.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -45,7 +45,9 @@ from common.logger import Constants constants = Constants() from common.rst_xhtml_generator import create_xhtml -from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_RECEIPTS, NS_ESESSION +from common.pep import MOODS +from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_RECEIPTS +from common.xmpp.protocol import NS_ESESSION try: import gtkspell @@ -1083,6 +1085,12 @@ self.update_toolbar() + self._mood_image = self.xml.get_widget('mood_image') + self._activity_image = self.xml.get_widget('activity_image') + self._tune_image = self.xml.get_widget('tune_image') + + self.update_mood() + # keep timeout id and window obj for possible big avatar # it is on enter-notify and leave-notify so no need to be # per jid @@ -1186,6 +1194,37 @@ else: self._convert_to_gc_button.set_sensitive(False) + def update_mood(self): + if self.contact.mood.has_key('mood'): + mood = gobject.markup_escape_text( + self.contact.mood['mood']) + else: + mood = None + + if self.contact.mood.has_key('text'): + text = gobject.markup_escape_text( + self.contact.mood['text']) + else: + text = '' + + if mood is not None: + if mood in MOODS: + self._mood_image.set_from_pixbuf( + gtkgui_helpers.load_mood_icon( + mood).get_pixbuf()) + # Translate standard moods + mood = _(mood) + else: + self._mood_image.set_from_pixbuf( + gtkgui_helpers.load_mood_icon( + 'unknown').get_pixbuf()) + + self._mood_image.set_tooltip_markup('%s%s%s' % + (mood, '\n' if text is not '' else '', text)) + self._mood_image.show() + else: + self._mood_image.hide() + def on_avatar_eventbox_enter_notify_event(self, widget, event): ''' we enter the eventbox area so we under conditions add a timeout Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/common/config.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -51,6 +51,7 @@ class Config: DEFAULT_ICONSET = 'dcraven' + DEFAULT_MOOD_ICONSET = 'default' if sys.platform == 'darwin': DEFAULT_OPENWITH = 'open' DEFAULT_BROWSER = 'open -a Safari' @@ -92,6 +93,7 @@ 'last_status_msg_offline': [ opt_str, '' ], 'trayicon': [ opt_bool, True, '', True ], 'iconset': [ opt_str, DEFAULT_ICONSET, '', True ], + 'mood_iconset': [ opt_str, DEFAULT_MOOD_ICONSET, '', True ], 'use_transports_iconsets': [ opt_bool, True, '', True ], 'inmsgcolor': [ opt_color, '#a34526', '', True ], 'outmsgcolor': [ opt_color, '#164e6f', '', True ], Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/common/configpaths.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -79,9 +79,9 @@ # LOG is deprecated k = ( 'LOG', 'LOG_DB', 'VCARD', 'AVATAR', 'MY_EMOTS', - 'MY_ICONSETS', 'MY_CACERTS') + 'MY_ICONSETS', 'MY_MOOD_ICONSETS', 'MY_CACERTS') v = (u'logs', u'logs.db', u'vcards', u'avatars', u'emoticons', - u'iconsets', u'cacerts.pem') + u'iconsets', u'moods', u'cacerts.pem') if os.name == 'nt': v = map(lambda x: x.capitalize(), v) Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/common/gajim.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -81,6 +81,7 @@ AVATAR_PATH = gajimpaths['AVATAR'] MY_EMOTS_PATH = gajimpaths['MY_EMOTS'] MY_ICONSETS_PATH = gajimpaths['MY_ICONSETS'] +MY_MOOD_ICONSETS_PATH = gajimpaths['MY_MOOD_ICONSETS'] MY_CACERTS = gajimpaths['MY_CACERTS'] TMP = gajimpaths['TMP'] DATA_DIR = gajimpaths['DATA'] Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/common/helpers.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -1179,6 +1179,12 @@ elif os.path.isdir(os.path.join(gajim.MY_ICONSETS_PATH, iconset)): return os.path.join(gajim.MY_ICONSETS_PATH, iconset) +def get_mood_iconset_path(iconset): + if os.path.isdir(os.path.join(gajim.DATA_DIR, 'moods', iconset)): + return os.path.join(gajim.DATA_DIR, 'moods', iconset) + elif os.path.isdir(os.path.join(gajim.MY_MOOD_ICONSETS_PATH, iconset)): + return os.path.join(gajim.MY_MOOD_ICONSETS_PATH, iconset) + def get_transport_path(transport): if os.path.isdir(os.path.join(gajim.DATA_DIR, 'iconsets', 'transports', transport)): Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/common/pep.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -1,5 +1,16 @@ from common import gajim, xmpp +MOODS = ['None', 'afraid', 'amazed', 'angry', 'annoyed', 'anxious', 'aroused', + 'ashamed', 'bored', 'brave', 'calm', 'cold', 'confused', 'contented', + 'cranky', 'curious', 'depressed', 'disappointed', 'disgusted', + 'distracted', 'embarrassed', 'excited', 'flirtatious', 'frustrated', + 'grumpy', 'guilty', 'happy', 'hot', 'humbled', 'humiliated', 'hungry', + 'hurt', 'impressed', 'in_awe', 'in_love', 'indignant', 'interested', + 'intoxicated', 'invincible', 'jealous', 'lonely', 'mean', 'moody', + 'nervous', 'neutral', 'offended', 'playful', 'proud', 'relieved', + 'remorseful', 'restless', 'sad', 'sarcastic', 'serious', 'shocked', + 'shy', 'sick', 'sleepy', 'stressed', 'surprised', 'thirsty', 'worried'] + def user_mood(items, name, jid): has_child = False retract = False Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/dialogs.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -37,6 +37,7 @@ import dataforms_widget from random import randrange +from common.pep import MOODS try: import gtkspell @@ -442,19 +443,7 @@ self.window.destroy() class ChangeMoodDialog: - moods = ['None', 'afraid', 'amazed', 'angry', 'annoyed', 'anxious', - 'aroused', 'ashamed', 'bored', 'brave', 'calm', - 'cold', 'confused', 'contented', 'cranky', 'curious', - 'depressed', 'disappointed', 'disgusted', 'distracted', - 'embarrassed', 'excited', 'flirtatious', 'frustrated', - 'grumpy', 'guilty', 'happy', 'hot', 'humbled', - 'humiliated', 'hungry', 'hurt', 'impressed', 'in_awe', - 'in_love', 'indignant', 'interested', 'intoxicated', - 'invincible', 'jealous', 'lonely', 'mean', 'moody', - 'nervous', 'neutral', 'offended', 'playful', 'proud', - 'relieved', 'remorseful', 'restless', 'sad', 'sarcastic', - 'serious', 'shocked', 'shy', 'sick', 'sleepy', - 'stressed', 'surprised', 'thirsty', 'worried'] + moods = MOODS def __init__(self, account): self.account = account self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-07-22 20:29:31 UTC (rev 9985) +++ trunk/src/gtkgui_helpers.py 2008-07-22 21:08:52 UTC (rev 9986) @@ -882,10 +882,17 @@ def load_icon(icon_name): '''load an icon from the iconset in 16x16''' iconset = gajim.config.get('iconset') - path = os.path.join(helpers.get_iconset_path(iconset), '16x16' + '/') + path = os.path.join(helpers.get_iconset_path(iconset), '16x16', '') icon_list = _load_icon_list([icon_name], path) return icon_list[icon_name] +def load_mood_icon(icon_name): + '''load an icon from the mood iconset in 16x16''' + iconset = gajim.config.get('mood_iconset') + path = os.path.join(helpers.get_mood_iconset_path(iconset), '') + icon_list = _load_icon_list([icon_name], path) + return icon_list[icon_name] + def load_icons_meta(): '''load and return - AND + small icons to put on top left of an icon for meta contacts.'''

1 0

[commit-gajim] r9985 - trunk/src
by steve-e＠gajim.org 22 Jul '08

22 Jul '08

Author: steve-e Date: 2008-07-22 22:29:31 +0200 (Tue, 22 Jul 2008) New Revision: 9985 Modified: trunk/src/roster_window.py Log: Some small tweaks to the roster visible_func * Do not show transports when the account is disconnected. Fixes #4124 * Hide contacts with unconfirmed subscription when we only want to see online contacts. Fixes #4118 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-22 20:06:50 UTC (rev 9984) +++ trunk/src/roster_window.py 2008-07-22 20:29:31 UTC (rev 9985) @@ -1260,9 +1260,6 @@ if self.contact_has_pending_roster_events(contact, account): return True - if contact.ask: - return True - if contact.show in ('offline', 'error'): if contact.jid in gajim.to_be_removed[account]: return True @@ -1290,10 +1287,13 @@ if type_ == 'group': group = jid if group == _('Transports'): - return gajim.config.get('show_transports_group') + return gajim.config.get('show_transports_group') and \ + (gajim.account_is_connected(account) or \ + gajim.config.get('showoffline')) if gajim.config.get('showoffline'): return True + if self.regroup: # C_ACCOUNT for groups depends on the order # accounts were connected @@ -1331,7 +1331,9 @@ contact = gajim.contacts.get_first_contact_from_jid(account, jid) return self.contact_is_visible(contact, account) if type_ == 'agent': - return gajim.config.get('show_transports_group') + return gajim.config.get('show_transports_group') and \ + (gajim.account_is_connected(account) or \ + gajim.config.get('showoffline')) return True def _compareIters(self, model, iter1, iter2, data = None):

1 0

[commit-gajim] r9984 - trunk/data/moods/default
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 22:06:50 +0200 (Tue, 22 Jul 2008) New Revision: 9984 Added: trunk/data/moods/default/unknown.png Log: Added smilie for unknown/custom mood. Added: trunk/data/moods/default/unknown.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/unknown.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[commit-gajim] r9983 - in trunk/data: . moods moods/default
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 21:36:49 +0200 (Tue, 22 Jul 2008) New Revision: 9983 Added: trunk/data/moods/ trunk/data/moods/default/ trunk/data/moods/default/afraid.png trunk/data/moods/default/amazed.png trunk/data/moods/default/angry.png trunk/data/moods/default/annoyed.png trunk/data/moods/default/anxious.png trunk/data/moods/default/aroused.png trunk/data/moods/default/ashamed.png trunk/data/moods/default/bored.png trunk/data/moods/default/brave.png trunk/data/moods/default/calm.png trunk/data/moods/default/cold.png trunk/data/moods/default/confused.png trunk/data/moods/default/contented.png trunk/data/moods/default/cranky.png trunk/data/moods/default/curious.png trunk/data/moods/default/depressed.png trunk/data/moods/default/disappointed.png trunk/data/moods/default/disgusted.png trunk/data/moods/default/distracted.png trunk/data/moods/default/embarrassed.png trunk/data/moods/default/excited.png trunk/data/moods/default/flirtatious.png trunk/data/moods/default/frustrated.png trunk/data/moods/default/grumpy.png trunk/data/moods/default/guilty.png trunk/data/moods/default/happy.png trunk/data/moods/default/hot.png trunk/data/moods/default/humbled.png trunk/data/moods/default/humiliated.png trunk/data/moods/default/hungry.png trunk/data/moods/default/hurt.png trunk/data/moods/default/impressed.png trunk/data/moods/default/in_awe.png trunk/data/moods/default/in_love.png trunk/data/moods/default/indignant.png trunk/data/moods/default/interested.png trunk/data/moods/default/intoxicated.png trunk/data/moods/default/invincible.png trunk/data/moods/default/jealous.png trunk/data/moods/default/lonely.png trunk/data/moods/default/mean.png trunk/data/moods/default/moody.png trunk/data/moods/default/nervous.png trunk/data/moods/default/neutral.png trunk/data/moods/default/offended.png trunk/data/moods/default/playful.png trunk/data/moods/default/proud.png trunk/data/moods/default/relieved.png trunk/data/moods/default/remorseful.png trunk/data/moods/default/restless.png trunk/data/moods/default/sad.png trunk/data/moods/default/sarcastic.png trunk/data/moods/default/serious.png trunk/data/moods/default/shocked.png trunk/data/moods/default/shy.png trunk/data/moods/default/sick.png trunk/data/moods/default/sleepy.png trunk/data/moods/default/stressed.png trunk/data/moods/default/surprised.png trunk/data/moods/default/thirsty.png trunk/data/moods/default/worried.png Log: Added icons for moods. Thanks to Rederick Asher who did they for Jabbim! You're a genious, I've never seen smilies expressing so much in jsut 16x16 pixels! Added: trunk/data/moods/default/afraid.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/afraid.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/amazed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/amazed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/angry.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/angry.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/annoyed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/annoyed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/anxious.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/anxious.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/aroused.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/aroused.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/ashamed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/ashamed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/bored.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/bored.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/brave.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/brave.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/calm.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/calm.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/cold.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/cold.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/confused.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/confused.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/contented.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/contented.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/cranky.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/cranky.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/curious.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/curious.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/depressed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/depressed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/disappointed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/disappointed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/disgusted.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/disgusted.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/distracted.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/distracted.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/embarrassed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/embarrassed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/excited.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/excited.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/flirtatious.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/flirtatious.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/frustrated.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/frustrated.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/grumpy.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/grumpy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/guilty.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/guilty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/happy.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/happy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/hot.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/hot.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/humbled.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/humbled.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/humiliated.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/humiliated.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/hungry.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/hungry.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/hurt.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/hurt.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/impressed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/impressed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/in_awe.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/in_awe.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/in_love.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/in_love.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/indignant.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/indignant.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/interested.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/interested.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/intoxicated.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/intoxicated.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/invincible.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/invincible.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/jealous.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/jealous.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/lonely.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/lonely.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/mean.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/mean.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/moody.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/moody.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/nervous.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/nervous.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/neutral.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/neutral.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/offended.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/offended.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/playful.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/playful.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/proud.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/proud.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/relieved.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/relieved.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/remorseful.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/remorseful.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/restless.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/restless.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/sad.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/sad.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/sarcastic.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/sarcastic.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/serious.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/serious.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/shocked.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/shocked.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/shy.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/shy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/sick.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/sick.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/sleepy.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/sleepy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/stressed.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/stressed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/surprised.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/surprised.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/thirsty.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/thirsty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/data/moods/default/worried.png =================================================================== (Binary files differ) Property changes on: trunk/data/moods/default/worried.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[commit-gajim] r9982 - trunk/src
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 17:40:20 +0200 (Tue, 22 Jul 2008) New Revision: 9982 Modified: trunk/src/chat_control.py Log: Separate the code to update the toolbar. Now we can update when the status / caps chance. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-22 14:32:37 UTC (rev 9981) +++ trunk/src/chat_control.py 2008-07-22 15:40:20 UTC (rev 9982) @@ -1038,20 +1038,27 @@ id = self.actions_button.connect('clicked', self.on_actions_button_clicked) self.handlers[id] = self.actions_button - add_to_roster_button = self.xml.get_widget('add_to_roster_button') - id = add_to_roster_button.connect('clicked', self._on_add_to_roster_menuitem_activate) - self.handlers[id] = add_to_roster_button + self._add_to_roster_button = self.xml.get_widget( + 'add_to_roster_button') + id = self._add_to_roster_button.connect('clicked', + self._on_add_to_roster_menuitem_activate) + self.handlers[id] = self._add_to_roster_button - send_file_button = self.xml.get_widget('send_file_button') - id = send_file_button.connect('clicked', self._on_send_file_menuitem_activate) - self.handlers[id] = send_file_button + self._send_file_button = self.xml.get_widget('send_file_button') + id = self._send_file_button.connect('clicked', + self._on_send_file_menuitem_activate) + self.handlers[id] = self._send_file_button - convert_to_gc_button = self.xml.get_widget('convert_to_gc_button') - id = convert_to_gc_button.connect('clicked', self._on_convert_to_gc_menuitem_activate) - self.handlers[id] = convert_to_gc_button + self._convert_to_gc_button = self.xml.get_widget( + 'convert_to_gc_button') + id = self._convert_to_gc_button.connect('clicked', + self._on_convert_to_gc_menuitem_activate) + self.handlers[id] = self._convert_to_gc_button - contact_information_button = self.xml.get_widget('contact_information_button') - id = contact_information_button.connect('clicked', self._on_contact_information_menuitem_activate) + contact_information_button = self.xml.get_widget( + 'contact_information_button') + id = contact_information_button.connect('clicked', + self._on_contact_information_menuitem_activate) self.handlers[id] = contact_information_button compact_view = gajim.config.get('compact_view') @@ -1059,8 +1066,10 @@ self.widget_set_visible(self.xml.get_widget('banner_eventbox'), gajim.config.get('hide_chat_banner')) - self.authentication_button = self.xml.get_widget('authentication_button') - id = self.authentication_button.connect('clicked', self._on_authentication_button_clicked) + self.authentication_button = self.xml.get_widget( + 'authentication_button') + id = self.authentication_button.connect('clicked', + self._on_authentication_button_clicked) self.handlers[id] = self.authentication_button # Add lock image to show chat encryption @@ -1069,27 +1078,14 @@ # Convert to GC icon img = self.xml.get_widget('convert_to_gc_button_image') - img.set_from_pixbuf(gtkgui_helpers.load_icon('muc_active').get_pixbuf()) + img.set_from_pixbuf(gtkgui_helpers.load_icon( + 'muc_active').get_pixbuf()) - # Add to roster button - if _('Not in Roster') in contact.groups: - add_to_roster_button.show() + self.update_toolbar() - # If we don't have resource, we can't do file transfer - # in transports, contact holds our info we need to disable it too - if gajim.capscache.is_supported(contact, NS_FILE): - send_file_button.set_sensitive(True) - else: - send_file_button.set_sensitive(False) - - # check if it's possible to convert to groupchat - if gajim.capscache.is_supported(contact, NS_MUC): - convert_to_gc_button.set_sensitive(True) - else: - convert_to_gc_button.set_sensitive(False) - # keep timeout id and window obj for possible big avatar - # it is on enter-notify and leave-notify so no need to be per jid + # it is on enter-notify and leave-notify so no need to be + # per jid self.show_bigger_avatar_timeout_id = None self.bigger_avatar_window = None self.show_avatar(self.contact.resource) @@ -1121,7 +1117,8 @@ self.handlers[id] = widget if not session: - session = gajim.connections[self.account].find_controlless_session(self.contact.jid) + session = gajim.connections[self.account]. \ + find_controlless_session(self.contact.jid) if session: session.control = self @@ -1136,8 +1133,9 @@ gpg_pref = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled') e2e_pref = gajim.config.get_per('accounts', self.account, - 'autonegotiate_esessions') and gajim.config.get_per('contacts', - contact.jid, 'autonegotiate_esessions') + 'autonegotiate_esessions') and \ + gajim.config.get_per('contacts', contact.jid, + 'autonegotiate_esessions') # try GPG first if not e2e_is_active and gpg_pref and \ @@ -1169,9 +1167,30 @@ # restore previous conversation self.restore_conversation() + def update_toolbar(self): + # Add to roster + if _('Not in Roster') in self.contact.groups: + self._add_to_roster_button.show() + else: + self._add_to_roster_button.hide() + + # Send file + if gajim.capscache.is_supported(self.contact, NS_FILE): + self._send_file_button.set_sensitive(True) + else: + self._send_file_button.set_sensitive(False) + + # Convert to GC + if gajim.capscache.is_supported(self.contact, NS_MUC): + self._convert_to_gc_button.set_sensitive(True) + else: + self._convert_to_gc_button.set_sensitive(False) + def on_avatar_eventbox_enter_notify_event(self, widget, event): - '''we enter the eventbox area so we under conditions add a timeout - to show a bigger avatar after 0.5 sec''' + ''' + we enter the eventbox area so we under conditions add a timeout + to show a bigger avatar after 0.5 sec + ''' jid = self.contact.jid is_fake = False if self.type_id == message_control.TYPE_PM: @@ -1190,14 +1209,16 @@ # do we have something bigger to show? if avatar_w > scaled_buf_w or avatar_h > scaled_buf_h: # wait for 0.5 sec in case we leave earlier - self.show_bigger_avatar_timeout_id = gobject.timeout_add(500, + self.show_bigger_avatar_timeout_id = \ + gobject.timeout_add(500, self.show_bigger_avatar, widget) def on_avatar_eventbox_leave_notify_event(self, widget, event): '''we left the eventbox area that holds the avatar img''' # did we add a timeout? if yes remove it if self.show_bigger_avatar_timeout_id is not None: - gobject.source_remove(self.show_bigger_avatar_timeout_id) + gobject.source_remove( + self.show_bigger_avatar_timeout_id) def on_avatar_eventbox_button_press_event(self, widget, event): '''If right-clicked, show popup'''

1 0

[commit-gajim] r9981 - trunk/src
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 16:32:37 +0200 (Tue, 22 Jul 2008) New Revision: 9981 Modified: trunk/src/conversation_textview.py trunk/src/gajim.py Log: * End ESession when remote signs off. * Fix typo. * Better code in conversation_textview.py. @bct: Your diff didn't work, I had to move it + add an if. Seems to work now. Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-07-22 14:13:37 UTC (rev 9980) +++ trunk/src/conversation_textview.py 2008-07-22 14:32:37 UTC (rev 9981) @@ -397,11 +397,8 @@ self.smooth_scroll_timer.cancel() def show_xep0184_warning(self, id): - try: - if self.xep0184_marks[id] is not None: - return - except KeyError: - pass + if self.xep0184_marks.has_key(id): + return buffer = self.tv.get_buffer() buffer.begin_user_action() @@ -427,10 +424,7 @@ buffer.end_user_action() def hide_xep0184_warning(self, id): - try: - if self.xep0184_marks[id] is None: - return - except KeyError: + if not self.xep0184_marks.has_key(id): return if self.xep0184_shown[id] == NOT_SHOWN: @@ -452,7 +446,7 @@ buffer.end_user_action() - self.xep0184_marks[id] = None + del self.xep0184_marks[id] del self.xep0184_shown[id] def show_focus_out_line(self): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-22 14:13:37 UTC (rev 9980) +++ trunk/src/gajim.py 2008-07-22 14:32:37 UTC (rev 9981) @@ -773,6 +773,22 @@ # resource signs off! gajim.connections[account]. \ remove_transfers_for_contact(contact1) + + # disable encryption, since if any messages are + # lost they'll be not decryptable (note that + # this contradicts XEP-0201 - trying to get the + # in the XEP, though) + if gajim.connections[account].sessions. \ + has_key(ji): + for sess in gajim.connections \ + [account]. sessions[ji].values(): + if sess.enable_encryption: + sess.terminate_e2e() + gajim.connections \ + [account]. \ + delete_session(jid, + sess.thread_id) + self.roster.chg_contact_status(contact1, array[1], status_message, account) # Notifications @@ -786,7 +802,7 @@ elif old_show > 1 and new_show < 2: notify.notify('contact_disconnected', jid, - ccount, status_message) + account, status_message) if self.remote_ctrl: self.remote_ctrl.raise_signal( 'ContactAbsence',

1 0

[commit-gajim] r9980 - trunk/src
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-22 16:13:37 +0200 (Tue, 22 Jul 2008) New Revision: 9980 Modified: trunk/src/gajim.py Log: Coding style. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-21 22:55:03 UTC (rev 9979) +++ trunk/src/gajim.py 2008-07-22 14:13:37 UTC (rev 9980) @@ -589,15 +589,15 @@ gajim.connections[account].request_vcard(jid) def handle_event_notify(self, account, array): - # 'NOTIFY' (account, (jid, status, status message, resource, priority, - # keyID, timestamp, contact_nickname)) + # 'NOTIFY' (account, (jid, status, status message, resource, + # priority, # keyID, timestamp, contact_nickname)) # # Contact changed show # FIXME: Drop and rewrite... - statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible'] + statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', + 'dnd', 'invisible'] # Ignore invalid show if array[1] not in statuss: return @@ -622,7 +622,8 @@ else: ji = jid - highest = gajim.contacts.get_contact_with_highest_priority(account, jid) + highest = gajim.contacts. \ + get_contact_with_highest_priority(account, jid) was_highest = (highest and highest.resource == resource) # Update contact @@ -646,30 +647,42 @@ contact1.contact_name = contact_nickname self.roster.draw_contact(jid, account) - if old_show == new_show and contact1.status == status_message and \ + if old_show == new_show and \ + contact1.status == status_message and \ contact1.priority == priority: # no change return else: - contact1 = gajim.contacts.get_first_contact_from_jid(account, ji) + contact1 = gajim.contacts. \ + get_first_contact_from_jid(account, ji) if not contact1: - # Presence of another resource of our jid - # Create SelfContact and add to roster - if resource == gajim.connections[account].server_resource: + # Presence of another resource of our + # jid + # Create self contact and add to roster + if resource == gajim.connections \ + [account].server_resource: return - contact1 = gajim.contacts.create_contact(jid=ji, - name=gajim.nicks[account], groups=['self_contact'], - show=array[1], status=status_message, sub='both', ask='none', - priority=priority, keyID=keyID, resource=resource) + contact1 = gajim.contacts. \ + create_contact(jid=ji, + name=gajim.nicks[account], + groups=['self_contact'], + show=array[1], + status=status_message, + sub='both', ask='none', + priority=priority, keyID=keyID, + resource=resource) old_show = 0 - gajim.contacts.add_contact(account, contact1) + gajim.contacts.add_contact(account, + contact1) lcontact.append(contact1) elif contact1.show in statuss: old_show = statuss.index(contact1.show) - # FIXME: What Am I? + # FIXME: What am I? if (resources != [''] and (len(lcontact) != 1 or - lcontact[0].show != 'offline')) and jid.find('@') > 0: + lcontact[0].show != 'offline')) and \ + jid.find('@') > 0: old_show = 0 - contact1 = gajim.contacts.copy_contact(contact1) + contact1 = gajim.contacts. \ + copy_contact(contact1) lcontact.append(contact1) contact1.resource = resource @@ -678,20 +691,31 @@ if contact1.jid.find('@') > 0 and len(lcontact) == 1: # It's not an agent if old_show == 0 and new_show > 1: - if not contact1.jid in gajim.newly_added[account]: - gajim.newly_added[account].append(contact1.jid) - if contact1.jid in gajim.to_be_removed[account]: - gajim.to_be_removed[account].remove(contact1.jid) - gobject.timeout_add_seconds(5, self.roster.remove_newly_added, + if not contact1.jid in \ + gajim.newly_added[account]: + gajim.newly_added[account]. \ + append(contact1.jid) + if contact1.jid in \ + gajim.to_be_removed[account]: + gajim.to_be_removed[account]. \ + remove(contact1.jid) + gobject.timeout_add_seconds(5, self. \ + roster.remove_newly_added, contact1.jid, account) - elif old_show > 1 and new_show == 0 and gajim.connections[account].\ - connected > 1: - if not contact1.jid in gajim.to_be_removed[account]: - gajim.to_be_removed[account].append(contact1.jid) - if contact1.jid in gajim.newly_added[account]: - gajim.newly_added[account].remove(contact1.jid) - self.roster.draw_contact(contact1.jid, account) - gobject.timeout_add_seconds(5, self.roster.remove_to_be_removed, + elif old_show > 1 and new_show == 0 and \ + gajim.connections[account].connected > 1: + if not contact1.jid in \ + gajim.to_be_removed[account]: + gajim.to_be_removed[account]. \ + append(contact1.jid) + if contact1.jid in \ + gajim.newly_added[account]: + gajim.newly_added[account]. \ + remove(contact1.jid) + self.roster.draw_contact(contact1.jid, + account) + gobject.timeout_add_seconds(5, self. \ + roster.remove_to_be_removed, contact1.jid, account) contact1.show = array[1] contact1.status = status_message @@ -710,24 +734,33 @@ if ji in jid_list: # Update existing iter self.roster.draw_contact(ji, account) - if new_show > 1 and ji in gajim.transport_avatar[account]: - # transport just signed in. request avatars - for jid_ in gajim.transport_avatar[account][ji]: - gajim.connections[account].request_vcard(jid_) - # transport just signed in/out, don't show popup notifications - # for 30s + if new_show > 1 and ji in \ + gajim.transport_avatar[account]: + # transport just signed in. + # request avatars + for jid_ in gajim.transport_avatar \ + [account][ji]: + gajim.connections[account]. \ + request_vcard(jid_) + # transport just signed in/out, don't show + # popup notifications for 30s account_ji = account + '/' + ji - gajim.block_signed_in_notifications[account_ji] = True - gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, + gajim.block_signed_in_notifications \ + [account_ji] = True + gobject.timeout_add_seconds(30, + self.unblock_signed_in_notifications, account_ji) locations = (self.instances, self.instances[account]) for location in locations: if location.has_key('add_contact'): if old_show == 0 and new_show > 1: - location['add_contact'].transport_signed_in(jid) + location['add_contact']. \ + transport_signed_in(jid) break elif old_show > 1 and new_show == 0: - location['add_contact'].transport_signed_out(jid) + location['add_contact']. \ + transport_signed_out( + jid) break elif ji in jid_list: # It isn't an agent @@ -736,34 +769,48 @@ if array[1] in ('offline', 'error'): contact1.our_chatstate = contact1.chatstate = \ contact1.composing_xep = None - gajim.connections[account].remove_transfers_for_contact(contact1) - self.roster.chg_contact_status(contact1, array[1], status_message, - account) + # TODO: This causes problems when another + # resource signs off! + gajim.connections[account]. \ + remove_transfers_for_contact(contact1) + self.roster.chg_contact_status(contact1, array[1], + status_message, account) # Notifications if old_show < 2 and new_show > 1: - notify.notify('contact_connected', jid, account, status_message) + notify.notify('contact_connected', jid, + account, status_message) if self.remote_ctrl: - self.remote_ctrl.raise_signal('ContactPresence', + self.remote_ctrl.raise_signal( + 'ContactPresence', (account, array)) elif old_show > 1 and new_show < 2: - notify.notify('contact_disconnected', jid, account, status_message) + notify.notify('contact_disconnected', jid, + ccount, status_message) if self.remote_ctrl: - self.remote_ctrl.raise_signal('ContactAbsence', (account, array)) + self.remote_ctrl.raise_signal( + 'ContactAbsence', + (account, array)) # FIXME: stop non active file transfers - elif new_show > 1: # Status change (not connected/disconnected or error (<1)) - notify.notify('status_change', jid, account, [new_show, - status_message]) + # Status change (not connected/disconnected or + # error (<1)) + elif new_show > 1: + notify.notify('status_change', jid, account, + [new_show, status_message]) if self.remote_ctrl: - self.remote_ctrl.raise_signal('ContactStatus', (account, array)) + self.remote_ctrl.raise_signal( + 'ContactStatus', + (account, array)) else: - # FIXME: Msn transport (CMSN1.2.1 and PyMSN) doesn't follow the XEP - # still the case in 2008 - # It's maybe a GC_NOTIFY (specialy for MSN gc) - self.handle_event_gc_notify(account, (jid, array[1], status_message, - array[3], None, None, None, None, None, [], None, None)) + # FIXME: MSN transport (CMSN1.2.1 and PyMSN) don't + # follow the XEP, still the case in 2008. + # It's maybe a GC_NOTIFY (specialy for MSN gc) + self.handle_event_gc_notify(account, (jid, array[1], + status_message, array[3], None, None, None, + None, None, [], None, None)) - highest = gajim.contacts.get_contact_with_highest_priority(account, jid) + highest = gajim.contacts.get_contact_with_highest_priority( + account, jid) is_highest = (highest and highest.resource == resource) if was_highest and not is_highest:

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
23
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 July 2008