Bumped version to 0.3

[mevemon] / package / src / ui / fremantle / gui.py

diff --git a/package/src/ui/fremantle/gui.py b/package/src/ui/fremantle/gui.py
index 0f33d6b..c905160 100644 (file)
--- a/package/src/ui/fremantle/gui.py
+++ b/package/src/ui/fremantle/gui.py
@@ -30,7 +30,7 @@ class BaseUI():
     about_text = ('Mobile character monitor for EVE Online')
     about_authors = ['Ryan Campbell', 'Danny Campbell']
     about_website = 'http://mevemon.garage.maemo.org'
-    app_version = '0.2'
+    app_version = '0.3'
 
     menu_items = ("Settings", "About", "Refresh")
 
@@ -86,7 +86,8 @@ class BaseUI():
 
         # all stock responses are negative, so we can use any positive value
         new_button = dialog.add_button("New", RESPONSE_NEW)
-        edit_button = dialog.add_button("Edit", RESPONSE_EDIT)
+        #TODO: get edit button working
+        #edit_button = dialog.add_button("Edit", RESPONSE_EDIT)
         delete_button = dialog.add_button("Delete", RESPONSE_DELETE)
         ok_button = dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
         
@@ -103,11 +104,9 @@ class BaseUI():
             elif result == RESPONSE_EDIT:
                 # get the selected treeview item and pop up the account_box
                 self.edit_account(accounts_treeview)
-                pass
             elif result == RESPONSE_DELETE:
                 # get the selected treeview item, and delete the gconf keys
                 self.delete_account(accounts_treeview)
-                pass
             elif result == gtk.RESPONSE_OK:
                 self.char_model.get_characters()
                 break
@@ -116,7 +115,7 @@ class BaseUI():
 
         dialog.destroy()
 
-   def get_selected_item(treeview, column):
+    def get_selected_item(self, treeview, column):
         selection = treeview.get_selection()
         model, miter = selection.get_selected() 
         
@@ -131,7 +130,7 @@ class BaseUI():
         self.accounts_model.get_accounts()
          
     def delete_account(self, treeview):
-        uid = get_selected_item(treeview, 0) 
+        uid = self.get_selected_item(treeview, 0) 
         self.controller.remove_account(uid)
         # refresh model
         self.accounts_model.get_accounts()
@@ -300,8 +299,10 @@ class CharacterSheetUI(BaseUI):
         
         # column 0 is the portrait, column 1 is name
         char_name = model.get_value(miter, 1)
+        uid = model.get_value(miter, 2)
         self.char_id = self.controller.char_name2id(char_name)
-        self.sheet = self.controller.get_char_sheet(self.char_id)
+
+        self.sheet = self.controller.get_char_sheet(uid, self.char_id)
 
         win.set_title(char_name)
 
@@ -328,7 +329,7 @@ class CharacterSheetUI(BaseUI):
         self.fill_stats(stats_vbox)
         
         self.add_label("<big>Skill in Training:</big>", vbox, align="normal")
-        skill = self.controller.get_skill_in_training(self.char_id)
+        skill = self.controller.get_skill_in_training(uid, self.char_id)
         
         if skill.skillInTraining: