added some simple validation to 'add account' dialog
[mevemon] / package / src / ui / fremantle / gui.py
index 70aebb5..eff19eb 100644 (file)
@@ -22,15 +22,21 @@ import gtk
 import hildon
 import gobject
 
+import glib
+
+import validation
+
 from ui import models
 
 class BaseUI():
     
     about_name = 'mEveMon'
     about_text = ('Mobile character monitor for EVE Online')
-    about_authors = ['Ryan Campbell', 'Danny Campbell']
+    about_authors = ['Ryan Campbell <campbellr@gmail.com>',
+                     'Danny Campbell <danny.campbell@gmail.com>']
+
     about_website = 'http://mevemon.garage.maemo.org'
-    app_version = '0.3'
+    app_version = '0.4'
 
     menu_items = ("Settings", "About", "Refresh")
 
@@ -183,17 +189,35 @@ class BaseUI():
         ok_button = dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
 
         dialog.show_all()
+        
         result = dialog.run()
-        if result == gtk.RESPONSE_OK:
-            self.controller.add_account(uidEntry.get_text(), apiEntry.get_text())
-            self.accounts_model.get_accounts()
-
         
+        valid_credentials = False
+
+        while not valid_credentials:
+            if result == gtk.RESPONSE_OK:
+                uid = uidEntry.get_text()
+                api_key = apiEntry.get_text()
+            
+                try:
+                    validation.uid(uid)
+                    validation.api_key(api_key)
+                except validation.ValidationError, e:
+                    self.report_error(e.message)
+                    result = dialog.run()
+                else:
+                    valid_credentials = True
+                    self.controller.add_account(uid, api_key)
+                    self.accounts_model.get_accounts()
+            else:
+                break
+
         dialog.destroy()
 
-        return result
+   
+    def report_error(self, error):
+        hildon.hildon_banner_show_information(self.win, '', error)
 
-    
     def about_clicked(self, button):
         dialog = gtk.AboutDialog()
         dialog.set_website(self.about_website)
@@ -214,6 +238,8 @@ class BaseUI():
 
         box.pack_start(label, False, False, padding)
 
+        return label
+
 
 class mEveMonUI(BaseUI):
 
@@ -222,15 +248,15 @@ class mEveMonUI(BaseUI):
         gtk.set_application_name("mEveMon")
     
         #create the main window
-        win = hildon.StackableWindow()
-        win.connect("destroy", self.controller.quit)
-        win.show_all()
-        hildon.hildon_gtk_window_set_progress_indicator(win, 1)
+        self.win = hildon.StackableWindow()
+        self.win.connect("destroy", self.controller.quit)
+        self.win.show_all()
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 1)
 
         # Create menu
-        menu = self.create_menu(win)
+        menu = self.create_menu(self.win)
         # Attach menu to the window
-        win.set_app_menu(menu)
+        self.win.set_app_menu(menu)
 
         pannable_area = hildon.PannableArea()
 
@@ -248,11 +274,11 @@ class mEveMonUI(BaseUI):
 
         pannable_area.add(treeview)
 
-        win.add(pannable_area);
+        self.win.add(pannable_area);
         
-        win.show_all()
+        self.win.show_all()
 
-        hildon.hildon_gtk_window_set_progress_indicator(win, 0)
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 0)
 
     
     def add_columns_to_treeview(self, treeview):
@@ -279,7 +305,8 @@ class mEveMonUI(BaseUI):
     
 
 class CharacterSheetUI(BaseUI):
-    
+    UPDATE_INTERVAL = 1
+
     def __init__(self, controller):
         self.controller = controller
         self.sheet = None
@@ -290,16 +317,16 @@ class CharacterSheetUI(BaseUI):
     def build_window(self, treeview, path, view_column):
         # TODO: this is a really long and ugly function, split it up somehow
 
-        win = hildon.StackableWindow()
-        win.show_all() 
-        hildon.hildon_gtk_window_set_progress_indicator(win, 1)
+        self.win = hildon.StackableWindow()
+        #win.show_all() 
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 1)
 
         # Create menu
         # NOTE: we probably want a window-specific menu for this page, but the
         # main appmenu works for now
-        menu = self.create_menu(win)
+        menu = self.create_menu(self.win)
         # Attach menu to the window        
-        win.set_app_menu(menu)
+        self.win.set_app_menu(menu)
 
         pannable_area = hildon.PannableArea()
 
@@ -308,12 +335,12 @@ 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.uid = model.get_value(miter, 2)
         self.char_id = self.controller.char_name2id(char_name)
 
-        self.sheet = self.controller.get_char_sheet(uid, self.char_id)
+        self.sheet = self.controller.get_char_sheet(self.uid, self.char_id)
 
-        win.set_title(char_name)
+        self.win.set_title(char_name)
 
 
         hbox = gtk.HBox(False, 0)
@@ -338,7 +365,27 @@ class CharacterSheetUI(BaseUI):
         vbox.pack_start(separator, False, False, 5)
         
         self.add_label("<big>Skill in Training:</big>", vbox, align="normal")
-        skill = self.controller.get_skill_in_training(uid, self.char_id)
+        
+        self.display_skill_in_training(vbox)
+
+        separator = gtk.HSeparator()
+        vbox.pack_start(separator, False, False, 0)
+        
+        self.add_label("<big>Skills:</big>", vbox, align="normal")
+
+        skills_treeview = hildon.GtkTreeView(gtk.HILDON_UI_MODE_NORMAL)
+        self.skills_model = models.CharacterSkillsModel(self.controller, self.char_id)
+        skills_treeview.set_model(self.skills_model)
+        self.add_columns_to_skills_view(skills_treeview)
+        vbox.pack_start(skills_treeview, False, False, 1)
+
+        self.win.add(pannable_area)
+        self.win.show_all()
+
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 0)
+
+    def display_skill_in_training(self, vbox):
+        skill = self.controller.get_skill_in_training(self.uid, self.char_id)
         
         if skill.skillInTraining:
 
@@ -367,21 +414,7 @@ class CharacterSheetUI(BaseUI):
             self.add_label("<small>No skills are currently being trained</small>",
                     vbox, align="normal")
 
-        separator = gtk.HSeparator()
-        vbox.pack_start(separator, False, False, 0)
-        
-        self.add_label("<big>Skills:</big>", vbox, align="normal")
-
-        skills_treeview = hildon.GtkTreeView(gtk.HILDON_UI_MODE_NORMAL)
-        self.skills_model = models.CharacterSkillsModel(self.controller, self.char_id)
-        skills_treeview.set_model(self.skills_model)
-        self.add_columns_to_skills_view(skills_treeview)
-        vbox.pack_start(skills_treeview, False, False, 1)
-
-        win.add(pannable_area)
-        win.show_all()
 
-        hildon.hildon_gtk_window_set_progress_indicator(win, 0)
 
     def fill_info(self, box):
         self.add_label("<big><big>%s</big></big>" % self.sheet.name, box)
@@ -390,7 +423,13 @@ class CharacterSheetUI(BaseUI):
         self.add_label("", box, markup=False)
         self.add_label("<small><b>Corp:</b> %s</small>" % self.sheet.corporationName, box)
         self.add_label("<small><b>Balance:</b> %s ISK</small>" % self.sheet.balance, box)
+        self.live_sp_val = self.controller.get_sp(self.uid, self.char_id)
+        self.live_sp = self.add_label("<small><b>Total SP:</b> %s</small>" %
+                self.live_sp_val, box)
+        
+        self.spps = self.controller.get_spps(self.uid, self.char_id)[0]
 
+        glib.timeout_add_seconds(self.UPDATE_INTERVAL, self.update_live_sp)
 
     def fill_stats(self, box):
         
@@ -427,10 +466,24 @@ class CharacterSheetUI(BaseUI):
         treeview.append_column(column)
 
 
-    def refresh_clicked(self, button, window):
-        hildon.hildon_gtk_window_set_progress_indicator(window, 1)
+    def refresh_clicked(self, button):
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 1)
         self.skills_model.get_skills()
-        hildon.hildon_gtk_window_set_progress_indicator(window, 0)
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 0)
+
+
+    def update_live_sp(self):
+        # we don't want to keep the timer running in the background
+        # when this callback returns False, the timer destorys itself
+        if not self.win.get_is_topmost():
+            return False
+        
+        self.live_sp_val = self.live_sp_val + self.spps * self.UPDATE_INTERVAL
+        self.live_sp.set_label("<small><b>Total SP:</b> %d</small>" %
+                                self.live_sp_val)
+
+        return True
+
 
 if __name__ == "__main__":
     main()