Objects updates again

[findit] / src / main.py

diff --git a/src/main.py b/src/main.py
index ce3188c..f988978 100755 (executable)
--- a/src/main.py
+++ b/src/main.py
@@ -52,7 +52,7 @@ class Gtk_Presentation(object):
         import gtk
 
         def _create_menu():
-            """ Create main menu """
+            """Create main menu."""
             menubar = gtk.MenuBar()
             fileitem = gtk.MenuItem( '_File' )
             viewitem = gtk.MenuItem( '_View' )
@@ -62,6 +62,23 @@ class Gtk_Presentation(object):
             menubar.add(helpitem)
             return menubar
 
+        def _create_toolbar():
+            """Create toolbar."""
+            toolbar = gtk.Toolbar()
+            filesearch_tbtn = gtk.RadioToolButton(None)
+            debsearch_tbtn = gtk.RadioToolButton(filesearch_tbtn)
+
+            filesearch_tbtn.set_label('Files search')
+            debsearch_tbtn.set_label('Debs search')
+
+            filesearch_tbtn.connect('clicked', self.show_search_toplevel, 'files')
+            debsearch_tbtn.connect('clicked', self.show_search_toplevel, 'debs')
+
+            toolbar.insert(filesearch_tbtn, -1)
+            toolbar.insert(debsearch_tbtn, -1)
+
+            return toolbar
+
         window = gtk.Window()
         window.set_default_size(560, 400)
         window.set_border_width(4)
@@ -69,25 +86,26 @@ class Gtk_Presentation(object):
         window.connect('destroy', gtk.main_quit)
 
         menu = _create_menu()
-
-        about_btn = gtk.Button('About')
-        about_btn.set_size_request(-1, 30)
-        about_btn.connect('clicked', self.about_dialog)
-
-        quit_btn = gtk.Button('Exit')
-        quit_btn.connect('clicked', gtk.main_quit)
-
-        file_btn = gtk.Button('Files search')
-        file_btn.connect('clicked', self.show_search_toplevel, 'files')
-
-        deb_btn = gtk.Button('Debs search')
-        deb_btn.connect('clicked', self.show_search_toplevel, 'debs')
-
-        toolbar = gtk.HBox(True, 4)
-        toolbar.pack_start(file_btn)
-        toolbar.pack_start(deb_btn)
-        toolbar.pack_start(about_btn)
-        toolbar.pack_start(quit_btn)
+        toolbar = _create_toolbar()
+
+#         about_btn = gtk.Button('About')
+#         about_btn.set_size_request(-1, 30)
+#         about_btn.connect('clicked', self.about_dialog)
+# 
+#         quit_btn = gtk.Button('Exit')
+#         quit_btn.connect('clicked', gtk.main_quit)
+# 
+#         file_btn = gtk.Button('Files search')
+#         file_btn.connect('clicked', self.show_search_toplevel, 'files')
+# 
+#         deb_btn = gtk.Button('Debs search')
+#         deb_btn.connect('clicked', self.show_search_toplevel, 'debs')
+
+#         toolbar = gtk.HBox(True, 4)
+#         toolbar.pack_start(file_btn)
+#         toolbar.pack_start(deb_btn)
+#         toolbar.pack_start(about_btn)
+#         toolbar.pack_start(quit_btn)
 
         self.vbox = gtk.VBox(False, 4)
         self.vbox.pack_start(menu, False, False, 0)
@@ -107,13 +125,14 @@ class Gtk_Presentation(object):
         print 'Entering <' + searchtype + '> search mode...'
 
         search_module = __import__(searchtype + '.search')
-        toplevel = search_module.search.Control('gtk').run()
+        search_toplevel = search_module.search.Control('gtk').run()
 
         try:
             self.vbox.remove(self.vbox.get_children()[2])
         except:
             pass
-        self.vbox.pack_start(toplevel, True, True, 0)
+        self.vbox.pack_start(search_toplevel, True, True, 0)
+        search_toplevel.show_all()
 
 #==============================================================================