Forgot a file

[multilist] / src / libview.py

diff --git a/src/libview.py b/src/libview.py
index eb88e8f..df6be0e 100644 (file)
--- a/src/libview.py
+++ b/src/libview.py
@@ -20,11 +20,14 @@ along with Multilist.  If not, see <http://www.gnu.org/licenses/>.
 Copyright (C) 2008 Christoph Würstle
 """
 
+import logging
+
 import gtk
 import gobject
-import logging
 import pango
 
+import gtk_toolbox
+
 
 try:
        _
@@ -307,6 +310,7 @@ class CellRendererCombo2(gtk.GenericCellRenderer):
 
                return x_offset, y_offset, width, height
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def on_clicked(self,  widget, data):
                print widget, data
 
@@ -379,43 +383,9 @@ class View(gtk.VBox):
                self.scrolled_window = None
                self.reload_view()
 
-               """
-               bearbeitenFrame = gtk.Frame("Verteilung kopieren nach")
-               bearbeitenvBox = gtk.VBox(homogeneous = False, spacing = 0)
-               
-               bearbeitenhBox = gtk.HBox(homogeneous = False, spacing = 0)
-               self.comboKlassen = gtk.combo_box_new_text()
-               bearbeitenhBox.pack_start(self.comboKlassen, expand = False, fill = True, padding = 0)
-               button = gtk.Button("Kopieren")
-               button.connect("clicked", self.kopiereStoffverteilung, None)
-               bearbeitenhBox.pack_start(button, expand = False, fill = True, padding = 0)
-               
-               label = gtk.Label("   ")
-               bearbeitenhBox.pack_start(label, expand = False, fill = True, padding = 0)
-               
-               button = gtk.Button("Export in CSV-Datei")
-               button.connect("clicked", self.exportStoffverteilung, None)
-               bearbeitenhBox.pack_start(button, expand = False, fill = True, padding = 0)
-               
-               bearbeitenvBox.pack_start(bearbeitenhBox, expand = False, fill = True, padding = 0)
-               
-       
-               bearbeitenFrame.add(bearbeitenvBox)
-               self.pack_start(bearbeitenFrame, expand = False, fill = True, padding = 0)
-               """
-
-               #self.connect("unmap", self.speichere) 
-               #self.connect("map", self.ladeWirklich) 
-
-               #self.show_all()
-
-               #print "libstoffverteilung 9: ", time.clock()
-
        def loadList(self):
                ls = self.liststorehandler.get_liststore()
                self.treeview.set_model(ls)
-               #self.tvcolumn[i].add_attribute( self.cell[i], "active", 1)
-               #print "setup", ls
 
        def col_edited(self, cell, irow, new_text, icol = None):
                if (irow != 4):
@@ -424,10 +394,9 @@ class View(gtk.VBox):
                        print cell, irow, new_text, icol
 
        def col_toggled(self, widget, irow, status ):
-               #print irow, ls[irow][1], status
                ls = self.treeview.get_model()
 
-               if self.liststorehandler.selection.get_status() == "0":
+               if self.liststorehandler.get_filter() == self.liststorehandler.SHOW_ACTIVE:
                        if ls[irow][1] == "0":
                                self.liststorehandler.update_row(irow, 1, "1")
                        else:
@@ -440,25 +409,19 @@ class View(gtk.VBox):
                        else:
                                self.liststorehandler.update_row(irow, 1, "0")
 
-               #self.tvcolumn[i].set_attributes( self.cell[i], active = i)
-
        def convert(self, s):
-               #print s
-               if (s == "1"):
+               if s == "1":
                        return 1
                else:
                        return 0
 
        def del_active_row(self):
                path, col = self.treeview.get_cursor()
-               #print path, col
                if path is not None:
                        irow = path[0]
                        row_iter = self.treeview.get_model().get_iter(path)
                        self.liststorehandler.del_row(irow, row_iter)
 
-               #treemodel.get_iter()
-
        def sort_func_function(self, model, iter1, iter2, data = None):
                print "sorting"
 
@@ -481,10 +444,9 @@ class View(gtk.VBox):
                        else:
                                default = "1"
                        if self.db.ladeDirekt("showcol_"+str(self.liststorehandler.get_colname(i)), default) == "1":
-
                                if (i == 1):
                                        self.cell[i] = CellRendererTriple()
-                                       self.tvcolumn[i] =      gtk.TreeViewColumn(self.liststorehandler.get_colname(i), self.cell[i])
+                                       self.tvcolumn[i] =      gtk.TreeViewColumn("", self.cell[i])
                                        self.cell[i].connect( 'status_changed', self.col_toggled)
                                        self.tvcolumn[i].set_attributes( self.cell[i], status = i)
                                elif (i == 3)or(i == 4)or(i == 6):