Commits July 2008

commits@gajim.org

7 participants
229 discussions

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

22 Jul '08

Author: js Date: 2008-07-23 01:39:45 +0200 (Wed, 23 Jul 2008) New Revision: 9999 Modified: trunk/src/common/pep.py Log: Update tune in converstaion window. Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-22 23:34:45 UTC (rev 9998) +++ trunk/src/common/pep.py 2008-07-22 23:39:45 UTC (rev 9999) @@ -159,6 +159,10 @@ if contact.tune.has_key('length'): del contact.tune['length'] + ctrl = gajim.interface.msg_win_mgr.get_control(user, name) + if ctrl: + ctrl.update_tune() + def user_geoloc(items, name, jid): pass

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:34:45 +0200 (Wed, 23 Jul 2008) New Revision: 9998 Modified: trunk/src/dialogs.py Log: Mood still wasn't translatable at some places. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-22 23:30:52 UTC (rev 9997) +++ trunk/src/dialogs.py 2008-07-22 23:34:45 UTC (rev 9998) @@ -488,7 +488,8 @@ con = gajim.connections[account] if 'mood' in con.mood: self.mood = con.mood['mood'] - self.label.set_text(con.mood['mood']) + self.label.set_text(_( + con.mood['mood'].replace('_', ' '))) if con.mood['mood'] in pep.MOODS: self.mood_buttons[con.mood['mood']]. \ set_active(True) @@ -502,9 +503,8 @@ self.window.show_all() def on_mood_button_clicked(self, widget, data): - self.label.set_text(_(data)) - if data: + self.label.set_text(_(data.replace('_', ' '))) self.entry.set_sensitive(True) else: self.entry.set_text('')

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:30:52 +0200 (Wed, 23 Jul 2008) New Revision: 9997 Modified: trunk/src/chat_control.py Log: Be consistent in the chat window. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-22 23:27:53 UTC (rev 9996) +++ trunk/src/chat_control.py 2008-07-22 23:30:52 UTC (rev 9997) @@ -1214,7 +1214,7 @@ gtkgui_helpers.load_mood_icon( mood).get_pixbuf()) # Translate standard moods - mood = _(mood) + mood = _(mood.replace('_', ' ')) else: self._mood_image.set_from_pixbuf( gtkgui_helpers.load_mood_icon(

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:27:53 +0200 (Wed, 23 Jul 2008) New Revision: 9996 Modified: trunk/src/tooltips.py Log: Make mood in tooltip translatable. Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-22 23:25:27 UTC (rev 9995) +++ trunk/src/tooltips.py 2008-07-22 23:27:53 UTC (rev 9996) @@ -574,7 +574,8 @@ if contact.mood.has_key('mood'): mood = contact.mood['mood'].strip() mood = gobject.markup_escape_text(mood) - mood_string = _('Mood:') + ' %s' % mood + mood_string = _('Mood:') + ' %s' % \ + _(mood.replace('_', ' ')) if contact.mood.has_key('text') \ and contact.mood['text'] != '': mood_text = contact.mood['text'].strip()

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:25:27 +0200 (Wed, 23 Jul 2008) New Revision: 9995 Modified: trunk/src/tooltips.py Log: More coding style. (Do I always have to fix the coding style first before I can work with it? Damn, that's annoying! My terminal has a width of 80 chars, what's so hard about using the 80 chars width we have specified in the coding style?) Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-22 23:22:49 UTC (rev 9994) +++ trunk/src/tooltips.py 2008-07-22 23:25:27 UTC (rev 9995) @@ -567,16 +567,19 @@ self.win.add(vcard_table) def _append_pep_info(self, contact, properties): - '''Append Tune, Mood, Activity information of the specified contact + ''' + Append Tune, Mood, Activity information of the specified contact to the given property list. ''' if contact.mood.has_key('mood'): mood = contact.mood['mood'].strip() mood = gobject.markup_escape_text(mood) mood_string = _('Mood:') + ' %s' % mood - if contact.mood.has_key('text') and contact.mood['text'] != '': + if contact.mood.has_key('text') \ + and contact.mood['text'] != '': mood_text = contact.mood['text'].strip() - mood_text = gobject.markup_escape_text(mood_text) + mood_text = \ + gobject.markup_escape_text(mood_text) mood_string += ' (%s)' % mood_text properties.append((mood_string, None)) @@ -585,18 +588,22 @@ activity = gobject.markup_escape_text(activity) activity_string = _('Activity:') + ' %s' % activity if contact.activity.has_key('subactivity'): - activity_sub = contact.activity['subactivity'].strip() - activity_sub = gobject.markup_escape_text(activity_sub) + activity_sub = \ + contact.activity['subactivity'].strip() + activity_sub = \ + gobject.markup_escape_text(activity_sub) activity_string += ' (%s)' % activity_sub else: activity_string += '' if contact.activity.has_key('text'): activity_text = contact.activity['text'].strip() - activity_text = gobject.markup_escape_text(activity_text) + activity_text = gobject.markup_escape_text( + activity_text) activity_string += ' (%s)' % activity_text properties.append((activity_string, None)) - if contact.tune.has_key('artist') or contact.tune.has_key('title'): + if contact.tune.has_key('artist') \ + or contact.tune.has_key('title'): if contact.tune.has_key('artist'): artist = contact.tune['artist'].strip() artist = gobject.markup_escape_text(artist)

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:22:49 +0200 (Wed, 23 Jul 2008) New Revision: 9994 Modified: trunk/src/common/pep.py Log: Coding style. Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-07-22 23:16:35 UTC (rev 9993) +++ trunk/src/common/pep.py 2008-07-22 23:22:49 UTC (rev 9994) @@ -248,7 +248,8 @@ if has_child: gajim.nicks[name] = nick if retract: - gajim.nicks[name] = gajim.config.get_per('accounts', name, 'name') + gajim.nicks[name] = gajim.config.get_per('accounts', + name, 'name') (user, resource) = gajim.get_room_and_nick_from_fjid(jid) if has_child: @@ -257,7 +258,8 @@ contact.contact_name = nick gajim.interface.roster.draw_contact(user, name) - ctrl = gajim.interface.msg_win_mgr.get_control(user, name) + ctrl = gajim.interface.msg_win_mgr.get_control(user, + name) if ctrl: ctrl.update_ui() win = ctrl.parent_win @@ -290,9 +292,11 @@ i = item.addChild('text') i.addData(message) - gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, item, '0') + gajim.connections[account].send_pb_publish('', xmpp.NS_ACTIVITY, + item, '0') -def user_send_tune(account, artist = '', title = '', source = '', track = 0,length = 0, items = None): +def user_send_tune(account, artist = '', title = '', source = '', track = 0, +length = 0, items = None): if not (gajim.config.get_per('accounts', account, 'publish_tune') and \ gajim.connections[account].pep_supported): return

1 0

[commit-gajim] r9993 - trunk/data/glade
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-23 01:16:35 +0200 (Wed, 23 Jul 2008) New Revision: 9993 Modified: trunk/data/glade/message_window.glade Log: Stupid glade! I hate it! Why does it copy the image locallly to the glade dir and fuck the URL up then? Fixed... Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-22 23:13:58 UTC (rev 9992) +++ trunk/data/glade/message_window.glade 2008-07-22 23:16:35 UTC (rev 9993) @@ -70,14 +70,14 @@ <child> <widget class="GtkImage" id="mood_image"> <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> + <property name="stock">None</property> <property name="icon_size">1</property> </widget> </child> <child> <widget class="GtkImage" id="activity_image"> <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> + <property name="stock">None</property> <property name="icon_size">1</property> </widget> <packing> @@ -87,7 +87,7 @@ <child> <widget class="GtkImage" id="tune_image"> <property name="no_show_all">True</property> - <property name="pixbuf">music.png</property> + <property name="pixbuf">../emoticons/static/music.png</property> <property name="icon_size">1</property> </widget> <packing>

1 0

[commit-gajim] r9992 - trunk/data/glade
by js＠gajim.org 22 Jul '08

22 Jul '08

Author: js Date: 2008-07-23 01:13:58 +0200 (Wed, 23 Jul 2008) New Revision: 9992 Modified: trunk/data/glade/message_window.glade Log: More spacing looks better. Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-22 23:11:30 UTC (rev 9991) +++ trunk/data/glade/message_window.glade 2008-07-22 23:13:58 UTC (rev 9992) @@ -66,7 +66,7 @@ <child> <widget class="GtkHBox" id="hbox2"> <property name="visible">True</property> - <property name="spacing">2</property> + <property name="spacing">4</property> <child> <widget class="GtkImage" id="mood_image"> <property name="no_show_all">True</property>

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:11:30 +0200 (Wed, 23 Jul 2008) New Revision: 9991 Modified: trunk/src/dialogs.py Log: Replace _ in moods by space. Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-22 23:06:58 UTC (rev 9990) +++ trunk/src/dialogs.py 2008-07-22 23:11:30 UTC (rev 9991) @@ -472,7 +472,8 @@ 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].set_tooltip_text( + _(mood.replace('_', ' '))) self.mood_buttons[mood].connect('clicked', self.on_mood_button_clicked, mood) table.attach(self.mood_buttons[mood],

1 0

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

22 Jul '08

Author: js Date: 2008-07-23 01:06:58 +0200 (Wed, 23 Jul 2008) New Revision: 9990 Modified: trunk/data/glade/message_window.glade trunk/src/chat_control.py trunk/src/tooltips.py Log: Show user tune in conversation window. Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-22 23:03:33 UTC (rev 9989) +++ trunk/data/glade/message_window.glade 2008-07-22 23:06:58 UTC (rev 9990) @@ -71,12 +71,14 @@ <widget class="GtkImage" id="mood_image"> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> </widget> </child> <child> <widget class="GtkImage" id="activity_image"> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> </widget> <packing> <property name="position">1</property> @@ -85,7 +87,8 @@ <child> <widget class="GtkImage" id="tune_image"> <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> + <property name="pixbuf">music.png</property> + <property name="icon_size">1</property> </widget> <packing> <property name="position">2</property> Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-22 23:03:33 UTC (rev 9989) +++ trunk/src/chat_control.py 2008-07-22 23:06:58 UTC (rev 9990) @@ -1090,6 +1090,7 @@ self._tune_image = self.xml.get_widget('tune_image') self.update_mood() + self.update_tune() # keep timeout id and window obj for possible big avatar # it is on enter-notify and leave-notify so no need to be @@ -1225,6 +1226,34 @@ else: self._mood_image.hide() + def update_tune(self): + artist = None + title = None + source = None + + if self.contact.tune.has_key('artist'): + artist = gobject.markup_escape_text( + self.contact.tune['artist'].strip()) + if self.contact.tune.has_key('title'): + title = gobject.markup_escape_text( + self.contact.tune['title'].strip()) + if self.contact.tune.has_key('source'): + title = gobject.markup_escape_text( + self.contact.tune['source'].strip()) + + if artist or title: + artist = artist if artist else _('Unknown Artist') + title = title if title else _('Unknown Title') + source = source if source else _('Unknown Source') + + self._tune_image.set_tooltip_markup(_( + '"%(title)s" by %(artist)s\n' + + 'from %(source)s') % {'title': title, + 'artist': artist, 'source': source}) + self._tune_image.show() + else: + self._tune_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/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-07-22 23:03:33 UTC (rev 9989) +++ trunk/src/tooltips.py 2008-07-22 23:06:58 UTC (rev 9990) @@ -612,9 +612,9 @@ source = gobject.markup_escape_text(source) else: source = _('Unknown Source') - tune_string = _('Tune:') + ' ' + _('"%(title)s"' + - ' by %(artist)s\nfrom ' + - '%(source)s') % {'title': title, + tune_string = _('Tune:') + ' ' + \ + _('"%(title)s by %(artist)s\n' + + 'from %(source)s') % {'title': title, 'artist': artist, 'source': source} properties.append((tune_string, None))

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
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