Commits April 2010

commits@gajim.org

7 participants
72 discussions

gajim: Make GCTooltip behave more like the RosterTooltip
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset b79c7c573a8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b79c7c573a8a description: Make GCTooltip behave more like the RosterTooltip diffstat: src/tooltips.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (18 lines): diff -r 641d3093bfe7 -r b79c7c573a8a src/tooltips.py --- a/src/tooltips.py Sat Apr 03 20:55:14 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 21:08:09 2010 +0300 @@ -366,10 +366,10 @@ status = '' +\ gobject.markup_escape_text(status) + '' properties.append((status, None)) - else: # no status message, show SHOW instead - show = helpers.get_uf_show(contact.show) - show = self.colorize_status(show) - properties.append((show, None)) + + show = helpers.get_uf_show(contact.show) + show = self.colorize_status(show) + properties.append((show, None)) if contact.jid.strip() != '': properties.append((_('Jabber ID: '), contact.jid))

1 0

gajim: Fixed the case inaccuracy in Russian translation
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 641d3093bfe7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=641d3093bfe7 description: Fixed the case inaccuracy in Russian translation diffstat: po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 822fb5911d8a -r 641d3093bfe7 po/ru.po --- a/po/ru.po Sat Apr 03 20:49:31 2010 +0300 +++ b/po/ru.po Sat Apr 03 20:55:14 2010 +0300 @@ -9235,12 +9235,12 @@ #: ../src/tooltips.py:630 #, python-format msgid "Idle since %s" -msgstr "бездействует с %s" +msgstr "Бездействует с %s" #: ../src/tooltips.py:631 #, python-format msgid "Idle for %s" -msgstr "время бездействия %s" +msgstr "Время бездействия %s" #: ../src/tooltips.py:682 #, python-format

1 0

gajim: Reflect recent changes in translation
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 822fb5911d8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=822fb5911d8a description: Reflect recent changes in translation diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b7b81a004b9e -r 822fb5911d8a src/common/helpers.py --- a/src/common/helpers.py Sat Apr 03 20:46:57 2010 +0300 +++ b/src/common/helpers.py Sat Apr 03 20:49:31 2010 +0300 @@ -221,7 +221,7 @@ uf_show = _('Free for Chat') elif show == 'online': if use_mnemonic: - uf_show = _('_Available') + uf_show = Q_('?user status:_Available') else: uf_show = Q_('?user status:Available') elif show == 'connecting':

1 0

gajim: Fixed the translation issue with the tooltip
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset b7b81a004b9e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b7b81a004b9e description: Fixed the translation issue with the tooltip diffstat: src/tooltips.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r a170699607cc -r b7b81a004b9e src/tooltips.py --- a/src/tooltips.py Sat Apr 03 20:23:15 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 20:46:57 2010 +0300 @@ -41,6 +41,7 @@ from common import gajim from common import helpers from common.pep import MOODS, ACTIVITIES +from common.i18n import Q_ class BaseTooltip: """ @@ -185,7 +186,7 @@ semantics. Color palette is the Tango. """ formatted = "%s" - if status.startswith(_("Available")): + if status.startswith(Q_("?user status:Available")): status = formatted % ('#73D216', status) elif status.startswith(_("Free for Chat")): status = formatted % ('#3465A4', status)

1 0

gajim: Fixed the pattern to be PEP8 compatible
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset a170699607cc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a170699607cc description: Fixed the pattern to be PEP8 compatible diffstat: src/tooltips.py | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diffs (33 lines): diff -r 0aea6b519ffa -r a170699607cc src/tooltips.py --- a/src/tooltips.py Sat Apr 03 16:31:08 2010 +0000 +++ b/src/tooltips.py Sat Apr 03 20:23:15 2010 +0300 @@ -186,22 +186,18 @@ """ formatted = "%s" if status.startswith(_("Available")): - return formatted % ('#73D216', status) + status = formatted % ('#73D216', status) elif status.startswith(_("Free for Chat")): - return formatted % ('#3465A4', status) + status = formatted % ('#3465A4', status) elif status.startswith(_("Away")): - return formatted % ('#EDD400', status) + status = formatted % ('#EDD400', status) elif status.startswith(_("Busy")): - return formatted % ('#F57900', status) + status = formatted % ('#F57900', status) elif status.startswith(_("Not Available")): - return formatted % ('#CC0000', status) + status = formatted % ('#CC0000', status) elif status.startswith(_("Offline")): - return formatted % ('#555753', status) - else: - # A fallback reserved for probable changes that might occur - # in the future, so if status names will change -- tooltip - # population should not fail. - return status + status = formatted % ('#555753', status) + return status class StatusTable: """

1 0

gajim: Missed the Busy translation
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 3ca6ee3bd4fd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ca6ee3bd4fd description: Missed the Busy translation diffstat: src/tooltips.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 37829aa39dee -r 3ca6ee3bd4fd src/tooltips.py --- a/src/tooltips.py Sat Apr 03 18:40:40 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 18:50:26 2010 +0300 @@ -191,7 +191,7 @@ return formatted % ('#3465A4', status) elif status.startswith(_("Away")): return formatted % ('#EDD400', status) - elif status.startswith("Busy"): + elif status.startswith(_("Busy")): return formatted % ('#F57900', status) elif status.startswith(_("Not Available")): return formatted % ('#CC0000', status)

1 0

gajim: A condition typo
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 37829aa39dee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37829aa39dee description: A condition typo diffstat: src/tooltips.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1b094c5da836 -r 37829aa39dee src/tooltips.py --- a/src/tooltips.py Sat Apr 03 18:37:41 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 18:40:40 2010 +0300 @@ -624,7 +624,7 @@ # Do not show the "Idle since" and "Idle for" items if there # is no meaningful difference between last activity time and # current time. - if diff.days > 0 and diff.seconds > 0: + if diff.days > 0 or diff.seconds > 0: cs = "%s" properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None))

1 0

gajim: Do not show the idle time in the tooltip, unless it's mea...
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 1b094c5da836 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1b094c5da836 description: Do not show the idle time in the tooltip, unless it's meaningful diffstat: src/tooltips.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diffs (22 lines): diff -r 0bbabe714b5e -r 1b094c5da836 src/tooltips.py --- a/src/tooltips.py Sat Apr 03 18:17:54 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 18:37:41 2010 +0300 @@ -621,10 +621,14 @@ else: formatted = last_active.strftime("%c") - cs = "%s" - properties.append((str(), None)) - properties.append(((cs % _("Idle since %s")) % formatted, None)) - properties.append(((cs % _("Idle for %s")) % str(diff), None)) + # Do not show the "Idle since" and "Idle for" items if there + # is no meaningful difference between last activity time and + # current time. + if diff.days > 0 and diff.seconds > 0: + cs = "%s" + properties.append((str(), None)) + properties.append(((cs % _("Idle since %s")) % formatted, None)) + properties.append(((cs % _("Idle for %s")) % str(diff), None)) while properties: property_ = properties.pop(0)

1 0

gajim: Made a fix to consider translation of a status
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 0bbabe714b5e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0bbabe714b5e description: Made a fix to consider translation of a status diffstat: src/tooltips.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (26 lines): diff -r aa15e2920e4a -r 0bbabe714b5e src/tooltips.py --- a/src/tooltips.py Sat Apr 03 18:06:42 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 18:17:54 2010 +0300 @@ -185,17 +185,17 @@ semantics. Color palette is the Tango. """ formatted = "%s" - if status.startswith("Available"): + if status.startswith(_("Available")): return formatted % ('#73D216', status) - elif status.startswith("Free for Chat"): + elif status.startswith(_("Free for Chat")): return formatted % ('#3465A4', status) - elif status.startswith("Away"): + elif status.startswith(_("Away")): return formatted % ('#EDD400', status) elif status.startswith("Busy"): return formatted % ('#F57900', status) - elif status.startswith("Not Available"): + elif status.startswith(_("Not Available")): return formatted % ('#CC0000', status) - elif status.startswith("Offline"): + elif status.startswith(_("Offline")): return formatted % ('#555753', status) else: # A fallback reserved for probable changes that might occur

1 0

gajim: Improved roster's tooltip cosmetics
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset aa15e2920e4a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aa15e2920e4a description: Improved roster's tooltip cosmetics diffstat: src/tooltips.py | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diffs (76 lines): diff -r fd432ca76b76 -r aa15e2920e4a src/tooltips.py --- a/src/tooltips.py Sat Apr 03 14:38:12 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 18:06:42 2010 +0300 @@ -178,6 +178,31 @@ self.cur_data = None self.check_last_time = None + @staticmethod + def colorize_status(status): + """ + Colorize the status message inside the tooltip by it's + semantics. Color palette is the Tango. + """ + formatted = "%s" + if status.startswith("Available"): + return formatted % ('#73D216', status) + elif status.startswith("Free for Chat"): + return formatted % ('#3465A4', status) + elif status.startswith("Away"): + return formatted % ('#EDD400', status) + elif status.startswith("Busy"): + return formatted % ('#F57900', status) + elif status.startswith("Not Available"): + return formatted % ('#CC0000', status) + elif status.startswith("Offline"): + return formatted % ('#555753', status) + else: + # A fallback reserved for probable changes that might occur + # in the future, so if status names will change -- tooltip + # population should not fail. + return status + class StatusTable: """ Contains methods for creating status table. This is used in Roster and @@ -346,7 +371,7 @@ properties.append((status, None)) else: # no status message, show SHOW instead show = helpers.get_uf_show(contact.show) - show = '' + show + '' + show = self.colorize_status(show) properties.append((show, None)) if contact.jid.strip() != '': @@ -544,8 +569,7 @@ show = _('Connected') else: show = _('Disconnected') - show = '' + show + '' - # we append show below + show = self.colorize_status(show) if contact.status: status = contact.status.strip() @@ -561,7 +585,7 @@ self._append_pep_info(contact, properties) - properties.append((_('Jabber ID: '), prim_contact.jid )) + properties.append((_('Jabber ID: '), "%s" % prim_contact.jid )) # contact has only one ressource if num_resources == 1 and contact.resource: @@ -597,9 +621,10 @@ else: formatted = last_active.strftime("%c") + cs = "%s" properties.append((str(), None)) - properties.append((_("Idle since %s") % formatted, None)) - properties.append((_("Idle for %s") % str(diff), None)) + properties.append(((cs % _("Idle since %s")) % formatted, None)) + properties.append(((cs % _("Idle for %s")) % str(diff), None)) while properties: property_ = properties.pop(0)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2010