From 70a1b8f172bd4a3adf1277a5c94396d36511ecfa Mon Sep 17 00:00:00 2001 From: epage Date: Thu, 1 Oct 2009 00:35:36 +0000 Subject: [PATCH] Getting descriptions within the callback selection dialog git-svn-id: file:///svnroot/gc-dialer/trunk@491 c39d3808-3fe2-4d86-a59f-b7f623ee9f21 --- src/gv_views.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/gv_views.py b/src/gv_views.py index 8c5cd84..dabc7d2 100644 --- a/src/gv_views.py +++ b/src/gv_views.py @@ -26,6 +26,7 @@ from __future__ import with_statement import ConfigParser import logging +import itertools import gobject import pango @@ -850,13 +851,24 @@ class AccountInfo(object): try: actualSelection = make_pretty(self.get_selected_callback_number()) + userOptions = dict( + (number, "%s (%s)" % (number, description)) + for (number, description) in self._callbackList + ) + defaultSelection = userOptions.get(actualSelection, actualSelection) + userSelection = hildonize.touch_selector_entry( self._window, "Callback Number", - [number for number, description in self._callbackList], - actualSelection, + list(userOptions.itervalues()), + defaultSelection, ) - number = make_ugly(userSelection) + reversedUserOptions = dict( + itertools.izip(userOptions.itervalues(), userOptions.iterkeys()) + ) + selectedNumber = reversedUserOptions.get(userSelection, userSelection) + + number = make_ugly(selectedNumber) self._set_callback_number(number) except RuntimeError, e: _moduleLogger.exception("%s" % str(e)) -- 1.7.9.5