--- a/filebrowser/ui/inc/filebrowserview.h	Thu May 13 20:59:38 2010 +0300
+++ b/filebrowser/ui/inc/filebrowserview.h	Thu May 13 21:10:48 2010 +0300
@@ -18,12 +18,13 @@
 #ifndef FILEBROWSERVIEWH_H_
 #define FILEBROWSERVIEWH_H_
 
-#include <hbview.h>
-#include <hbmainwindow.h>
-#include <hbapplication.h>
 #include "menuaction.h"
 #include "enginewrapper.h"
 
+#include <HbView>
+#include <HbMainWindow>
+#include <HbApplication>
+
 #include <QDir>
 
 // Forward declarations
@@ -66,8 +67,7 @@
 public slots:
 
 private:
-    void fileOpenDialog(const QString &fileName);
-    OverwriteOptions fileOverwriteDialog();
+    void fileOverwriteDialog();
     void openListDialog(const QStringList& items, const QString &aTitleText, QObject* receiver, const char* member);
 
     void diskAdmin(int cmd);
@@ -76,10 +76,10 @@
                             const QString &primaryActionText,
                             const QString &secondaryActionText);
 
-    HbDialog *openTextQuery(const QString &headingText,
-                            const QString &text,
-                            const QString &primaryActionText,
-                            const QString &secondaryActionText);
+//    HbDialog *openTextQuery(const QString &headingText,
+//                            const QString &text,
+//                            const QString &primaryActionText,
+//                            const QString &secondaryActionText);
 
     HbDialog *openNumberQuery(const QString &headingText,
                               const QString &text,
@@ -109,23 +109,36 @@
     void refreshList();
     void populateFolderContent();
 
-private slots: // option menu slots
+private slots:
     // menu action slots
     // file menu
     void fileBackMoveUp();
     void fileOpenDrive();
     void fileOpenDirectory();
     void fileSearch();
+
     void fileNewFile();
     void doFileNewFile(HbAction *);
+
     void fileNewDirectory();
     void doFileNewDirectory(HbAction *);
+
     void fileDelete();
     void doFileDelete(HbAction *);
+
     void fileRename();
+    void doFileRename(HbAction *);
+    void doFileRenameFileExist(HbAction *);
+
     void fileTouch();
     void doFileTouch(HbAction *);
     void fileProperties();
+
+    void fileChecksumsMD5();
+    void fileChecksumsMD2();
+    void fileChecksumsSHA1();
+    void fileChecksums(TFileBrowserCmdFileChecksums checksumType);
+
     void fileSetAttributes();
 
     // edit menu
@@ -133,10 +146,13 @@
     void editCut();
     void editCopy();
     void editPaste();
+
     void editCopyToFolder();
     void doEditCopyToFolder(HbAction *);
+
     void editMoveToFolder();
     void doEditMoveToFolder(HbAction *);
+
     void editSelect();
     void editUnselect();
     void editSelectAll();
@@ -180,13 +196,18 @@
     void diskAdminEjectDrive();
     void diskAdminDismountDrive();
     void doDiskAdminDismountDrive(HbAction *);
+
     void diskAdminEraseMBR();
     void doDiskAdminEraseMBR(HbAction *);
     void doDiskAdminReallyEraseMBR(HbAction *);
     void doDiskAdminNotRemovableReallyEraseMBR(HbAction *);
     
+    void diskAdminPartitionDrive();
+    void diskAdminPartitionDriveProceed(HbAction *);
+    void diskAdminPartitionDriveReallyProceed(HbAction *);
+    void diskAdminPartitionDriveIsNotRemovable(HbAction *);
+    void diskAdminPartitionDriveEraseMbr(HbAction *);
     void diskAdminPartitionDriveGetCount(HbAction*);
-    void diskAdminPartitionDrive();
 
     // tools menu
     void toolsAllAppsToTextFile();
@@ -242,6 +263,10 @@
     void activateSelectionMode();
     void deActivateSelectionMode();
 
+    void fileOpen(HbAction *);
+    void fileOverwrite(HbAction *);
+    void fileOverwritePostfix(HbAction *);
+
 private:
     FileBrowserMainWindow &mMainWindow;
     EngineWrapper *mEngineWrapper;
@@ -262,8 +287,6 @@
     MenuAction mFileViewMenuActions;
     HbAction *mToolbarBackAction;
 
-    // editor
-    EditorView *mEditor;
     // search
     SearchView *mSearch;
     // settings
@@ -275,10 +298,16 @@
     bool mRemoveFileAfterCopied;
     bool mClipBoardInUse;
     bool mFolderContentChanged;
-    bool mEraseMBR;
-    // temporarily stored old passwird
+
+    // temporarily storage
     QString mOldPassword;
     QString mPanicCategory;
+    QString mAbsoluteFilePath;
+    OverwriteOptions mOverwriteOptions;
+    QModelIndex mModelIndex;
+    bool mIsRenameAllowed;
+    bool mProceed;
+    bool mEraseMBR;
 };