split ui classes into separate modules
authorRyan Campbell <campbellr@gmail.com>
Mon, 13 Sep 2010 00:34:57 +0000 (18:34 -0600)
committerRyan Campbell <campbellr@gmail.com>
Mon, 13 Sep 2010 00:34:57 +0000 (18:34 -0600)
package/src/ui/fremantle/base.py [new file with mode: 0644]
package/src/ui/fremantle/characterSheet.py [new file with mode: 0644]
package/src/ui/fremantle/gui.py

diff --git a/package/src/ui/fremantle/base.py b/package/src/ui/fremantle/base.py
new file mode 100644 (file)
index 0000000..d773256
--- /dev/null
@@ -0,0 +1,223 @@
+#
+# mEveMon - A character monitor for EVE Online
+# Copyright (c) 2010  Ryan and Danny Campbell, and the mEveMon Team
+#
+# mEveMon is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# mEveMon is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import hildon
+import gtk
+
+import ui.models as models
+
+class BaseUI():
+    menu_items = ("Settings", "About", "Refresh")
+
+    def create_menu(self, window):
+        menu = hildon.AppMenu()
+
+        for command in self.menu_items:
+            # Create menu entries
+            button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+            button.set_label(command)
+
+            if command == "About":
+                button.connect("clicked", self.about_clicked)
+            elif command == "Settings":
+                button.connect("clicked", self.settings_clicked, window)
+            elif command == "Refresh":
+                button.connect("clicked", self.refresh_clicked)
+            else:
+                assert False, command
+
+            # Add entry to the view menu
+            menu.append(button)
+
+        menu.show_all()
+
+        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")
+
+        pannable_area = hildon.PannableArea()
+
+        dialog_vbox = dialog.vbox
+
+        vbox = gtk.VBox(False, 1)
+
+        self.accounts_model = models.AccountsModel(self.controller)
+        
+        accounts_treeview = hildon.GtkTreeView(gtk.HILDON_UI_MODE_NORMAL)
+        accounts_treeview.set_model(self.accounts_model)
+        accounts_treeview.set_headers_visible(True)
+        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)
+        
+        pannable_area.add_with_viewport(vbox)
+        
+        dialog_vbox.pack_start(pannable_area, True, True, 1)
+      
+      
+        dialog.show_all()
+
+        result = dialog.run()
+
+        while(result != gtk.RESPONSE_DELETE_EVENT):
+            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('User ID', renderer, 
+                text=models.AccountsModel.C_UID)
+        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
+        vbox = dialog.vbox
+    
+        dialog.set_transient_for(window)
+        dialog.set_title("New Account")
+
+        uidLabel = gtk.Label("User ID:")
+        uidLabel.set_justify(gtk.JUSTIFY_LEFT)
+        vbox.add(uidLabel)
+        
+        uidEntry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
+        uidEntry.set_placeholder("User ID")
+        uidEntry.set_property('is_focus', False)
+        
+        vbox.add(uidEntry)
+
+        apiLabel = gtk.Label("API key:")
+        apiLabel.set_justify(gtk.JUSTIFY_LEFT)
+        vbox.add(apiLabel)
+        
+        apiEntry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
+        apiEntry.set_placeholder("API Key")
+        apiEntry.set_property('is_focus', False)
+
+        vbox.add(apiEntry)
+       
+        ok_button = dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
+
+        dialog.show_all()
+        result = dialog.run()
+        
+        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()
+
+
+    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.controller.about_website)
+        dialog.set_website_label(self.controller.about_website)
+        dialog.set_name(self.controller.about_name)
+        dialog.set_authors(self.controller.about_authors)
+        dialog.set_comments(self.controller.about_text)
+        dialog.set_version(self.controller.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)
+
+        return label
diff --git a/package/src/ui/fremantle/characterSheet.py b/package/src/ui/fremantle/characterSheet.py
new file mode 100644 (file)
index 0000000..ccfa390
--- /dev/null
@@ -0,0 +1,218 @@
+#
+# mEveMon - A character monitor for EVE Online
+# Copyright (c) 2010  Ryan and Danny Campbell, and the mEveMon Team
+#
+# mEveMon is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# mEveMon is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+import time
+
+import hildon
+import gtk
+import gobject
+
+import util
+import ui.fremantle.base as base
+import ui.models as models
+
+class CharacterSheetUI(base.BaseUI):
+    UPDATE_INTERVAL = 1
+
+    def __init__(self, controller, char_name, uid):
+        self.controller = controller
+        self.char_name = char_name
+        self.uid = uid
+        self.sheet = None
+        self.char_id = None
+        self.skills_model = None
+        
+        self.build_window()
+
+
+    def build_window(self):
+        # TODO: this is a really long and ugly function, split it up somehow
+
+        self.win = hildon.StackableWindow()
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 1)
+        self.win.show_all() 
+
+        # Create menu
+        # NOTE: we probably want a window-specific menu for this page, but the
+        # main appmenu works for now
+        menu = self.create_menu(self.win)
+        # Attach menu to the window
+        self.win.set_app_menu(menu)
+
+        pannable_area = hildon.PannableArea()
+
+        self.char_id = self.controller.char_name2id(self.char_name)
+
+        self.sheet = self.controller.get_char_sheet(self.uid, self.char_id)
+
+        self.win.set_title(self.char_name)
+
+
+        hbox = gtk.HBox(False, 0)
+        info_vbox = gtk.VBox(False, 0)
+
+        portrait = gtk.Image()
+        portrait.set_from_file(self.controller.get_portrait(self.char_name, 256))
+        portrait.show()
+
+        hbox.pack_start(portrait, False, False, 10)
+        hbox.pack_start(info_vbox, False, False, 5)
+
+        vbox = gtk.VBox(False, 0)
+        pannable_area.add_with_viewport(vbox)
+
+        vbox.pack_start(hbox, 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")
+
+        self.display_skill_in_training(vbox)
+
+        separator = gtk.HSeparator()
+        vbox.pack_start(separator, False, False, 0)
+        separator.show()
+        
+        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)
+        
+        # if we start the timer too early, get_is_topmost() returns False
+        self.timer = gobject.timeout_add_seconds(self.UPDATE_INTERVAL, self.update_live_sp)
+
+        self.win.connect("destroy", self.back)
+
+    def back(self, widget):
+        gobject.source_remove(self.timer)
+        gtk.Window.destroy(self.win)
+
+
+    def display_skill_in_training(self, vbox):
+        skill = self.controller.get_skill_in_training(self.uid, 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>" 
+                    %(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")
+
+
+
+    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>" % 
+                util.comma(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>" %
+                util.comma(int(self.live_sp_val)), box)
+        
+        self.spps = self.controller.get_spps(self.uid, self.char_id)[0]
+
+
+    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
+        renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn('Skill Name', renderer, 
+                markup=models.CharacterSkillsModel.C_NAME)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+        
+        #Column 1 for the treeview
+        column = gtk.TreeViewColumn('Rank', renderer, 
+                markup=models.CharacterSkillsModel.C_RANK)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+
+        #Column 2
+        column = gtk.TreeViewColumn('Points', renderer,
+                markup=models.CharacterSkillsModel.C_SKILLPOINTS)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+
+        #Column 3
+        column = gtk.TreeViewColumn('Level', renderer, 
+                markup=models.CharacterSkillsModel.C_LEVEL)
+        column.set_property("expand", True)
+        treeview.append_column(column)
+
+
+    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(self.win, 0)
+
+
+    def update_live_sp(self):
+        self.live_sp_val = self.live_sp_val + self.spps * self.UPDATE_INTERVAL
+        self.live_sp.set_label("<small><b>Total SP:</b> %s</small>" %
+                                util.comma(int(self.live_sp_val)))
+
+        return True
index 7f4ccce..8a1ceab 100644 (file)
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import sys, time
-
 import gtk
 import hildon
 import gobject
 
-from ui import models
+from characterSheet import CharacterSheetUI
+import ui.models as models
 import validation
-import util
-
-class BaseUI():
-    menu_items = ("Settings", "About", "Refresh")
-
-    def create_menu(self, window):
-        menu = hildon.AppMenu()
-
-        for command in self.menu_items:
-            # Create menu entries
-            button = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
-            button.set_label(command)
-
-            if command == "About":
-                button.connect("clicked", self.about_clicked)
-            elif command == "Settings":
-                button.connect("clicked", self.settings_clicked, window)
-            elif command == "Refresh":
-                button.connect("clicked", self.refresh_clicked)
-            else:
-                assert False, command
-
-            # Add entry to the view menu
-            menu.append(button)
-
-        menu.show_all()
-
-        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")
-
-        pannable_area = hildon.PannableArea()
-
-        dialog_vbox = dialog.vbox
-
-        vbox = gtk.VBox(False, 1)
-
-        self.accounts_model = models.AccountsModel(self.controller)
-        
-        accounts_treeview = hildon.GtkTreeView(gtk.HILDON_UI_MODE_NORMAL)
-        accounts_treeview.set_model(self.accounts_model)
-        accounts_treeview.set_headers_visible(True)
-        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)
-        
-        pannable_area.add_with_viewport(vbox)
-        
-        dialog_vbox.pack_start(pannable_area, True, True, 1)
-      
-      
-        dialog.show_all()
-
-        result = dialog.run()
-
-        while(result != gtk.RESPONSE_DELETE_EVENT):
-            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()
+import ui.fremantle.base as base
 
-        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('User ID', renderer, 
-                text=models.AccountsModel.C_UID)
-        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
-        vbox = dialog.vbox
-    
-        dialog.set_transient_for(window)
-        dialog.set_title("New Account")
-
-        uidLabel = gtk.Label("User ID:")
-        uidLabel.set_justify(gtk.JUSTIFY_LEFT)
-        vbox.add(uidLabel)
-        
-        uidEntry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        uidEntry.set_placeholder("User ID")
-        uidEntry.set_property('is_focus', False)
-        
-        vbox.add(uidEntry)
-
-        apiLabel = gtk.Label("API key:")
-        apiLabel.set_justify(gtk.JUSTIFY_LEFT)
-        vbox.add(apiLabel)
-        
-        apiEntry = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        apiEntry.set_placeholder("API Key")
-        apiEntry.set_property('is_focus', False)
-
-        vbox.add(apiEntry)
-       
-        ok_button = dialog.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
-
-        dialog.show_all()
-        result = dialog.run()
-        
-        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()
-
-
-    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.controller.about_website)
-        dialog.set_website_label(self.controller.about_website)
-        dialog.set_name(self.controller.about_name)
-        dialog.set_authors(self.controller.about_authors)
-        dialog.set_comments(self.controller.about_text)
-        dialog.set_version(self.controller.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)
-
-        return label
-
-class mEveMonUI(BaseUI):
+class mEveMonUI(base.BaseUI):
 
     def __init__(self, controller):
         self.controller = controller
@@ -303,199 +101,4 @@ class mEveMonUI(BaseUI):
             pass
 
 
-class CharacterSheetUI(BaseUI):
-    UPDATE_INTERVAL = 1
-
-    def __init__(self, controller, char_name, uid):
-        self.controller = controller
-        self.char_name = char_name
-        self.uid = uid
-        self.sheet = None
-        self.char_id = None
-        self.skills_model = None
-        
-        self.build_window()
-
-
-    def build_window(self):
-        # TODO: this is a really long and ugly function, split it up somehow
-
-        self.win = hildon.StackableWindow()
-        hildon.hildon_gtk_window_set_progress_indicator(self.win, 1)
-        self.win.show_all() 
-
-        # Create menu
-        # NOTE: we probably want a window-specific menu for this page, but the
-        # main appmenu works for now
-        menu = self.create_menu(self.win)
-        # Attach menu to the window
-        self.win.set_app_menu(menu)
-
-        pannable_area = hildon.PannableArea()
-
-        self.char_id = self.controller.char_name2id(self.char_name)
-
-        self.sheet = self.controller.get_char_sheet(self.uid, self.char_id)
-
-        self.win.set_title(self.char_name)
-
-
-        hbox = gtk.HBox(False, 0)
-        info_vbox = gtk.VBox(False, 0)
-
-        portrait = gtk.Image()
-        portrait.set_from_file(self.controller.get_portrait(self.char_name, 256))
-        portrait.show()
-
-        hbox.pack_start(portrait, False, False, 10)
-        hbox.pack_start(info_vbox, False, False, 5)
-
-        vbox = gtk.VBox(False, 0)
-        pannable_area.add_with_viewport(vbox)
-
-        vbox.pack_start(hbox, 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")
-
-        self.display_skill_in_training(vbox)
-
-        separator = gtk.HSeparator()
-        vbox.pack_start(separator, False, False, 0)
-        separator.show()
-        
-        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)
-        
-        # if we start the timer too early, get_is_topmost() returns False
-        self.timer = gobject.timeout_add_seconds(self.UPDATE_INTERVAL, self.update_live_sp)
-
-        self.win.connect("destroy", self.back)
-
-    def back(self, widget):
-        gobject.source_remove(self.timer)
-        gtk.Window.destroy(self.win)
-
-
-    def display_skill_in_training(self, vbox):
-        skill = self.controller.get_skill_in_training(self.uid, 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>" 
-                    %(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")
-
-
-
-    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>" % 
-                util.comma(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>" %
-                util.comma(int(self.live_sp_val)), box)
-        
-        self.spps = self.controller.get_spps(self.uid, self.char_id)[0]
-
-
-    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
-        renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('Skill Name', renderer, 
-                markup=models.CharacterSkillsModel.C_NAME)
-        column.set_property("expand", True)
-        treeview.append_column(column)
-        
-        #Column 1 for the treeview
-        column = gtk.TreeViewColumn('Rank', renderer, 
-                markup=models.CharacterSkillsModel.C_RANK)
-        column.set_property("expand", True)
-        treeview.append_column(column)
-
-        #Column 2
-        column = gtk.TreeViewColumn('Points', renderer,
-                markup=models.CharacterSkillsModel.C_SKILLPOINTS)
-        column.set_property("expand", True)
-        treeview.append_column(column)
-
-        #Column 3
-        column = gtk.TreeViewColumn('Level', renderer, 
-                markup=models.CharacterSkillsModel.C_LEVEL)
-        column.set_property("expand", True)
-        treeview.append_column(column)
-
-
-    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(self.win, 0)
-
-
-    def update_live_sp(self):
-        self.live_sp_val = self.live_sp_val + self.spps * self.UPDATE_INTERVAL
-        self.live_sp.set_label("<small><b>Total SP:</b> %s</small>" %
-                                util.comma(int(self.live_sp_val)))
-
-        return True
-
-
-if __name__ == "__main__":
-    main()