Added file filter to files Cli_Presentation

[findit] / src / main.py

diff --git a/src/main.py b/src/main.py
index a5e7fbf..0fc7332 100755 (executable)
--- a/src/main.py
+++ b/src/main.py
@@ -61,10 +61,17 @@ class Cli_Presentation(object):
 
         self.search = options.search
 
-        self.params = {}
-        self.params['outtype'] = options.output
-        self.params['ignore_dirs'] = config['files']['ignore_dirs']  ###
-        self.params['start_path'], self.params['count'] = options.params.split()
+        self.options = {}
+        self.options['outtype'] = options.output
+        self.options['ignore_dirs'] = config['files']['ignore_dirs']
+
+        self.params = options.params.split()
+        self.options['start_path'] = self.params[0]
+        self.options['count'] = self.params[1]
+        try:
+            self.options['file_filter'] = self.params[2]
+        except IndexError:
+            self.options['file_filter'] = '*.*'
 
     def _about(self, *a):
         print self.abstrac.comments
@@ -76,7 +83,7 @@ class Cli_Presentation(object):
 
     def show_search_toplevel(self):
         search_module = __import__(self.search + '.search')
-        search_toplevel = search_module.search.Control('Cli', self.params).run()
+        search_toplevel = search_module.search.Control('Cli', self.options).run()
 
     def run(self):
         self.show_search_toplevel()
@@ -140,12 +147,14 @@ class Gtk_Presentation(object):
     def __init__(self, abstrac):
         import gtk
         global gtk  # for run()
+        import gobject
+        gobject.set_application_name(__progname__)
+
         self.abstrac = abstrac
 
         self.window = gtk.Window()
         self.window.set_default_size(600, 400)
         self.window.set_geometry_hints(None, 600, 400)
-        self.window.set_border_width(4)
         self.window.set_wmclass('MainWindow', 'FindIT')
         self.window.connect('destroy', gtk.main_quit)
 
@@ -161,17 +170,14 @@ class Gtk_Presentation(object):
 
     #=== Search selecting =====================================================
     def show_search_toplevel(self, btn, searchtype):
-        print 'Entering <' + searchtype + '> search mode...'
-
         search_module = __import__(searchtype + '.search')
         search = search_module.search.Control('Gtk', None)
         search_toplevel = search.toplevel
-
         try:
             self.vbox.remove(self.vbox.get_children()[2])
         except:
             pass
-        self.vbox.pack_start(search_toplevel, True, True, 4)
+        self.vbox.pack_start(search_toplevel, True, True, 0)
         search_toplevel.show_all()
 
     def run(self):