merging from master

diff --cc src/findit.py
index 45e9e31,a286fca..c623ebf
--- 1/src/findit.py
--- 2/src/findit.py
+++ b/src/findit.py
@@@ -90,10 -86,9 +90,9 @@@ def toggle_fullscreen(obj)
  def on_key_press(obj, event):
      """Key press callback."""
      # Toggle fullscreen on Maemo when hw key is pressed
 -    if hildonFound and event.keyval == gtk.keysyms.F6:
 +    if HILDON and event.keyval == gtk.keysyms.F6:
          toggle_fullscreen(obj)
  
- 
  ### Properties dialog ##########################################################
  
  class PropertiesDialog(gtk.Dialog):
@@@ -230,52 -213,8 +204,8 @@@ class MainWindow(gtk.Window)
          except (TypeError, ValueError):
              self.mess_window('error', _('Please select file') )
              return
 -        PropertiesDialog(path, size, bytesize)
 +        PropertiesDialog(self, path, size, bytesize)
  
-     # Создание меню
-     def create_menu(self):
-         """ Create main menu """
-         menubar = gtk.MenuBar()
- 
-         # File menu
-         fileitem = gtk.MenuItem( _('_File') )     # Файл
-         filemenu = gtk.Menu()
-         fileitem.set_submenu(filemenu)
- 
-         open_menuitem = gtk.ImageMenuItem(gtk.STOCK_OPEN)
-         delete_menuitem = gtk.ImageMenuItem(gtk.STOCK_DELETE)
-         properties_menuitem = gtk.ImageMenuItem(gtk.STOCK_PROPERTIES)
-         quit_menuitem = gtk.ImageMenuItem(gtk.STOCK_QUIT)
-         filemenu.add(open_menuitem)
-         filemenu.add(delete_menuitem)
-         filemenu.add(properties_menuitem)
-         filemenu.add(quit_menuitem)
-         properties_menuitem.connect('activate', self.show_properties_dialog)
-         quit_menuitem.connect('activate', gtk.main_quit)
- 
-         # View menu
-         viewitem = gtk.MenuItem( _('_View') )    # Вид
-         viewmenu = gtk.Menu()
- 
-         # Help menu
-         helpitem = gtk.MenuItem( _('_Help') )    # Помощь
-         helpmenu = gtk.Menu()
-         helpitem.set_submenu(helpmenu)
- 
-         about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT)
-         helpmenu.add(about_menuitem)
-         about_menuitem.connect('activate', AboutDialog)
- 
-         # Packing
-         menubar.add(fileitem)
-         menubar.add(viewitem)
-         menubar.add(helpitem)
- 
-         return menubar
- 
- #     def create_hildon_menu(self):
- #         """ Create Hildon main menu """
- 
      ### Window initialization ##################################################
  
      def __init__(self, win_width, win_height, st_path):
@@@ -369,22 -308,43 +299,16 @@@
          # 6.2 Надпись "Найти"
  
          # 6.3 Строка выводящая текущий осматриваемый файл
 -        self.currFileLbl = gtk.Label()
 -        self.currFileLbl.set_alignment(0, 0.5)
 -        self.currFileLbl.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 -        self.currFileLbl.set_padding(2, 2)
 -        currFileFrm = gtk.Frame()
 -        currFileFrm.add(self.currFileLbl)
 -
 -        # 7 Меню
 -        if not hildonFound:
 -            menubar = gtk.MenuBar()
 -    
 -            menubaritem0 = gtk.MenuItem('menubaritem0')
 -            menu0 = gtk.Menu()
 -            menuitem00 = gtk.MenuItem('item00')
 -            menuitem01 = gtk.MenuItem('item01')
 -            menuitem02 = gtk.MenuItem('item02')
 -            menu0.add(menuitem00)
 -            menu0.add(menuitem01)
 -            menu0.add(menuitem02)
 -            menubaritem0.set_submenu(menu0)
 -    
 -            menubaritem1 = gtk.MenuItem('menubaritem1')
 -            menu1 = gtk.Menu()
 -            menuitem10 = gtk.MenuItem('item10')
 -            menuitem11 = gtk.MenuItem('item11')
 -            menuitem12 = gtk.MenuItem('item12')
 -            menu1.add(menuitem10)
 -            menu1.add(menuitem11)
 -            menu1.add(menuitem12)
 -            menubaritem1.set_submenu(menu1)
 -    
 -            menubar.add(menubaritem0)
 -            menubar.add(menubaritem1)
 +        self.currfilelbl = gtk.Label()
 +        self.currfilelbl.set_alignment(0, 0.5)
 +        self.currfilelbl.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 +        self.currfilelbl.set_padding(2, 2)
 +        currfilefrm = gtk.Frame()
 +        currfilefrm.add(self.currfilelbl)
  
-         # 7 Меню
-         if HILDON:
-             main_menu = self.create_hildon_menu()
-         else:
-             main_menu = self.create_menu()
- 
          #########  Упаковываем элементы ################
          # Создаем основной вертикальный контейнер
 -        main_Vbox = gtk.VBox(False, 4)
 +        main_vbox = gtk.VBox(False, 4)
  
          # Создаем вспомогательный горизонтальный контейнер для Надписи1,
          # окошка ввода количества файлов и кнопки "Показать"
@@@ -394,17 -354,17 +318,16 @@@
          hbox1.pack_start(self.file_cnt, False, False, 0)
          hbox1.pack_start(self.butt_start, True, True, 0)
          hbox1.pack_start(self.butt_stop, True, True, 0)
 -        hbox1.pack_start(self.propertiesBtn, True, True, 0)
 +        hbox1.pack_start(self.propertiesbtn, True, True, 0)
  
          # Добавляем элементы в основной контейнер
-         main_vbox.pack_start(main_menu, False, False, 0)
 -        main_Vbox.pack_start(menubar, False, False, 0)
 -        main_Vbox.pack_start(self.srch_p_entr, False, False, 0)
 -        main_Vbox.pack_start(hbox1, False, False, 0)
 +        main_vbox.pack_start(self.srch_p_entr, False, False, 0)
 +        main_vbox.pack_start(hbox1, False, False, 0)
          scrollwind.add(self.treeview)
 -        main_Vbox.pack_start(scrollwind, True, True, 0)
 -        main_Vbox.pack_start(currFileFrm, False, False, 0)
 +        main_vbox.pack_start(scrollwind, True, True, 0)
 +        main_vbox.pack_start(currfilefrm, False, False, 0)
  
 -        self.add(main_Vbox)
 +        self.add(main_vbox)
  
      def run(self):
          """Show all widgets and run gtk.main()."""