Added characters to settings dialog
[mevemon] / package / src / ui / diablo / gui.py
index e0e0584..3598479 100644 (file)
@@ -24,19 +24,24 @@ import gtk
 import hildon
 import gobject
 
-class BaseUI():
+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', 'Danny Campbell']
     about_website = 'http://mevemon.garage.maemo.org'
-    app_version = '0.1'
+    app_version = '0.3'
+
     menu_items = ("Settings", "About", "Refresh")
 
     def create_menu(self, window):
         menu = gtk.Menu()
         for command in self.menu_items:
+            # Create menu entries
             button = gtk.MenuItem(command)
+
             if command == "About":
                 button.connect("activate", self.about_clicked)
             elif command == "Settings":
@@ -45,17 +50,106 @@ class BaseUI():
                 button.connect("activate", self.refresh_clicked, window)
             else:
                 assert False, command
+
             # Add entry to the view menu
             menu.append(button)
+            
         menu.show_all()
-        return menu
 
-    def set_pix(self, filename):
-        pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
-        return pixbuf
+        return menu
 
     def settings_clicked(self, button, window):
-   
+
+        RESPONSE_NEW, RESPONSE_EDIT, RESPONSE_DELETE = range(3)
+
+        dialog = gtk.Dialog()
+        dialog.set_transient_for(window)
+        dialog.set_title("Settings")
+
+        vbox = dialog.vbox
+
+        acctsLabel = gtk.Label("Accounts:")
+        acctsLabel.set_justify(gtk.JUSTIFY_LEFT)
+
+        vbox.pack_start(acctsLabel, False, False, 1)
+
+        self.accounts_model = models.AccountsModel(self.controller)
+
+        accounts_treeview = gtk.TreeView(model = self.accounts_model)
+        self.add_columns_to_accounts(accounts_treeview)
+        vbox.pack_start(accounts_treeview, False, False, 1)
+
+        # all stock responses are negative, so we can use any positive value
+        new_button = dialog.add_button("New", RESPONSE_NEW)
+        #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)
+        cancel_button = dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+
+        #TODO: for some reason the scrollbar shows up in the middle of the
+        # dialog. Why?
+        #scrollbar = gtk.VScrollbar()
+        #vbox.add(scrollbar)
+
+        dialog.show_all()
+
+        result = dialog.run()
+        
+        while(result != gtk.RESPONSE_CANCEL):
+            if result == RESPONSE_NEW:
+                self.new_account_clicked(window)
+            elif result == RESPONSE_EDIT:
+                # get the selected treeview item and pop up the account_box
+                self.edit_account(accounts_treeview)
+            elif result == RESPONSE_DELETE:
+                # get the selected treeview item, and delete the gconf keys
+                self.delete_account(accounts_treeview)
+            elif result == gtk.RESPONSE_OK:
+                self.char_model.get_characters()
+                break
+        
+            result = dialog.run()
+
+        dialog.destroy()
+
+
+
+    def get_selected_item(self, treeview, column):
+        selection = treeview.get_selection()
+        model, miter = selection.get_selected()
+
+        value = model.get_value(miter, column)
+
+        return value
+
+    def edit_account(self, treeview):
+        uid = self.get_selected_item(treeview, 0)
+        # pop up the account dialog
+
+        self.accounts_model.get_accounts()
+
+    def delete_account(self, treeview):
+        uid = self.get_selected_item(treeview, 0)
+        self.controller.remove_account(uid)
+        # refresh model
+        self.accounts_model.get_accounts()
+
+
+    def add_columns_to_accounts(self, treeview):
+        #Column 0 for the treeview
+        renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn('Account ID', renderer, text=0)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+        #Column 2 (characters) for the treeview
+        column = gtk.TreeViewColumn('Characters', renderer, 
+                markup=models.AccountsModel.C_CHARS)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+
+
+    def new_account_clicked(self, window):
         dialog = gtk.Dialog()
     
         #get the vbox to pack all the settings into
@@ -69,7 +163,6 @@ class BaseUI():
         vbox.add(uidLabel)
         
         uidEntry = gtk.Entry()
-        uidEntry.set_text(self.controller.get_uid())
         uidEntry.set_property('is_focus', False)
         
         vbox.add(uidEntry)
@@ -79,7 +172,6 @@ class BaseUI():
         vbox.add(apiLabel)
         
         apiEntry = gtk.Entry()
-        apiEntry.set_text(self.controller.get_api_key())
         apiEntry.set_property('is_focus', False)
 
         vbox.add(apiEntry)
@@ -90,10 +182,8 @@ class BaseUI():
         result = dialog.run()
 
         if result == gtk.RESPONSE_OK:
-            self.controller.set_api_key(apiEntry.get_text())
-            self.controller.set_uid(uidEntry.get_text())
-            self.controller.set_auth()
-            self.update_model(self.char_model)
+            self.controller.add_account(uidEntry.get_text(), apiEntry.get_text())
+            self.accounts_model.get_accounts()
         
         dialog.destroy()
 
@@ -140,7 +230,7 @@ class mEveMonUI(BaseUI):
         character_win = CharacterSheetUI(self.controller)
 
         # create the treeview --danny
-        self.char_model = self.create_char_model()
+        self.char_model = models.CharacterListModel(self.controller)
         treeview = gtk.TreeView(model = self.char_model)
         treeview.connect('row-activated', character_win.build_window)
         treeview.set_model(self.char_model)
@@ -153,22 +243,6 @@ class mEveMonUI(BaseUI):
         progress_bar.set_fraction(1)
         progress_bar.destroy()
 
-    def create_char_model(self):
-        lstore = gtk.ListStore(gtk.gdk.Pixbuf, gobject.TYPE_STRING)
-        #get icon and name and put in a liststore
-        self.fill_char_model(lstore)
-        return lstore
-
-    def fill_char_model(self, lstore):
-        char_list = self.controller.get_characters()
-        for name, icon in char_list:
-            liter = lstore.append()
-            lstore.set(liter, 1, name, 0, self.set_pix(icon))
-
-    def update_model(self, lstore):
-        lstore.clear()
-        self.fill_char_model(lstore)
-
     def add_columns_to_treeview(self, treeview):
         #Column 0 for the treeview
         renderer = gtk.CellRendererPixbuf()
@@ -184,7 +258,10 @@ class mEveMonUI(BaseUI):
         treeview.append_column(column)
  
     def refresh_clicked(self, button, window):
-        self.update_model(self.char_model)
+        progress_bar = hildon.hildon_banner_show_progress(win, None, "Loading characters...")
+        progress_bar.set_fraction(1)
+        self.char_model.get_characters()
+        progress_bar.destroy()
 
 class CharacterSheetUI(BaseUI):
     
@@ -215,8 +292,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)
         
@@ -234,17 +313,17 @@ class CharacterSheetUI(BaseUI):
 
         vbox.pack_start(hbox, False, False, 0)
 
-        skills_model = self.create_skills_model()
-        skills_treeview = gtk.TreeView(model = skills_model)
-        skills_treeview.set_model(skills_model)
-        self.add_columns_to_skills_view(skills_treeview)
-
-        vbox.pack_start(skills_treeview, False, False, 0)
 
         self.fill_info(info_vbox)
+        self.fill_stats(info_vbox)
+
+        separator = gtk.HSeparator()
+        vbox.pack_start(separator, False, False, 5)
+        separator.show()
         
         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:
 
@@ -261,11 +340,35 @@ class CharacterSheetUI(BaseUI):
                     vbox, align="normal")
             self.add_label("<small>start time: %s\t\tend time: %s</small>" %(time.ctime(skill.trainingStartTime),
                 time.ctime(skill.trainingEndTime)), vbox, align="normal")
+            
+            progressbar = gtk.ProgressBar()
+            fraction_completed = (time.time() - skill.trainingStartTime) / \
+                    (skill.trainingEndTime - skill.trainingStartTime)
+            
+            progressbar.set_fraction(fraction_completed)
+            align = gtk.Alignment(0.5, 0.5, 0.5, 0)
+            vbox.pack_start(align, False, False, 5)
+            align.show()
+            align.add(progressbar)
+            progressbar.show()
+
         else:
             self.add_label("<small>No skills are currently being trained</small>", vbox, align="normal")
 
+        separator = gtk.HSeparator()
+        vbox.pack_start(separator, False, False, 0)
+        separator.show()
+        
         self.add_label("<big>Skills:</big>", vbox, align="normal")
 
+
+        skills_model = models.CharacterSkillsModel(self.controller, self.char_id)
+        skills_treeview = gtk.TreeView(model = skills_model)
+        skills_treeview.set_model(skills_model)
+        self.add_columns_to_skills_view(skills_treeview)
+
+        vbox.pack_start(skills_treeview, False, False, 0)
+
         win.add_with_scrollbar(vbox)
         win.show_all()
 
@@ -278,14 +381,15 @@ 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.add_label("", box, markup=False)
-        self.add_label("", box, markup=False)
-        self.add_label("", box, markup=False)
-        self.add_label("<small><b>Intelligence: </b>%d</small>" % self.sheet.attributes.intelligence, box)
-        self.add_label("<small><b>Memory:</b>\t%d</small>" % self.sheet.attributes.memory, box)
-        self.add_label("<small><b>Charisma:</b>\t%d</small>" % self.sheet.attributes.charisma, box)
-        self.add_label("<small><b>Perception:</b>\t%d</small>" % self.sheet.attributes.perception, box)
-        self.add_label("<small><b>Willpower:</b>\t%d</small>" % self.sheet.attributes.willpower, box)
+
+    def fill_stats(self, box):
+
+        atr = self.sheet.attributes
+
+        self.add_label("<small><b>I: </b>%d  <b>M: </b>%d  <b>C: </b>%d  " \
+                "<b>P: </b>%d  <b>W: </b>%d</small>" % (atr.intelligence,
+                    atr.memory, atr.charisma, atr.perception, atr.willpower), box)
+
 
     def add_columns_to_skills_view(self, treeview):
         #Column 0 for the treeview
@@ -295,40 +399,26 @@ class CharacterSheetUI(BaseUI):
         treeview.append_column(column)
         
         #Column 1 for the treeview
+        column = gtk.TreeViewColumn('Rank', renderer, markup=1)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+        
+        #Column 2
         renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('Skill Info', renderer, markup=1)
+        renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn('Points', renderer, markup=2)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+        
+        #Column 3
+        column = gtk.TreeViewColumn('Level', renderer, markup=3)
         column.set_property("expand", True)
         treeview.append_column(column)
-
-    def create_skills_model(self):
-        lstore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-        self.fill_skills_model(lstore)
-        return lstore
-
-    def fill_skills_model(self, lstore):
-        skilltree = self.controller.get_skill_tree()
-        sp = [0, 250, 1414, 8000, 45255, 256000]
-        for g in skilltree.skillGroups:
-            skills_trained_in_this_group = False
-            for skill in g.skills:
-                trained = self.sheet.skills.Get(skill.typeID, False)
-                if trained:
-                    if not skills_trained_in_this_group:
-                        #TODO: add as a heading/category
-                        skills_trained_in_this_group = True
-                    # add row for this skill
-                    liter = lstore.append()
-                    lstore.set(liter, 0, "%s <small>(Rank %d)</small>" % (skill.typeName, skill.rank), 1, "SP: %d Level %d" % (trained.skillpoints, trained.level))
-
-    def update_model(self, lstore):
-        lstore.clear()
-        self.sheet = self.controller.get_char_sheet(self.char_id)
-        self.fill_skills_model(lstore)
 
     def refresh_clicked(self, button, window):
         progress_bar = hildon.hildon_banner_show_progress(win, None, "Loading overview...")
         progress_bar.set_fraction(1)
-        self.update_model(self.skills_model)
+        self.skills_model.get_skills()
         progress_bar.destroy()
 
 if __name__ == "__main__":