Commits March 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8050 - branches/pep/src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 10:16:58 +0200 (Sat, 31 Mar 2007) New Revision: 8050 Modified: branches/pep/src/dialogs.py Log: make moods translatable Modified: branches/pep/src/dialogs.py =================================================================== --- branches/pep/src/dialogs.py 2007-03-31 08:14:18 UTC (rev 8049) +++ branches/pep/src/dialogs.py 2007-03-31 08:16:58 UTC (rev 8050) @@ -308,13 +308,13 @@ class ChangeMoodDialog: - moods = ['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 = [_('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 __init__(self, account): self.account = account self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') self.window = self.xml.get_widget('change_mood_dialog') self.window.set_transient_for(gajim.interface.roster.window) - self.window.set_title('Mood') + self.window.set_title(_('Mood')) self.entry = self.xml.get_widget('entry')

1 0

[commit-gajim] r8049 - branches/pep/data/glade
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 10:14:18 +0200 (Sat, 31 Mar 2007) New Revision: 8049 Modified: branches/pep/data/glade/change_mood_dialog.glade Log: no need of a default height in mood dialog Modified: branches/pep/data/glade/change_mood_dialog.glade =================================================================== --- branches/pep/data/glade/change_mood_dialog.glade 2007-03-31 08:11:25 UTC (rev 8048) +++ branches/pep/data/glade/change_mood_dialog.glade 2007-03-31 08:14:18 UTC (rev 8049) @@ -10,7 +10,6 @@ <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> <property name="default_width">270</property> - <property name="default_height">175</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property>

1 0

[commit-gajim] r8048 - in branches/pep: data/glade src
by asterix＠gajim.org 31 Mar '07

31 Mar '07

Author: asterix Date: 2007-03-31 10:11:25 +0200 (Sat, 31 Mar 2007) New Revision: 8048 Modified: branches/pep/data/glade/change_mood_dialog.glade branches/pep/src/dialogs.py branches/pep/src/roster_window.py Log: make mood dialog not use blocking run() function Modified: branches/pep/data/glade/change_mood_dialog.glade =================================================================== --- branches/pep/data/glade/change_mood_dialog.glade 2007-03-31 07:48:53 UTC (rev 8047) +++ branches/pep/data/glade/change_mood_dialog.glade 2007-03-31 08:11:25 UTC (rev 8048) @@ -44,6 +44,7 @@ <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="response_id">-6</property> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:58:52 GMT"/> </widget> </child> @@ -58,6 +59,7 @@ <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="response_id">-5</property> + <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/> </widget> </child> </widget> Modified: branches/pep/src/dialogs.py =================================================================== --- branches/pep/src/dialogs.py 2007-03-31 07:48:53 UTC (rev 8047) +++ branches/pep/src/dialogs.py 2007-03-31 08:11:25 UTC (rev 8048) @@ -308,8 +308,9 @@ class ChangeMoodDialog: - def __init__(self): - self.moods = ['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 = ['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 __init__(self, account): + self.account = account self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') self.window = self.xml.get_widget('change_mood_dialog') self.window.set_transient_for(gajim.interface.roster.window) @@ -327,23 +328,24 @@ 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() - message_entry = self.xml.get_widget('entry') -# self.message_buffer = message_entry.get_buffer() - - def run(self): - '''Wait for OK or Cancel button to be pressed and return mood - and messsage (None if users pressed Cancel or x button of WM''' - rep = self.window.run() + def on_ok_button_clicked(self, widget): + '''Return mood and messsage (None if no mood selected)''' mood = None message = None - if rep == gtk.RESPONSE_OK: - mood = self.liststore[self.combo.get_active()][0].decode('utf-8') + active = self.combo.get_active() + if active > -1: + mood = self.liststore[active][0].decode('utf-8') message = self.entry.get_text().decode('utf-8') + from common import pep + pep.user_send_mood(self.account, mood, message) + self.window.destroy() + + def on_cancel_button_clicked(self, widget): self.window.destroy() - return (mood, message) - class ChangeStatusMessageDialog: def __init__(self, show = None): self.show = show Modified: branches/pep/src/roster_window.py =================================================================== --- branches/pep/src/roster_window.py 2007-03-31 07:48:53 UTC (rev 8047) +++ branches/pep/src/roster_window.py 2007-03-31 08:11:25 UTC (rev 8048) @@ -39,7 +39,6 @@ from common import passwords from common.exceptions import GajimGeneralException from common import i18n -from common import pep from message_window import MessageWindowMgr from chat_control import ChatControl @@ -2270,10 +2269,10 @@ helpers.launch_browser_mailer('url', url) def on_change_mood_activate(self, widget, account): - dlg = dialogs.ChangeMoodDialog() - (mood, message) = dlg.run() - if mood is not None: # None is if user pressed Cancel - self.send_mood(account, mood, message) + dlg = dialogs.ChangeMoodDialog(account) +# (mood, message) = dlg.run() +# if mood is not None: # None is if user pressed Cancel +# self.send_mood(account, mood, message) def on_change_status_message_activate(self, widget, account): show = gajim.SHOW_LIST[gajim.connections[account].connected] @@ -2740,9 +2739,6 @@ if gajim.interface.systray_enabled: gajim.interface.systray.change_status('connecting') - def send_mood(self, account, mood, message): - pep.user_send_mood(account, mood, message) - def send_status(self, account, status, txt, auto = False): model = self.tree.get_model() accountIter = self.get_account_iter(account)

1 0

[commit-gajim] r8047 - branches/pep/src
by doomhammer＠gajim.org 31 Mar '07

31 Mar '07

Author: doomhammer Date: 2007-03-31 09:48:53 +0200 (Sat, 31 Mar 2007) New Revision: 8047 Modified: branches/pep/src/roster_window.py Log: One more Modified: branches/pep/src/roster_window.py =================================================================== --- branches/pep/src/roster_window.py 2007-03-31 07:43:33 UTC (rev 8046) +++ branches/pep/src/roster_window.py 2007-03-31 07:48:53 UTC (rev 8047) @@ -2272,7 +2272,6 @@ def on_change_mood_activate(self, widget, account): dlg = dialogs.ChangeMoodDialog() (mood, message) = dlg.run() - mood = 'happy' if mood is not None: # None is if user pressed Cancel self.send_mood(account, mood, message)

1 0

[commit-gajim] r8046 - in branches/pep: data/glade src
by doomhammer＠gajim.org 31 Mar '07

31 Mar '07

Author: doomhammer Date: 2007-03-31 09:43:33 +0200 (Sat, 31 Mar 2007) New Revision: 8046 Modified: branches/pep/data/glade/change_mood_dialog.glade branches/pep/src/dialogs.py branches/pep/src/roster_window.py Log: Properish mood dialog Modified: branches/pep/data/glade/change_mood_dialog.glade =================================================================== --- branches/pep/data/glade/change_mood_dialog.glade 2007-03-30 23:24:12 UTC (rev 8045) +++ branches/pep/data/glade/change_mood_dialog.glade 2007-03-31 07:43:33 UTC (rev 8046) @@ -19,6 +19,7 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <property name="has_separator">True</property> <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event" last_modification_time="Wed, 16 Mar 2005 00:53:06 GMT"/> @@ -95,209 +96,40 @@ <property name="spacing">6</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow24"> + <widget class="GtkComboBox" id="combobox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="editable">True</property> - <property name="overwrite">False</property> - <property name="accepts_tab">True</property> - <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> - <property name="cursor_visible">True</property> - <property name="pixels_above_lines">0</property> - <property name="pixels_below_lines">0</property> - <property name="pixels_inside_wrap">0</property> - <property name="left_margin">0</property> - <property name="right_margin">0</property> - <property name="indent">0</property> - <property name="text" translatable="yes"></property> - </widget> - </child> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox33"> - <property name="visible">False</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="save_as_preset_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_save_as_preset_button_clicked" last_modification_time="Thu, 26 Jan 2006 17:31:47 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment106"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox3021"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1369"> - <property name="visible">True</property> - <property name="stock">gtk-save-as</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label380"> - <property name="visible">True</property> - <property name="label" translatable="yes">Save as Preset...</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3022"> - <property name="visible">False</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label165"> - <property name="visible">True</property> - <property name="label" translatable="yes">Preset messages:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="message_combobox"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_message_combobox_changed" last_modification_time="Tue, 07 Mar 2006 13:25:23 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> + <widget class="GtkEntry" id="entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> </packing> </child> </widget> </child> </widget> </child> - - <child> - <widget class="GtkLabel" id="label383"> - <property name="visible">False</property> - <property name="label" translatable="yes">Type your new status message</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> </widget> <packing> <property name="padding">0</property> Modified: branches/pep/src/dialogs.py =================================================================== --- branches/pep/src/dialogs.py 2007-03-30 23:24:12 UTC (rev 8045) +++ branches/pep/src/dialogs.py 2007-03-31 07:43:33 UTC (rev 8046) @@ -309,16 +309,28 @@ class ChangeMoodDialog: def __init__(self): + self.moods = ['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', ] self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') self.window = self.xml.get_widget('change_mood_dialog') self.window.set_transient_for(gajim.interface.roster.window) self.window.set_title('Mood') - message_textview = self.xml.get_widget('message_textview') - self.message_buffer = message_textview.get_buffer() - #self.message_buffer.connect('changed', - # self.toggle_sensitiviy_of_save_as_preset) + self.entry = self.xml.get_widget('entry') + self.combo = self.xml.get_widget('combobox') + self.liststore = gtk.ListStore(str) + self.combo.set_model(self.liststore) + + for mood in self.moods: + self.liststore.append((mood,)) + + cellrenderertext = gtk.CellRendererText() + self.combo.pack_start(cellrenderertext, True) + self.combo.add_attribute(cellrenderertext, 'text', 0) + + message_entry = self.xml.get_widget('entry') +# self.message_buffer = message_entry.get_buffer() + def run(self): '''Wait for OK or Cancel button to be pressed and return mood and messsage (None if users pressed Cancel or x button of WM''' @@ -326,10 +338,8 @@ mood = None message = None if rep == gtk.RESPONSE_OK: - beg, end = self.message_buffer.get_bounds() - message = self.message_buffer.get_text(beg, end).decode('utf-8')\ - .strip() - msg = helpers.to_one_line(message) + mood = self.liststore[self.combo.get_active()][0].decode('utf-8') + message = self.entry.get_text().decode('utf-8') self.window.destroy() return (mood, message) Modified: branches/pep/src/roster_window.py =================================================================== --- branches/pep/src/roster_window.py 2007-03-30 23:24:12 UTC (rev 8045) +++ branches/pep/src/roster_window.py 2007-03-31 07:43:33 UTC (rev 8046) @@ -2273,7 +2273,6 @@ dlg = dialogs.ChangeMoodDialog() (mood, message) = dlg.run() mood = 'happy' - print account, mood, message if mood is not None: # None is if user pressed Cancel self.send_mood(account, mood, message)

1 0

[commit-gajim] r8045 - in branches/pep/src: . common
by doomhammer＠gajim.org 30 Mar '07

30 Mar '07

Author: doomhammer Date: 2007-03-31 01:24:12 +0200 (Sat, 31 Mar 2007) New Revision: 8045 Modified: branches/pep/src/common/pep.py branches/pep/src/tooltips.py Log: Activity and Mood in tooltips now bug-free (:P) Modified: branches/pep/src/common/pep.py =================================================================== --- branches/pep/src/common/pep.py 2007-03-30 22:52:11 UTC (rev 8044) +++ branches/pep/src/common/pep.py 2007-03-30 23:24:12 UTC (rev 8045) @@ -1,18 +1,20 @@ from common import gajim, xmpp def user_mood(items, name, jid): - #FIXME: text deletion (user, resource) = gajim.get_room_and_nick_from_fjid(jid) contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): child = item.getTag('mood') if child is not None: - for ch in child.getChildren(): - if ch.getName() != 'text': - for contact in contacts: + for contact in contacts: + if contact.mood.has_key('mood'): + del contact.mood['mood'] + if contact.mood.has_key('text'): + del contact.mood['text'] + for ch in child.getChildren(): + if ch.getName() != 'text': contact.mood['mood'] = ch.getName() - else: - for contact in contacts: + else: contact.mood['text'] = ch.getData() def user_tune(items, name, jid): @@ -22,21 +24,24 @@ pass def user_activity(items, name, jid): - #FIXME: text deletion (user, resource) = gajim.get_room_and_nick_from_fjid(jid) contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): child = item.getTag('activity') if child is not None: - for ch in child.getChildren(): - if ch.getName() != 'text': - for contact in contacts: + for contact in contacts: + if contact.activity.has_key('activity'): + del contact.activity['activity'] + if contact.activity.has_key('subactivity'): + del contact.activity['subactivity'] + if contact.activity.has_key('text'): + del contact.activity['text'] + for ch in child.getChildren(): + if ch.getName() != 'text': contact.activity['activity'] = ch.getName() - for chi in ch.getChildren(): - for contact in contacts: + for chi in ch.getChildren(): contact.activity['subactivity'] = chi.getName() - else: - for contact in contacts: + else: contact.activity['text'] = ch.getData() def user_send_mood(account, mood, message = ''): Modified: branches/pep/src/tooltips.py =================================================================== --- branches/pep/src/tooltips.py 2007-03-30 22:52:11 UTC (rev 8044) +++ branches/pep/src/tooltips.py 2007-03-30 23:24:12 UTC (rev 8045) @@ -479,13 +479,10 @@ # we append show below if contact.mood.has_key('mood'): - mood = contact.mood['mood'].strip() - if contact.mood.has_key('text'): - mood_text = contact.mood['text'].strip() - else: - mood_text = '' - if mood: - properties.append(('Mood: %s (%s)' % (mood, mood_text), None)) + mood_string = 'Mood: %s' % contact.mood['mood'].strip() + if contact.mood.has_key('text') and contact.mood['text'] != '': + mood_string += ' (%s)' % contact.mood['text'].strip() + properties.append((mood_string, None)) if contact.activity.has_key('activity'): activity = contact.activity['activity'].strip()

1 0

[commit-gajim] r8044 - in branches/pep: data/glade src src/common
by doomhammer＠gajim.org 30 Mar '07

30 Mar '07

Author: doomhammer Date: 2007-03-31 00:52:11 +0200 (Sat, 31 Mar 2007) New Revision: 8044 Added: branches/pep/data/glade/change_mood_dialog.glade Modified: branches/pep/data/glade/account_context_menu.glade branches/pep/src/common/pep.py branches/pep/src/dialogs.py branches/pep/src/roster_window.py Log: Setting mood now supported (crappy). Modified: branches/pep/data/glade/account_context_menu.glade =================================================================== --- branches/pep/data/glade/account_context_menu.glade 2007-03-30 19:16:44 UTC (rev 8043) +++ branches/pep/data/glade/account_context_menu.glade 2007-03-30 22:52:11 UTC (rev 8044) @@ -26,6 +26,26 @@ </child> <child> + <widget class="GtkImageMenuItem" id="pep_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Personal Events</property> + <property name="use_underline">True</property> + + <child internal-child="image"> + <widget class="GtkImage" id="image1235"> + <property name="visible">True</property> + <property name="stock">gtk-home</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkImageMenuItem" id="join_group_chat_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">_Group Chat</property> Added: branches/pep/data/glade/change_mood_dialog.glade =================================================================== --- branches/pep/data/glade/change_mood_dialog.glade (rev 0) +++ branches/pep/data/glade/change_mood_dialog.glade 2007-03-30 22:52:11 UTC (rev 8044) @@ -0,0 +1,312 @@ +<?xml version="1.0" standalone="no"?>  +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkDialog" id="change_mood_dialog"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">False</property> + <property name="default_width">270</property> + <property name="default_height">175</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="has_separator">True</property> + <signal name="key_press_event" handler="on_change_status_message_dialog_key_press_event" last_modification_time="Wed, 16 Mar 2005 00:53:06 GMT"/> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="ok_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-ok</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-5</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame38"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment107"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox112"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow24"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTextView" id="message_textview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="editable">True</property> + <property name="overwrite">False</property> + <property name="accepts_tab">True</property> + <property name="justification">GTK_JUSTIFY_LEFT</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="cursor_visible">True</property> + <property name="pixels_above_lines">0</property> + <property name="pixels_below_lines">0</property> + <property name="pixels_inside_wrap">0</property> + <property name="left_margin">0</property> + <property name="right_margin">0</property> + <property name="indent">0</property> + <property name="text" translatable="yes"></property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHButtonBox" id="hbuttonbox33"> + <property name="visible">False</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkButton" id="save_as_preset_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_save_as_preset_button_clicked" last_modification_time="Thu, 26 Jan 2006 17:31:47 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment106"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox3021"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image1369"> + <property name="visible">True</property> + <property name="stock">gtk-save-as</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label380"> + <property name="visible">True</property> + <property name="label" translatable="yes">Save as Preset...</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox3022"> + <property name="visible">False</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label165"> + <property name="visible">True</property> + <property name="label" translatable="yes">Preset messages:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="message_combobox"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_message_combobox_changed" last_modification_time="Tue, 07 Mar 2006 13:25:23 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label383"> + <property name="visible">False</property> + <property name="label" translatable="yes">Type your new status message</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> Modified: branches/pep/src/common/pep.py =================================================================== --- branches/pep/src/common/pep.py 2007-03-30 19:16:44 UTC (rev 8043) +++ branches/pep/src/common/pep.py 2007-03-30 22:52:11 UTC (rev 8044) @@ -1,9 +1,8 @@ -from common import gajim -#from common import helpers +from common import gajim, xmpp def user_mood(items, name, jid): + #FIXME: text deletion (user, resource) = gajim.get_room_and_nick_from_fjid(jid) - print 'User: %s, Resource: %s' % (user, resource) contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): child = item.getTag('mood') @@ -23,6 +22,7 @@ pass def user_activity(items, name, jid): + #FIXME: text deletion (user, resource) = gajim.get_room_and_nick_from_fjid(jid) contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): @@ -38,3 +38,12 @@ else: for contact in contacts: contact.activity['text'] = ch.getData() + +def user_send_mood(account, mood, message = ''): + item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) + item.addChild(mood) + if message != '': + i = item.addChild('text') + i.addData(message) + + gajim.connections[account].send_pb_publish('', xmpp.NS_MOOD, item, '0') Modified: branches/pep/src/dialogs.py =================================================================== --- branches/pep/src/dialogs.py 2007-03-30 19:16:44 UTC (rev 8043) +++ branches/pep/src/dialogs.py 2007-03-30 22:52:11 UTC (rev 8044) @@ -307,6 +307,33 @@ self.keys_treeview.set_cursor(path) +class ChangeMoodDialog: + def __init__(self): + self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade') + self.window = self.xml.get_widget('change_mood_dialog') + self.window.set_transient_for(gajim.interface.roster.window) + self.window.set_title('Mood') + + message_textview = self.xml.get_widget('message_textview') + self.message_buffer = message_textview.get_buffer() + #self.message_buffer.connect('changed', + # self.toggle_sensitiviy_of_save_as_preset) + + def run(self): + '''Wait for OK or Cancel button to be pressed and return mood + and messsage (None if users pressed Cancel or x button of WM''' + rep = self.window.run() + mood = None + message = None + if rep == gtk.RESPONSE_OK: + beg, end = self.message_buffer.get_bounds() + message = self.message_buffer.get_text(beg, end).decode('utf-8')\ + .strip() + msg = helpers.to_one_line(message) + self.window.destroy() + return (mood, message) + + class ChangeStatusMessageDialog: def __init__(self, show = None): self.show = show Modified: branches/pep/src/roster_window.py =================================================================== --- branches/pep/src/roster_window.py 2007-03-30 19:16:44 UTC (rev 8043) +++ branches/pep/src/roster_window.py 2007-03-30 22:52:11 UTC (rev 8044) @@ -39,6 +39,7 @@ from common import passwords from common.exceptions import GajimGeneralException from common import i18n +from common import pep from message_window import MessageWindowMgr from chat_control import ChatControl @@ -2268,6 +2269,14 @@ gajim.config.get_per('accounts', account, 'name')) helpers.launch_browser_mailer('url', url) + def on_change_mood_activate(self, widget, account): + dlg = dialogs.ChangeMoodDialog() + (mood, message) = dlg.run() + mood = 'happy' + print account, mood, message + if mood is not None: # None is if user pressed Cancel + self.send_mood(account, mood, message) + def on_change_status_message_activate(self, widget, account): show = gajim.SHOW_LIST[gajim.connections[account].connected] dlg = dialogs.ChangeStatusMessageDialog(show) @@ -2330,6 +2339,17 @@ sub_menu.append(item) item.connect('activate', self.change_status, account, 'offline') + pep_menuitem = xml.get_widget('pep_menuitem') + if gajim.connections[account].pep_supported: + pep_submenu = gtk.Menu() + pep_menuitem.set_submenu(pep_submenu) + item = gtk.MenuItem('Mood') + pep_submenu.append(item) + item.connect('activate', self.on_change_mood_activate, account) + else: + pep_menuitem.set_no_show_all(True) + pep_menuitem.hide() + if gajim.config.get_per('accounts', account, 'hostname') not in \ gajim.gmail_domains: open_gmail_inbox_menuitem.set_no_show_all(True) @@ -2359,7 +2379,7 @@ if gajim.connections[account].connected < 2: for widget in [add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, new_message_menuitem, - execute_command_menuitem]: + execute_command_menuitem, pep_menuitem]: widget.set_sensitive(False) else: xml = gtkgui_helpers.get_glade('zeroconf_context_menu.glade') @@ -2722,6 +2742,9 @@ if gajim.interface.systray_enabled: gajim.interface.systray.change_status('connecting') + def send_mood(self, account, mood, message): + pep.user_send_mood(account, mood, message) + def send_status(self, account, status, txt, auto = False): model = self.tree.get_model() accountIter = self.get_account_iter(account)

1 0

[commit-gajim] r8043 - in branches/pep/src/common: . zeroconf
by asterix＠gajim.org 30 Mar '07

30 Mar '07

Author: asterix Date: 2007-03-30 21:16:44 +0200 (Fri, 30 Mar 2007) New Revision: 8043 Modified: branches/pep/src/common/connection.py branches/pep/src/common/connection_handlers.py branches/pep/src/common/zeroconf/connection_zeroconf.py Log: add pep_supported var to pep branch too Modified: branches/pep/src/common/connection.py =================================================================== --- branches/pep/src/common/connection.py 2007-03-30 19:14:07 UTC (rev 8042) +++ branches/pep/src/common/connection.py 2007-03-30 19:16:44 UTC (rev 8043) @@ -81,6 +81,7 @@ else: self.keepalives = 0 self.privacy_rules_supported = False + self.pep_supported = False # Do we continue connection when we get roster (send presence,get vcard...) self.continue_connect_info = None if USE_GPG: Modified: branches/pep/src/common/connection_handlers.py =================================================================== --- branches/pep/src/common/connection_handlers.py 2007-03-30 19:14:07 UTC (rev 8042) +++ branches/pep/src/common/connection_handlers.py 2007-03-30 19:16:44 UTC (rev 8043) @@ -794,6 +794,12 @@ #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 identities = [{'category': 'server', 'type': 'im', 'name': node}] if id[0] == 'p': + if jid == gajim.config.get_per('accounts', self.name, 'hostname'): + for identity in identities: + if identity['category'] == 'pubsub' and identity['type'] == \ + 'pep': + self.pep_supported = True + break if features.__contains__(common.xmpp.NS_BYTESTREAM): gajim.proxy65_manager.resolve(jid, self.connection, self.name) if features.__contains__(common.xmpp.NS_MUC) and is_muc: @@ -1860,6 +1866,8 @@ gajim.proxy65_manager.resolve(proxy, self.connection) self.discoverItems(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='p') + self.discoverInfo(gajim.config.get_per('accounts', self.name, + 'hostname'), id_prefix='p') def _on_roster_set(self, roster): raw_roster = roster.getRaw() Modified: branches/pep/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/pep/src/common/zeroconf/connection_zeroconf.py 2007-03-30 19:14:07 UTC (rev 8042) +++ branches/pep/src/common/zeroconf/connection_zeroconf.py 2007-03-30 19:16:44 UTC (rev 8043) @@ -74,6 +74,7 @@ self.sync_with_global_status = True self.no_log_for = False + self.pep_supported = False # Do we continue connection when we get roster (send presence,get vcard...) self.continue_connect_info = None if USE_GPG:

1 0

[commit-gajim] r8042 - trunk/src/common/zeroconf
by asterix＠gajim.org 30 Mar '07

30 Mar '07

Author: asterix Date: 2007-03-30 21:14:07 +0200 (Fri, 30 Mar 2007) New Revision: 8042 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: add pep_supported var to zeroconf too (always False there) Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-03-30 19:12:46 UTC (rev 8041) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-03-30 19:14:07 UTC (rev 8042) @@ -75,6 +75,7 @@ self.sync_with_global_status = True self.no_log_for = False + self.pep_supported = False # Do we continue connection when we get roster (send presence,get vcard...) self.continue_connect_info = None if USE_GPG:

1 0

[commit-gajim] r8041 - trunk/src/common
by asterix＠gajim.org 30 Mar '07

30 Mar '07

Author: asterix Date: 2007-03-30 21:12:46 +0200 (Fri, 30 Mar 2007) New Revision: 8041 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py Log: add a pep_supported variable to Connection class. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-30 18:42:58 UTC (rev 8040) +++ trunk/src/common/connection.py 2007-03-30 19:12:46 UTC (rev 8041) @@ -87,6 +87,7 @@ else: self.keepalives = 0 self.privacy_rules_supported = False + self.pep_supported = False # Do we continue connection when we get roster (send presence,get vcard...) self.continue_connect_info = None if USE_GPG: Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-03-30 18:42:58 UTC (rev 8040) +++ trunk/src/common/connection_handlers.py 2007-03-30 19:12:46 UTC (rev 8041) @@ -787,6 +787,12 @@ #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 identities = [{'category': 'server', 'type': 'im', 'name': node}] if id[0] == 'p': + if jid == gajim.config.get_per('accounts', self.name, 'hostname'): + for identity in identities: + if identity['category'] == 'pubsub' and identity['type'] == \ + 'pep': + self.pep_supported = True + break if features.__contains__(common.xmpp.NS_BYTESTREAM): gajim.proxy65_manager.resolve(jid, self.connection, self.name) if features.__contains__(common.xmpp.NS_MUC) and is_muc: @@ -1839,6 +1845,8 @@ gajim.proxy65_manager.resolve(proxy, self.connection) self.discoverItems(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='p') + self.discoverInfo(gajim.config.get_per('accounts', self.name, + 'hostname'), id_prefix='p') def _on_roster_set(self, roster): raw_roster = roster.getRaw()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007