Added Pango markup to Diablo UI.

diff --git a/src/ui/diablo/ui.py b/src/ui/diablo/ui.py
index 86c8708..7b023f9 100644 (file)
--- a/src/ui/diablo/ui.py
+++ b/src/ui/diablo/ui.py
@@ -90,33 +90,43 @@ class mEveMonUI():
 
         win.set_title(char_name)
         
-        skillLabel = gtk.Label("Skills")
+        skillLabel = gtk.Label("<big><big>Skills</big></big>")
+        skillLabel.set_use_markup( True )
 
-        name = gtk.Label("Name: %s" % char_name)
+        name = gtk.Label("<big><big>%s</big></big>" % char_name)
+        name.set_use_markup(True)
         name.set_alignment(0, 0.5)
 
-        race = gtk.Label("%s %s %s" % (sheet.gender, sheet.race,
+        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("Corp: %s" % sheet.corporationName)
+        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("Intelligence: %d" % sheet.attributes.intelligence)
+        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("Memory: %d" % sheet.attributes.memory)
+        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("Charisma: %d" % sheet.attributes.charisma)
+        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("Perception: %d" % sheet.attributes.perception)
+        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("Willpower: %d" % sheet.attributes.willpower)
+        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)
+#        blank_label = gtk.Label('')
+#        blank_label.set_alignment(0, 0.5)
 
         portrait = gtk.Image()
         portrait.set_from_file(self.controller.get_portrait(char_name, 256))
@@ -124,13 +134,13 @@ class mEveMonUI():
         
         hbox = gtk.HBox(False, 0)
 
-        info_vbox = gtk.VBox(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(blank_label, False, False, 1)
 
         info_vbox.pack_start(intel, False, False, 1)
         info_vbox.pack_start(mem, False, False, 1)
@@ -162,13 +172,13 @@ class mEveMonUI():
     def add_columns_to_skills_view(self, treeview):
         #Column 0 for the treeview
         renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('Skill Name', renderer, text=0)
+        column = gtk.TreeViewColumn('Skill Name', renderer, markup=0)
         column.set_property("expand", True)
         treeview.append_column(column)
         
         #Column 1 for the treeview
         renderer = gtk.CellRendererText()
-        column = gtk.TreeViewColumn('Skill Info', renderer, text=1)
+        column = gtk.TreeViewColumn('Skill Info', renderer, markup=1)
         column.set_property("expand", True)
         treeview.append_column(column)
 
@@ -197,7 +207,8 @@ class mEveMonUI():
                     
                     # add row for this skill
                     liter = lstore.append()
-                    lstore.set(liter, 0, "%s (Rank %d)" % (skill.typeName, skill.rank), 1, "SP: %d Level %d" % (trained.skillpoints, trained.level))
+
+                    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