--- a/filebrowser/ui/inc/fbfileview.h	Thu Sep 02 20:27:24 2010 +0300
+++ b/filebrowser/ui/inc/fbfileview.h	Fri Sep 17 08:29:47 2010 +0300
@@ -42,7 +42,7 @@
 class HbMenu;
 class HbSearchPanel;
 
-class EditorView;
+class FbEditorView;
 class SearchView;
 class SettingsView;
 class EngineWrapper;
@@ -67,8 +67,8 @@
 
     void openPropertyDialog(const QStringList &propertyList, const QString &title);
 
+    void storeSelectedItemsOrCurrentItem();
     QModelIndex currentItemIndex();
-    void storeSelectedItemsOrCurrentItem();
 
     // Menu related methods
     void createMenu();
@@ -102,14 +102,14 @@
     void doFileNewDirectory(HbAction *);
 
     void fileDelete();
-    void doFileDelete(HbAction *);
+    void doFileDelete(int);
 
     void fileRename();
     void doFileRename(HbAction *);
-    void doFileRenameFileExist(HbAction *);
+    void doFileRenameFileExist(int);
 
     void fileTouch();
-    void doFileTouch(HbAction *);
+    void doFileTouch(int);
     void fileProperties();
 
     void fileChecksumsMD5();
@@ -126,10 +126,10 @@
     void editPaste();
 
     void editCopyToFolder();
-    void doEditCopyToFolder(HbAction *);
+    void doEditCopyToFolder(int);
 
     void editMoveToFolder();
-    void doEditMoveToFolder(HbAction *);
+    void doEditMoveToFolder(int);
 
     void editSelect();
     void editUnselect();
@@ -187,6 +187,7 @@
     void aboutToShowSettingsView();
     void aboutToShowEditorView(const QString &, bool);
     void aboutToShowSearchView(const QString &);
+    void aboutToShowAttributesView(const QString &, quint32 &, quint32 &, bool &);
     void aboutToSimulateLeave(int);
 
 private slots:
@@ -203,6 +204,11 @@
     void fileOverwritePostfix(HbAction *);
 
 private:
+    // Internal methods
+    void proceedFileRename();
+    void proceedFileTouch(bool recurse);
+
+private:
     EngineWrapper *mEngineWrapper;
 
     HbListView *mListView;
@@ -222,6 +228,8 @@
     ContextMenuActions mContextMenuActions;
     HbMenu *mContextMenu;
     HbAction *mToolbarBackAction;
+    HbAction* mToolbarFilterAction;
+    HbAction *mToolbarPasteAction;
 
     // flags
     bool mItemHighlighted;