[kernel] r5701 - people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor

[Bastian Blank]

Author: waldi
Date: Fri Feb  3 01:20:04 2006
New Revision: 5701

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/editor.py
Log:
debian/lib/python/debian_linux/kconfigeditor/editor.py: Decrease cpu usage.


Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/editor.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/editor.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/kconfigeditor/editor.py	Fri Feb  3 01:20:04 2006
@@ -55,7 +55,6 @@
 
 class editor(object):
     def __init__(self):
-        self.cells = {}
         self.columns = {}
         self.file_inodes = {}
         self.items = {}
@@ -104,7 +103,6 @@
         cell = gtk.CellRendererText()
         col.pack_start(cell, False)
         col.set_cell_data_func(cell, self.cell_data, (None, None, None))
-        self.cells[(None, None, None)] = cell
         self.columns[None] = col
 
     def add_data(self, arch, subarch = None, flavour = None):
@@ -114,7 +112,6 @@
             cell = gtk.CellRendererText()
             col.pack_start(cell, False)
             col.set_cell_data_func(cell, self.cell_data, (arch, None, None))
-            self.cells[(arch, None, None)] = cell
             self.columns[arch] = col
             self.variants[arch] = sorted_dict()
 
@@ -122,21 +119,15 @@
             return
         variant_arch = self.variants[arch]
         if not variant_arch.has_key(subarch):
-            if subarch != 'none':
-                cell = gtk.CellRendererText()
-                self.columns[arch].pack_start(cell, False)
-                self.columns[arch].set_cell_data_func(cell, self.cell_data, (arch, subarch, None))
-                self.cells[(arch, subarch, None)] = cell
+            cell = gtk.CellRendererText()
+            self.columns[arch].pack_start(cell, False)
+            self.columns[arch].set_cell_data_func(cell, self.cell_data, (arch, subarch, None))
             variant_arch[subarch] = sorted_dict()
 
         if flavour is None:
             return
         variant_subarch = variant_arch[subarch]
         if not variant_subarch.has_key(flavour):
-            cell = gtk.CellRendererText()
-            self.columns[arch].pack_start(cell, False)
-            self.columns[arch].set_cell_data_func(cell, self.cell_data, (arch, subarch, flavour))
-            self.cells[(arch, subarch, flavour)] = cell
             variant_subarch[flavour] = True
 
     def add_file(self, file, arch = None, subarch = None, flavour = None):
@@ -154,7 +145,15 @@
 
     def cell_data(self, column, cell, model, iter, data):
         key = model.get_value(iter, 0)
-        text = self.items[data].get_summary(key, "-")
+        if data[1] is not None:
+            text = []
+            if data[1] is not 'none':
+                text.append(self.items[data].get_summary(key, "-"))
+            for flavour in self.variants[data[0]][data[1]].iterkeys():
+                text.append(self.items[(data[0], data[1], flavour)].get_summary(key, "-"))
+            text = ''.join(text)
+        else:
+            text = self.items[data].get_summary(key, "-")
         cell.set_property('text', text)
 
     def show(self):