creating wizard view - minor changes in src/pkgsearch.py

diff --git a/src/pkgsearch.py b/src/pkgsearch.py
index 0c46f9d..aea9257 100644 (file)
--- a/src/pkgsearch.py
+++ b/src/pkgsearch.py
@@ -2,6 +2,7 @@
 # -*-coding: utf-8 -*-
 # vim: sw=4 ts=4 expandtab ai
 
+import gtk
 import apt_pkg
 from heapq import nlargest
 from misc import size_hum_read
@@ -11,15 +12,21 @@ class Search_Pkg_Control(object):
     def __init__(self, config, show_funct):
         win_width = config.get('window_width')
         win_height = config.get('window_height')
+        count = config.get('default_count')
         self.show_func = show_funct
         self.abstr = Search_Pkg_Abstraction()
-        self.present = Search_Pkg_Presentation(win_width, win_height, self.start_search)
+        self.present = Search_Pkg_Presentation(win_width, win_height, count, self.start_search)
 
     def start_search(self, count):
         pkglist = []
         for psize, packg in nlargest(count, self.abstr.pkggetter()):
             pkglist.append([packg, size_hum_read(psize), psize])
-        self.show_func(pkglist)
+        print pkglist
+        self.show_func.show(pkglist)
+        self.show_func.run()
+
+    def run(self):
+        self.present.run()
 
 
 class Search_Pkg_Abstraction(object):
@@ -38,7 +45,7 @@ class Search_Pkg_Abstraction(object):
 
 class Search_Pkg_Presentation(gtk.Window):
 
-    def __init__(self, win_width, win_height, st_func):
+    def __init__(self, win_width, win_height, count, st_func):
         """Create MainWindow."""
         # Создаем новое окно
         gtk.Window.__init__(self)
@@ -59,7 +66,7 @@ class Search_Pkg_Presentation(gtk.Window):
         self.butt_start.connect('released', self.start_srch, st_func)
         
         self.butt_prev = gtk.Button('< Previous')
-        self.butt_prev.connect('released', self.show_prev, prev_window)
+        #self.butt_prev.connect('released', self.show_prev, prev_window)
         
         hbox1 = gtk.HBox(False, 0)
         hbox1.pack_start(self.butt_prev, False, False, 5)
@@ -67,12 +74,12 @@ class Search_Pkg_Presentation(gtk.Window):
 
         vbox = gtk.VBox(False, 0)
         vbox.pack_start(hbox, False, False, 5)
-        vbox.pack_start(self.butt_start, False, False, 5)
+        vbox.pack_start(hbox1, False, False, 5)
 
         self.add(vbox)
 
-    def get_ui(self):
-        return self
+    #def get_ui(self):
+    #    return self
 
     def get_data(self):
         return int( self.file_cnt.get_value() )
@@ -82,6 +89,6 @@ class Search_Pkg_Presentation(gtk.Window):
         gtk.main()
 
     def start_srch(self, widget, start_func):
-        self.destroy
+        self.destroy()
         gtk.main_quit()
         start_func(self.get_data())