X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=package%2Fsrc%2Fui%2Fmodels.py;h=a151a0fd8d3249adb72db8228d482249b3df5abf;hb=21352f74cc9a407cc4f1b9e67f9f258b3b8352f3;hp=8c4a620b946e38bcfdac6831152a88e353887ac2;hpb=e1192b1185ce29505332045ae6c3641abe268279;p=mevemon
diff --git a/package/src/ui/models.py b/package/src/ui/models.py
index 8c4a620..a151a0f 100644
--- a/package/src/ui/models.py
+++ b/package/src/ui/models.py
@@ -1,29 +1,41 @@
import gtk
+import util
class AccountsModel(gtk.ListStore):
- C_UID, C_APIKEY = range(2)
+
+ # userID no longer exists, we want keyID
+ # api key becomes verification code... --danny
+ C_KID, C_VCODE, C_CHARS = range(3)
def __init__(self, controller):
- gtk.ListStore.__init__(self, str, str)
+ gtk.ListStore.__init__(self, str, str, str)
self.controller = controller
self.get_accounts()
def get_accounts(self):
self.clear()
- accts_dict = self.controller.get_accounts()
+ accts_dict = self.controller.settings.get_accounts()
if not accts_dict:
return None
- for uid, key in accts_dict.items():
+ for key_id, key in accts_dict.items():
liter = self.append()
- self.set(liter, self.C_UID, uid, self.C_APIKEY, key)
+ chars, ids = self.controller.get_chars_from_acct(key_id)
+ if chars:
+ char_str = ', '.join(chars)
+ char_str = "%s" % char_str
+ else:
+ char_str = ""
+
+ self.set(liter, self.C_KID, key_id, self.C_VCODE, key, self.C_CHARS, char_str)
class CharacterListModel(gtk.ListStore):
- C_PORTRAIT, C_NAME, C_UID = range(3)
+
+ C_PORTRAIT, C_NAME, C_KID = range(3)
def __init__(self, controller):
gtk.ListStore.__init__(self, gtk.gdk.Pixbuf, str, str)
@@ -36,9 +48,9 @@ class CharacterListModel(gtk.ListStore):
char_list = self.controller.get_characters()
- for name, icon, uid in char_list:
+ for name, icon, key_id in char_list:
liter = self.append()
- self.set(liter, self.C_PORTRAIT, self._set_pix(icon), self.C_NAME, name, self.C_UID, uid)
+ self.set(liter, self.C_PORTRAIT, self._set_pix(icon), self.C_NAME, name, self.C_KID, key_id)
def _set_pix(self, filename):
pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
@@ -59,7 +71,9 @@ class CharacterSkillsModel(gtk.ListStore):
def get_skills(self):
self.clear()
- self.sheet = self.controller.get_char_sheet(self.charID)
+ key_id = self.controller.charid2key_id(self.charID)
+
+ self.sheet = self.controller.get_char_sheet(key_id, self.charID)
skilltree = self.controller.get_skill_tree()
@@ -82,7 +96,6 @@ class CharacterSkillsModel(gtk.ListStore):
liter = self.append()
self.set(liter, self.C_NAME, "%s" % skill.typeName,
self.C_RANK, "(Rank %d)" % skill.rank,
- self.C_SKILLPOINTS, "SP: %d" % trained.skillpoints,
+ self.C_SKILLPOINTS, "SP: %s" % util.comma(trained.skillpoints),
self.C_LEVEL, "Level %d" % trained.level)
-