Merged Fremantle UI changes into Diablo.
authorDanny Campbell <danny.campbell@gmail.com>
Thu, 22 Apr 2010 06:44:38 +0000 (00:44 -0600)
committerDanny Campbell <danny.campbell@gmail.com>
Thu, 22 Apr 2010 06:44:38 +0000 (00:44 -0600)
src/ui/diablo/ui.py

index 7b023f9..a33d873 100644 (file)
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Based on Ry's Fremantle Python code. --danny
+# DIABLO UI: Heavily based on Ry's Fremantle Python code. --danny
 
 import sys
 
@@ -24,51 +24,185 @@ import gtk
 import hildon
 import gobject
 
-class mEveMonUI():
+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'
-
     menu_items = ("Settings", "About", "Refresh")
 
+    def create_menu(self, window):
+        menu = gtk.Menu()
+        for command in self.menu_items:
+            button = gtk.MenuItem(command)
+            if command == "About":
+                button.connect("activate", self.about_clicked)
+            elif command == "Settings":
+                button.connect("activate", self.settings_clicked, window)
+            elif command == "Refresh":
+                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
+
+    def settings_clicked(self, button, window):
+   
+        dialog = gtk.Dialog()
+    
+        #get the vbox to pack all the settings into
+        vbox = dialog.vbox
+    
+        dialog.set_transient_for(window)
+        dialog.set_title("Settings")
+
+        uidLabel = gtk.Label("User ID:")
+        uidLabel.set_justify(gtk.JUSTIFY_LEFT)
+        vbox.add(uidLabel)
+        
+        uidEntry = gtk.Entry()
+        uidEntry.set_text(self.controller.get_uid())
+        uidEntry.set_property('is_focus', False)
+        
+        vbox.add(uidEntry)
+
+        apiLabel = gtk.Label("API key:")
+        apiLabel.set_justify(gtk.JUSTIFY_LEFT)
+        vbox.add(apiLabel)
+        
+        apiEntry = gtk.Entry()
+        apiEntry.set_text(self.controller.get_api_key())
+        apiEntry.set_property('is_focus', False)
+
+        vbox.add(apiEntry)
+           
+        ok_button = dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
+        help_button = dialog.add_button(gtk.STOCK_HELP, gtk.RESPONSE_HELP)
+
+
+        dialog.show_all()
+        result = dialog.run()
+
+        if result == gtk.RESPONSE_OK:
+            self.controller.set_api_key(apiEntry.get_text())
+            self.controller.set_uid(uidEntry.get_text())
+            self.update_model(self.char_model)
+        
+        dialog.destroy()
+
+        return result
+
+    def about_clicked(self, button):
+        dialog = gtk.AboutDialog()
+        dialog.set_website(self.about_website)
+        dialog.set_website_label(self.about_website)
+        dialog.set_name(self.about_name)
+        dialog.set_authors(self.about_authors)
+        dialog.set_comments(self.about_text)
+        dialog.set_version(self.app_version)
+        dialog.run()
+        dialog.destroy()
+
+    def add_label(self, text, box, markup=True, align="left", padding=1):
+        label = gtk.Label(text)
+        if markup:
+            label.set_use_markup(True)
+        if align == "left":
+            label.set_alignment(0, 0.5)
+        box.pack_start(label, False, False, padding)
+
+class mEveMonUI(BaseUI):
+
     def __init__(self, controller):
         self.controller = controller
-   
         gtk.set_application_name("mEveMon")
-    
+
         # create the main window
         win = hildon.Window()
         win.connect("destroy", self.controller.quit)
         win.show_all()
         progress_bar = hildon.hildon_banner_show_progress(win, None, "Loading overview...")
-        progress_bar.set_fraction( 0.4 )
+        progress_bar.set_fraction(0.4)
 
         # Create menu
         menu = self.create_menu(win)
+
         # Attach menu to the window
         win.set_menu(menu)
 
+        character_win = CharacterSheetUI(self.controller)
+
+        # create the treeview --danny
         self.char_model = self.create_char_model()
-        treeview = gtk.TreeView( model = self.char_model )
-        treeview.connect( 'row-activated', self.build_window )
+        treeview = gtk.TreeView(model = self.char_model)
+        treeview.connect('row-activated', character_win.build_window)
         treeview.set_model(self.char_model)
         self.add_columns_to_treeview(treeview)
 
+        # add the treeview with scrollbar --danny
         win.add_with_scrollbar(treeview)
         win.show_all()
 
-        progress_bar.set_fraction( 1 )
+        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()
+        column = gtk.TreeViewColumn()
+        column.pack_start(renderer, True)
+        column.add_attribute(renderer, "pixbuf", 0)
+        treeview.append_column(column)
+
+        #Column 1 for the treeview
+        renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn('Character Name', renderer, text=1)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+    def refresh_clicked(self, button, window):
+        self.update_model(self.char_model)
+
+class CharacterSheetUI(BaseUI):
+    
+    def __init__(self, controller):
+        self.controller = controller
+        self.sheet = None
+        self.char_id = None
+        self.skills_model = None
+
     def build_window(self, treeview, path, view_column):
+        # TODO: this is a really long and ugly function, split it up somehow
+
         win = hildon.Window()
         win.show_all() 
 
         progress_bar = hildon.hildon_banner_show_progress(win, None, "Loading character sheet...")
-        progress_bar.set_fraction( 0.4 )
+        progress_bar.set_fraction(0.4)
 
         # Create menu
         # NOTE: we probably want a window-specific menu for this page, but the
@@ -77,76 +211,22 @@ class mEveMonUI():
         # Attach menu to the window
         win.set_menu(menu)
 
-        #pannable_area = hildon.PannableArea()
-
         model = treeview.get_model()
         miter = model.get_iter(path)
         
         # column 0 is the portrait, column 1 is name
-
         char_name = model.get_value(miter, 1)
-        char_id = self.controller.char_name2id(char_name)
-        sheet = self.controller.get_char_sheet(char_id)
+        self.char_id = self.controller.char_name2id(char_name)
+        self.sheet = self.controller.get_char_sheet(self.char_id)
 
         win.set_title(char_name)
         
-        skillLabel = gtk.Label("<big><big>Skills</big></big>")
-        skillLabel.set_use_markup( True )
-
-        name = gtk.Label("<big><big>%s</big></big>" % char_name)
-        name.set_use_markup(True)
-        name.set_alignment(0, 0.5)
-
-        race = gtk.Label("<small>%s %s %s</small>" % (sheet.gender, sheet.race,
-                                       sheet.bloodLine))
-        race.set_use_markup(True)
-        race.set_alignment(0, 0.5)
-        
-        corp = gtk.Label("<small>Corp:%s</small>" % sheet.corporationName)
-        corp.set_use_markup(True)
-        corp.set_alignment(0, 0.5)
-        
-        balance = gtk.Label("Balance: %s ISK" % sheet.balance)
-        balance.set_use_markup(True)
-        balance.set_alignment(0, 0.5)
-
-        intel = gtk.Label("<small><small>Intelligence:\t%d</small></small>" % sheet.attributes.intelligence)
-        intel.set_use_markup(True)
-        intel.set_alignment(0, 0.5)
-        mem = gtk.Label("<small><small>Memory:\t\t%d</small></small>" % sheet.attributes.memory)
-        mem.set_use_markup(True)
-        mem.set_alignment(0, 0.5)
-        char = gtk.Label("<small><small>Charisma:\t%d</small></small>" % sheet.attributes.charisma)
-        char.set_use_markup(True)
-        char.set_alignment(0, 0.5)
-        percep = gtk.Label("<small><small>Perception:\t%d</small></small>" % sheet.attributes.perception)
-        percep.set_use_markup(True)
-        percep.set_alignment(0, 0.5)
-        wp = gtk.Label("<small><small>Willpower:\t%d</small></small>" % sheet.attributes.willpower)
-        wp.set_use_markup(True)
-        wp.set_alignment(0, 0.5)
-#        blank_label = gtk.Label('')
-#        blank_label.set_alignment(0, 0.5)
+        hbox = gtk.HBox(False, 0)
+        info_vbox = gtk.VBox(False, 1)
 
         portrait = gtk.Image()
         portrait.set_from_file(self.controller.get_portrait(char_name, 256))
         portrait.show()
-        
-        hbox = gtk.HBox(False, 0)
-
-        info_vbox = gtk.VBox(False, 1)
-        info_vbox.pack_start(name, False, False, 1)
-        info_vbox.pack_start(race, False, False, 1)
-        info_vbox.pack_start(corp, False, False, 1)
-        info_vbox.pack_start(balance, False, False, 1)
-
-#        info_vbox.pack_start(blank_label, False, False, 1)
-
-        info_vbox.pack_start(intel, False, False, 1)
-        info_vbox.pack_start(mem, False, False, 1)
-        info_vbox.pack_start(char, False, False, 1)
-        info_vbox.pack_start(percep, False, False, 1)
-        info_vbox.pack_start(wp, False, False, 1)
 
         hbox.pack_start(portrait, False, False, 10)
         hbox.pack_start(info_vbox, False, False, 5)
@@ -154,21 +234,60 @@ class mEveMonUI():
         vbox = gtk.VBox(False, 0)
 
         vbox.pack_start(hbox, False, False, 0)
-        vbox.pack_start(skillLabel, False, False, 5)
 
-        skills_model = self.create_skills_model(sheet)
-        skills_treeview = gtk.TreeView( model = skills_model )
+        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.add_label("<big>Skill in Training:</big>", vbox, align="normal")
+        skill = self.controller.get_skill_in_training(self.char_id)
+        
+        if skill.skillInTraining:
+
+            skilltree = self.controller.get_skill_tree()
+            
+            # I'm assuming that we will always find a skill with the skill ID
+            for group in skilltree.skillGroups:
+                found_skill = group.skills.Get(skill.trainingTypeID, False)
+                if found_skill:
+                    skill_name = found_skill.typeName
+                    break
+                
+            self.add_label("%s <small>(Level %d)</small>" % (skill_name, skill.trainingToLevel),
+                    vbox, align="normal")
+            self.add_label("<small>start time: %s\t\tend time: %s</small>" %(skill.trainingStartTime,
+                skill.trainingEndTime), vbox, align="normal")
+        else:
+            self.add_label("<small>No skills are currently being trained</small>", vbox, align="normal")
+
+        self.add_label("<big>Skills:</big>", vbox, align="normal")
+
         win.add_with_scrollbar(vbox)
         win.show_all()
 
-        progress_bar.set_fraction( 1 )
+        progress_bar.set_fraction(1)
         progress_bar.destroy()
 
+    def fill_info(self, box):
+        self.add_label("<big><big>%s</big></big>" % self.sheet.name, box)
+        self.add_label("<small>%s %s %s</small>" % (self.sheet.gender, self.sheet.race, self.sheet.bloodLine), box)
+        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 add_columns_to_skills_view(self, treeview):
         #Column 0 for the treeview
         renderer = gtk.CellRendererText()
@@ -182,148 +301,36 @@ class mEveMonUI():
         column.set_property("expand", True)
         treeview.append_column(column)
 
-    def create_skills_model(self, sheet):
-   
+    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 = sheet.skills.Get(skill.typeID, False)
-                
+                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, "<small>%s</small> <small><small>(Rank %d)</small></small>" % (skill.typeName, skill.rank), 1, "<small>SP: %d Level %d</small>" % (trained.skillpoints, trained.level))
-
-        return lstore
-
-    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))
+                    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.fill_char_model(lstore)
-
-    def set_pix(self, filename):
-        pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
-        return pixbuf
-
-    def add_columns_to_treeview(self, treeview):
-        #Column 0 for the treeview
-        renderer = gtk.CellRendererPixbuf()
-        column = gtk.TreeViewColumn()
-        column.pack_start(renderer, True)
-        column.add_attribute(renderer, "pixbuf", 0)
-        treeview.append_column(column)
-
-        #Column 1 for the treeview
-        renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('Character Name', renderer, text=1)
-        column.set_property("expand", True)
-        treeview.append_column(column)
-
-    def settings_clicked(self, button, window):
-   
-        dialog = gtk.Dialog()
-    
-        #get the vbox to pack all the settings into
-        vbox = dialog.vbox
-    
-        dialog.set_transient_for(window)
-        dialog.set_title("Settings")
-
-        uidLabel = gtk.Label("User ID:")
-        uidLabel.set_justify(gtk.JUSTIFY_LEFT)
-        vbox.add(uidLabel)
-        
-        uidEntry = gtk.Entry()
-        uidEntry.set_text(self.controller.get_uid())
-        uidEntry.set_property('is_focus', False)
-        
-        vbox.add(uidEntry)
-
-        apiLabel = gtk.Label("API key:")
-        apiLabel.set_justify(gtk.JUSTIFY_LEFT)
-        vbox.add(apiLabel)
-        
-        apiEntry = gtk.Entry()
-        apiEntry.set_text(self.controller.get_api_key())
-        apiEntry.set_property('is_focus', False)
-
-        vbox.add(apiEntry)
-           
-        ok_button = dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
-        help_button = dialog.add_button(gtk.STOCK_HELP, gtk.RESPONSE_HELP)
-
-
-        dialog.show_all()
-        result = dialog.run()
-
-        if result == gtk.RESPONSE_OK:
-            self.controller.set_api_key(apiEntry.get_text())
-            self.controller.set_uid(uidEntry.get_text())
-            self.update_model(self.char_model)
-        
-        dialog.destroy()
-
-        return result
-
-    def about_clicked(self, button):
-    
-        dialog = gtk.AboutDialog()
-        dialog.set_website(self.about_website)
-        dialog.set_website_label(self.about_website)
-        dialog.set_name(self.about_name)
-        dialog.set_authors(self.about_authors)
-        dialog.set_comments(self.about_text)
-        dialog.set_version(self.app_version)
-        dialog.run()
-        dialog.destroy()
+        self.sheet = self.controller.get_char_sheet(self.char_id)
+        self.fill_skills_model(lstore)
 
     def refresh_clicked(self, button, window):
-        self.update_model(self.char_model)
-  
-    def create_menu(self, window):
-        menu = gtk.Menu()
-        for command in self.menu_items:
-            button = gtk.MenuItem( command )
-            if command == "About":
-                button.connect("activate", self.about_clicked)
-            elif command == "Settings":
-                button.connect("activate", self.settings_clicked, window)
-            elif command == "Refresh":
-                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
+        progress_bar = hildon.hildon_banner_show_progress(win, None, "Loading overview...")
+        progress_bar.set_fraction(1)
+        self.update_model(self.skills_model)
+        progress_bar.destroy()
 
 if __name__ == "__main__":
     main()