[Pkg-bazaar-commits] ./bzr-gtk/unstable r593: Merge of info dialog reworking.

[Jasper Groenewegen]

------------------------------------------------------------
revno: 593
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Mon 2008-08-04 22:55:19 +0200
message:
  Merge of info dialog reworking.
  
  
  
  
  
  Why oh why wasn't this merged before the release? :(
modified:
  olive/info.py
    ------------------------------------------------------------
    revno: 577.1.2
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: redo-info
    timestamp: Tue 2008-07-29 17:33:58 +0200
    message:
      Redo info dialog generation after suggestion by Martin Pool
    modified:
      olive/info.py
-------------- next part --------------
=== modified file 'olive/info.py'
--- a/olive/info.py	2008-07-20 16:23:24 +0000
+++ b/olive/info.py	2008-07-29 15:33:58 +0000
@@ -226,6 +226,11 @@
     
     def _generate_info(self, infokeylist):
         """ Generate 'bzr info' output. """
+        expander={}
+        alignment={}
+        table={}
+        label = {}
+        description = {}
         for key, keystring, subkeylist in infokeylist:
             if self.ret.has_key(key):
                 tablelength = 0
@@ -235,31 +240,34 @@
                 if tablelength == 0:
                     pass
                 else:
-                    exec "exp_%s = gtk.Expander('<b>%s</b>')"%(key, keystring)
-                    eval("exp_%s.set_use_markup(True)"%key)
-                    eval("exp_%s.connect('activate', self.activate)"%key)
-                    
-                    exec "alignment_%s = gtk.Alignment()"%key
-                    eval("alignment_%s.set_padding(0, 0, 24, 0)"%key)
-                    eval("exp_%s.add(alignment_%s)"%(key, key))
-                    
-                    exec "table_%s = gtk.Table(tablelength, 2)"%key
-                    eval("table_%s.set_col_spacings(12)"%key)
-                    eval("alignment_%s.add(table_%s)"%(key, key))
+                    expander[key] = gtk.Expander(keystring)
+                    expander[key].set_use_markup(True)
+                    expander[key].connect('activate', self.activate)
+                    
+                    alignment[key]= gtk.Alignment()
+                    alignment[key].set_padding(0, 0, 24, 0)
+                    expander[key].add(alignment[key])
+                    
+                    table[key] = gtk.Table(tablelength, 2)
+                    table[key].set_col_spacings(12)
+                    alignment[key].add(table[key])
+                    
+                    label[key] = {}
+                    description[key] = {}
                     
                     tablepos = 0
                     for subkey, subkeystring in subkeylist:
                         if self.ret[key].has_key(subkey):
-                            exec "%s_%s_label = gtk.Label('%s:')"%(key,subkey, subkeystring)
-                            eval("table_%s.attach(%s_%s_label, 0, 1, %i, %i, gtk.FILL)"%(key, key, subkey, tablepos, tablepos + 1))
-                            eval("%s_%s_label.set_alignment(0, 0.5)"%(key, subkey))
+                            label[key][subkey] = gtk.Label(subkeystring)
+                            table[key].attach(label[key][subkey], 0, 1, tablepos, tablepos + 1, gtk.FILL)
+                            label[key][subkey].set_alignment(0, 0.5)
                             
-                            exec "%s_%s = gtk.Label('%s')"%(key, subkey, str(self.ret[key][subkey]))
-                            eval("table_%s.attach(%s_%s, 1, 2, %i, %i, gtk.FILL)"%(key, key, subkey, tablepos, tablepos + 1))
-                            eval("%s_%s.set_alignment(0, 0.5)"%(key, subkey))
+                            description[key][subkey] = gtk.Label(str(self.ret[key][subkey]))
+                            table[key].attach(description[key][subkey], 1, 2, tablepos, tablepos + 1, gtk.FILL)
+                            description[key][subkey].set_alignment(0, 0.5)
                             tablepos += 1
-                    eval("exp_%s.set_expanded(True)"%key)
-                    eval("self.window.vbox.pack_start(exp_%s, False, True, 0)"%key)
+                    expander[key].set_expanded(True)
+                    self.window.vbox.pack_start(expander[key], False, True, 0)
     
     def activate(self, expander):
         """ Redraw the window. """