Moved toolbar in files.out_table outside __init__

[findit] / src / files / out_table.py

diff --git a/src/files/out_table.py b/src/files/out_table.py
index 3cd09a1..ef59d46 100755 (executable)
--- a/src/files/out_table.py
+++ b/src/files/out_table.py
@@ -9,7 +9,8 @@ from misc import _
 #==============================================================================
 
 class Cli_Presentation(object):
-    def __init__(self, filelist):   ###
+    def __init__(self, results):   ###
+        filelist, start_path = results
         self.toplevel = self.print_results(filelist)
 
     def print_results(self, filelist):
@@ -19,6 +20,32 @@ class Cli_Presentation(object):
 #==============================================================================
 
 class Gtk_Presentation(object):
+
+    def _create_toolbar(self):
+        toolbar = gtk.Toolbar()
+        toolbar.set_property('icon-size', 'small-toolbar')
+
+        abs_paths_tbtn = gtk.ToggleToolButton()
+        abs_paths_tbtn.set_label(_('Absolute paths'))
+        abs_paths_tbtn.connect('clicked', self._show_abspaths)
+
+        bitesizes_tbtn = gtk.ToggleToolButton()
+        bitesizes_tbtn.set_label(_('Sizes in bytes'))
+        bitesizes_tbtn.connect('clicked', self._show_bitesizes)
+
+        saveresults_tbtn = gtk.ToolButton('gtk-save')
+        saveresults_tbtn.connect('clicked', self.save_results)
+
+        copyresults_tbtn = gtk.ToolButton('gtk-copy')
+        copyresults_tbtn.connect('clicked', self.copy_results)
+
+        toolbar.insert(abs_paths_tbtn, -1)
+        toolbar.insert(bitesizes_tbtn, -1)
+        toolbar.insert(saveresults_tbtn, -1)
+        toolbar.insert(copyresults_tbtn, -1)
+
+        return toolbar
+
     def __init__(self, results):   ###
         import gtk
         global gtk  # for save_results and copy_results
@@ -65,34 +92,10 @@ class Gtk_Presentation(object):
         swin.add(treeview)
 
         #====================
-        # Toolbar
+        # Packing
         #====================
 
-        toolbar = gtk.Toolbar()
-        toolbar.set_property('icon-size', 'small-toolbar')
-
-        abs_paths_tbtn = gtk.ToggleToolButton()
-        abs_paths_tbtn.set_label(_('Absolute paths'))
-        abs_paths_tbtn.connect('clicked', self._show_abspaths)
-
-        bitesizes_tbtn = gtk.ToggleToolButton()
-        bitesizes_tbtn.set_label(_('Sizes in bytes'))
-        bitesizes_tbtn.connect('clicked', self._show_bitesizes)
-
-        saveresults_tbtn = gtk.ToolButton('gtk-save')
-        saveresults_tbtn.connect('clicked', self.save_results)
-
-        copyresults_tbtn = gtk.ToolButton('gtk-copy')
-        copyresults_tbtn.connect('clicked', self.copy_results)
-
-        toolbar.insert(abs_paths_tbtn, -1)
-        toolbar.insert(bitesizes_tbtn, -1)
-        toolbar.insert(saveresults_tbtn, -1)
-        toolbar.insert(copyresults_tbtn, -1)
-
-        #====================
-        # Others
-        #====================
+        toolbar = self._create_toolbar()
 
         vbox = gtk.VBox(False, 0)
         vbox.pack_start(swin, True, True, 0)