diff -r 271e901a9423 -r 4cc0d1a608c1 filebrowser/ui/inc/menuaction.h
--- a/filebrowser/ui/inc/menuaction.h	Fri May 14 16:10:39 2010 +0300
+++ b/filebrowser/ui/inc/menuaction.h	Tue Jun 01 14:40:54 2010 +0300
@@ -21,11 +21,10 @@
 class HbMenu;
 class HbAction;
 
-class MenuAction
+class OptionMenuActions
 {
 public:
-    MenuAction() :
-            //NoAction = 0,
+    OptionMenuActions() :
             mFileMenu(0),
             mFileBackMoveUp(0),
             mFileOpenDrive(0),
@@ -114,10 +113,9 @@
 
     }
 
-    ~MenuAction() { }
+    ~OptionMenuActions() { }
 public:
     //File menu operations
-    //NoAction = 0,
     HbMenu *mFileMenu;
     HbAction *mFileBackMoveUp;
     HbAction *mFileOpenDrive;
@@ -219,41 +217,40 @@
 };
 
 
-class FileViewDriveContextMenu
+class ContextMenuActions
 {
 public:
-    FileViewDriveContextMenu() :
-//            //NoAction = 0,
-//            mFileMenu(0),
-//            mFileBackMoveUp(0),
-//            mFileOpenDrive(0),
-//            mFileOpenDirectory(0),
-//            mFileSearch(0),
-//            mFileNewMenu(0),
-//            mFileNewFile(0),
-//            mFileNewDirectory(0),
-//            mFileDelete(0),
-//            mFileRename(0),
-//            mFileTouch(0),
-//            mFileProperties(0),
-//            mFileChecksumsMenu(0),
-//            mFileChecksumsMD5(0),
-//            mFileChecksumsMD2(0),
-//            mFileChecksumsSHA1(0),
-//            mFileSetAttributes(0),
-//            //Edit -
-//            mEditMenu(0),
+    ContextMenuActions() :
+            mFileMenu(0),
+            mFileBackMoveUp(0),
+            mFileOpenDrive(0),
+            mFileOpenDirectory(0),
+            mFileSearch(0),
+            mFileNewMenu(0),
+            mFileNewFile(0),
+            mFileNewDirectory(0),
+            mFileDelete(0),
+            mFileRename(0),
+            mFileTouch(0),
+            mFileProperties(0),
+            mFileChecksumsMenu(0),
+            mFileChecksumsMD5(0),
+            mFileChecksumsMD2(0),
+            mFileChecksumsSHA1(0),
+            mFileSetAttributes(0),
+            //Edit -
+            mEditMenu(0),
 //            mEditSnapShotToE(0),
-//            mEditCut(0),
-//            mEditCopy(0),
-//            mEditPaste(0),
-//            mEditCopyToFolder(0),
-//            mEditMoveToFolder(0),
+            mEditCut(0),
+            mEditCopy(0),
+            mEditPaste(0),
+            mEditCopyToFolder(0),
+            mEditMoveToFolder(0),
 //            mEditSelect(0),
 //            mEditUnselect(0),
 //            mEditSelectAll(0),
 //            mEditUnselectAll(0),
-//            // View -
+            // View -
 //            mViewMenu(0),
 //            mViewFilterEntries(0),
 //            mViewRefresh(0),
@@ -308,36 +305,35 @@
 
     }
 
-    ~FileViewDriveContextMenu() { }
+    ~ContextMenuActions() { }
 public:
     //File menu operations
-    //NoAction = 0,
-//    HbMenu *mFileMenu;
-//    HbAction *mFileBackMoveUp;
-//    HbAction *mFileOpenDrive;
-//    HbAction *mFileOpenDirectory;
-//    HbAction *mFileSearch;
-//    HbMenu *mFileNewMenu;
-//    HbAction *mFileNewFile;
-//    HbAction *mFileNewDirectory;
-//    HbAction *mFileDelete;
-//    HbAction *mFileRename;
-//    HbAction *mFileTouch;
-//    HbAction *mFileProperties;
-//    HbMenu *mFileChecksumsMenu;
-//    HbAction *mFileChecksumsMD5;
-//    HbAction *mFileChecksumsMD2;
-//    HbAction *mFileChecksumsSHA1;
-//    HbAction *mFileSetAttributes;
-//
-//    //Edit -
-//    HbMenu *mEditMenu;
+    HbMenu *mFileMenu;
+    HbAction *mFileBackMoveUp;
+    HbAction *mFileOpenDrive;
+    HbAction *mFileOpenDirectory;
+    HbAction *mFileSearch;
+    HbMenu *mFileNewMenu;
+    HbAction *mFileNewFile;
+    HbAction *mFileNewDirectory;
+    HbAction *mFileDelete;
+    HbAction *mFileRename;
+    HbAction *mFileTouch;
+    HbAction *mFileProperties;
+    HbMenu *mFileChecksumsMenu;
+    HbAction *mFileChecksumsMD5;
+    HbAction *mFileChecksumsMD2;
+    HbAction *mFileChecksumsSHA1;
+    HbAction *mFileSetAttributes;
+
+    //Edit -
+    HbMenu *mEditMenu;
 //    HbAction *mEditSnapShotToE;
-//    HbAction *mEditCut;
-//    HbAction *mEditCopy;
-//    HbAction *mEditPaste;
-//    HbAction *mEditCopyToFolder;
-//    HbAction *mEditMoveToFolder;
+    HbAction *mEditCut;
+    HbAction *mEditCopy;
+    HbAction *mEditPaste;
+    HbAction *mEditCopyToFolder;
+    HbAction *mEditMoveToFolder;
 //    HbAction *mEditSelect;
 //    HbAction *mEditUnselect;
 //    HbAction *mEditSelectAll;
@@ -407,168 +403,5 @@
 //    HbAction *mToolsShowOpenFilesHere;
 };
 
-class FileViewFileContextMenu
-{
-public:
-    FileViewFileContextMenu() :
-            //NoAction = 0,
-            mFileMenu(0),
-            mFileBackMoveUp(0),
-//            mFileOpenDrive(0),
-//??            mFileOpenDirectory(0),
-//            mFileSearch(0),
-            mFileNewMenu(0),
-            mFileNewFile(0),
-            mFileNewDirectory(0),
-            mFileDelete(0),
-            mFileRename(0),
-            mFileTouch(0),
-            mFileProperties(0),
-            mFileChecksumsMenu(0),
-            mFileChecksumsMD5(0),
-            mFileChecksumsMD2(0),
-            mFileChecksumsSHA1(0),
-            mFileSetAttributes(0),
-            //Edit -
-            mEditMenu(0),
-//??            mEditSnapShotToE(0),
-            mEditCut(0),
-            mEditCopy(0),
-            mEditPaste(0),
-            mEditCopyToFolder(0),
-            mEditMoveToFolder(0)
-//            mEditSelect(0),
-//            mEditUnselect(0),
-//            mEditSelectAll(0),
-//            mEditUnselectAll(0),
-//            // View -
-//            mViewMenu(0),
-//            mViewFilterEntries(0),
-//            mViewRefresh(0),
-//            // Tools -
-//            mToolsMenu(0),
-//            mToolsAllAppsToTextFile(0),
-//            mToolsAllFilesToTextFile(0),
-//            mToolsAvkonIconCacheMenu(0),
-//            mToolsAvkonIconCacheEnable(0),
-//            mToolsAvkonIconCacheDisable(0),
-//            mToolsDisableExtendedErrors(0),
-//            mToolsDumpMsgStoreWalk(0),
-//            mToolsEditDataTypes(0),
-//            mToolsEnableExtendedErrors(0),
-//            mToolsErrorSimulateMenu(0),
-//            mToolsErrorSimulateLeave(0),
-//            mToolsErrorSimulatePanic(0),
-//            mToolsErrorSimulateException(0),
-//            mToolsMessageAttachmentsMenu(0),
-//            mToolsMessageInbox(0),
-//            mToolsMessageDrafts(0),
-//            mToolsMessageSentItems(0),
-//            mToolsMessageOutbox(0),
-//            //    mLocalConnectivityMenu(0),
-//            //    mToolsLocalConnectivityActivateInfrared(0),
-//            //    mToolsLocalConnectivityLaunchBTUI(0),
-//            //    mToolsLocalConnectivityLaunchUSBUI(0),
-//            mToolsMemoryInfo(0),
-//            mToolsSecureBackupMenu(0),
-//            mToolsSecureBackStart(0),
-//            mToolsSecureBackRestore(0),
-//            mToolsSecureBackStop(0),
-//            mToolsSetDebugMask(0),
-//            mToolsShowOpenFilesHere(0),
-//            mSelection(0),
-//            mSetting(0),
-//            mAbout(0),
-//            mExit(0)
-    {
-
-    }
-
-    ~FileViewFileContextMenu() { }
-public:
-    //File menu operations
-    //NoAction = 0,
-    HbMenu *mFileMenu;
-    HbAction *mFileBackMoveUp;
-//    HbAction *mFileOpenDrive;
-//??    HbAction *mFileOpenDirectory;
-//    HbAction *mFileSearch;
-    HbMenu *mFileNewMenu;
-    HbAction *mFileNewFile;
-    HbAction *mFileNewDirectory;
-    HbAction *mFileDelete;
-    HbAction *mFileRename;
-    HbAction *mFileTouch;
-    HbAction *mFileProperties;
-    HbMenu *mFileChecksumsMenu;
-    HbAction *mFileChecksumsMD5;
-    HbAction *mFileChecksumsMD2;
-    HbAction *mFileChecksumsSHA1;
-    HbAction *mFileSetAttributes;
-
-    //Edit -
-    HbMenu *mEditMenu;
-//??    HbAction *mEditSnapShotToE;
-    HbAction *mEditCut;
-    HbAction *mEditCopy;
-    HbAction *mEditPaste;
-    HbAction *mEditCopyToFolder;
-    HbAction *mEditMoveToFolder;
-//    HbAction *mEditSelect;
-//    HbAction *mEditUnselect;
-//    HbAction *mEditSelectAll;
-//    HbAction *mEditUnselectAll;
-//
-//    // View -
-//    HbMenu *mViewMenu;
-//    HbAction *mViewFilterEntries;
-//    HbAction *mViewRefresh;
-//
-//    // Tools -
-//    HbMenu *mToolsMenu;
-//    HbAction *mToolsAllAppsToTextFile;
-//    HbAction *mToolsAllFilesToTextFile;
-//
-//    HbMenu *mToolsAvkonIconCacheMenu;
-//    HbAction *mToolsAvkonIconCacheEnable;
-//    HbAction *mToolsAvkonIconCacheDisable;
-//
-//    HbAction *mToolsDisableExtendedErrors;
-//    HbAction *mToolsDumpMsgStoreWalk;
-//    HbAction *mToolsEditDataTypes;
-//
-//    HbAction *mToolsEnableExtendedErrors;
-//
-//    HbMenu *mToolsErrorSimulateMenu;
-//    HbAction *mToolsErrorSimulateLeave;
-//    HbAction *mToolsErrorSimulatePanic;
-//    HbAction *mToolsErrorSimulateException;
-//
-//    HbMenu *mToolsMessageAttachmentsMenu;
-//    HbAction *mToolsMessageInbox;
-//    HbAction *mToolsMessageDrafts;
-//    HbAction *mToolsMessageSentItems;
-//    HbAction *mToolsMessageOutbox;
-//
-//    HbMenu *mToolsLocalConnectivityMenu;
-//    HbAction *mToolsLocalConnectivityActivateInfrared;
-//    HbAction *mToolsLocalConnectivityLaunchBTUI;
-//    HbAction *mToolsLocalConnectivityLaunchUSBUI;
-//
-//    HbAction *mToolsMemoryInfo;
-//
-//    HbMenu *mToolsSecureBackupMenu;
-//    HbAction *mToolsSecureBackStart;
-//    HbAction *mToolsSecureBackRestore;
-//    HbAction *mToolsSecureBackStop;
-//
-//    HbAction *mToolsSetDebugMask;
-//    HbAction *mToolsShowOpenFilesHere;
-//
-//    HbAction *mSelection;
-//    HbAction *mSetting;
-//    HbAction *mAbout;
-//    HbAction *mExit;
-};
 
 #endif // MENUACTION_H