Changeset 75136 in vbox for trunk

Timestamp:

Oct 29, 2018 8:47:55 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Move file manager actions to the global action pool

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (5 diffs)
• globals/UIActionPool.h (modified) (3 diffs)
• runtime/guestctrl/UIGuestControlFileManager.cpp (modified) (2 diffs)
• runtime/guestctrl/UIGuestControlFileManager.h (modified) (1 diff)
• runtime/guestctrl/UIGuestControlFileManagerDialog.cpp (modified) (1 diff)
• runtime/guestctrl/UIGuestControlFileTable.cpp (modified) (8 diffs)
• runtime/guestctrl/UIGuestControlFileTable.h (modified) (6 diffs)
• runtime/guestctrl/UIGuestFileTable.cpp (modified) (3 diffs)
• runtime/guestctrl/UIGuestFileTable.h (modified) (3 diffs)
• runtime/guestctrl/UIHostFileTable.cpp (modified) (3 diffs)
• runtime/guestctrl/UIHostFileTable.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -1184 +1184 @@
 };
 
-
 /** Menu action extension, used as 'Log' menu class. */
 class UIActionMenuSelectorLog : public UIActionMenu
@@ -1434 +1433 @@
     }
 };
+
+/** Menu action extension, used as 'Guest Control File Manager' menu class. */
+class UIActionMenuGuestControlFileManager : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManager(UIActionPool *pParent)
+        : UIActionMenu(pParent)
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("GuestControlFileManagerMenu");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the guest control file manager"));
+    }
+};
+
+class UIActionMenuGuestControlFileManagerHostSubmenu : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerHostSubmenu(UIActionPool *pParent)
+        : UIActionMenu(pParent)
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("GuestControlFileManagerHostSubmenu");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Host"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the guest control file manager submenu"));
+    }
+};
+
+class UIActionMenuGuestControlFileManagerGuestSubmenu : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerGuestSubmenu(UIActionPool *pParent)
+        : UIActionMenu(pParent)
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("GuestControlFileManagerGuestSubmenu");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Guest"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the guest control file manager submenu"));
+    }
+};
+
+
+/** Simple action extension, used as 'File Manager Settings' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerSettings : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerSettings(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/vm_delete_32px.png", ":/vm_delete_disabled_32px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerSettings");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Settings"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Modify file manager settings"));
+        setToolTip(tr("Modify File Manager Settings"));
+    }
+};
+/** Simple action extension, used as 'Perform GoUp' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerGoUp : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerGoUp(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/arrow_up_10px_x2.png", ":/arrow_up_10px_x2.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerGoUp");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "GoUp"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Go one level up to parent folder"));
+        setToolTip(tr("Go One Level Up to Parent Folder"));
+    }
+};
+
+
+/** Simple action extension, used as 'Perform GoHome' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerGoHome : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerGoHome(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/nw_24px.png", ":/nw_disabled_24px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerGoHome");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "GoHome"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Go to home folder"));
+        setToolTip(tr("Go to Home Folder"));
+    }
+};
+
+
+/** Simple action extension, used as 'Perform Copy' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerDelete : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerDelete(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/vm_delete_32px.png", ":/vm_delete_disabled_32px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerDelete");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Delete"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Delete selected file object(s)"));
+        setToolTip(tr("Delete Selected File Object(s)"));
+    }
+};
+
+/** Simple action extension, used as 'Perform Refresh' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerRefresh : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerRefresh(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/refresh_16px.png", ":/refresh_disabled_16px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerRefresh");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Refresh"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Refresh"));
+        setToolTip(tr("Refresh"));
+    }
+};
+
+
+/** Simple action extension, used as 'Perform Rename' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerRename : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerRename(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/name_16px.png", ":/name_16px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerRename");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Rename"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Rename"));
+        setToolTip(tr("Rename"));
+    }
+};
+
+/** Simple action extension, used as 'Perform Rename' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerCreateNewDirectory : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerCreateNewDirectory(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/sf_add_16px.png", ":/sf_add_disabled_16px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerCreateNewDirectory");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "CreateNewDirectory"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Create New Directory"));
+        setToolTip(tr("Create New Directory"));
+    }
+};
+
+
+/** Simple action extension, used as 'Perform Copy' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerCopy : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerCopy(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/fd_copy_32px.png", ":/fd_copy_disabled_32px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerCopy");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Copy"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Copy selected file object(s)"));
+        setToolTip(tr("Copy Selected File Object(s)"));
+    }
+};
+
+/** Simple action extension, used as 'Perform Cut' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerCut : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerCut(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/fd_move_32px.png", ":/fd_move_disabled_32px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerCut");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Cut"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Cut selected file object(s)"));
+        setToolTip(tr("Cut Selected File Object(s)"));
+    }
+};
+
+/** Simple action extension, used as 'Perform Paste' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerPaste : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerPaste(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/shared_clipboard_16px.png", ":/shared_clipboard_disabled_16px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerPaste");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Paste"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Paste copied/cut file object(s)"));
+        setToolTip(tr("Paste Copied/Cut File Object(s)"));
+    }
+};
+
+/** Simple action extension, used as 'Select All' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerSelectAll : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerSelectAll(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/session_info_32px.png", ":/session_info_disabled_32px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerSelectAll");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "SelectAll"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Select all files objects"));
+        setToolTip(tr("Select All Files Objects"));
+    }
+};
+
+
+/** Simple action extension, used as 'Invert Selection' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerInvertSelection : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerInvertSelection(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/session_info_32px.png", ":/session_info_disabled_32px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerInvertSelection");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "InvertSelection"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Invert the current selection"));
+        setToolTip(tr("Invert The Current Selection"));
+    }
+};
+
+
+/** Simple action extension, used as 'Show Properties' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerShowProperties : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuGuestControlFileManagerShowProperties(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/session_info_32px.png", ":/session_info_disabled_32px.png"){}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("FileManagerShowProperties");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "ShowProperties"));
+        setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Show the properties of currently selected file object(s)"));
+        setToolTip(tr("Show the Properties of Currently Selected File Object(s)"));
+    }
+};
+
+
+
 
 
@@ -1641 +2191 @@
     m_pool[UIActionIndex_M_Log_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
 
+    /* Create 'Guest Control File Manager' actions: */
+    m_pool[UIActionIndex_M_GuestControlFileManager] = new UIActionMenuGuestControlFileManager(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_M_HostSubmenu] = new UIActionMenuGuestControlFileManagerHostSubmenu(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu] = new UIActionMenuGuestControlFileManagerGuestSubmenu(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Settings] = new UIActionMenuGuestControlFileManagerSettings(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_GoUp] = new UIActionMenuGuestControlFileManagerGoUp(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp] = new UIActionMenuGuestControlFileManagerGoUp(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_GoHome] = new UIActionMenuGuestControlFileManagerGoHome(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome] = new UIActionMenuGuestControlFileManagerGoHome(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Refresh] = new UIActionMenuGuestControlFileManagerRefresh(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh] = new UIActionMenuGuestControlFileManagerRefresh(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Delete] = new UIActionMenuGuestControlFileManagerDelete(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Delete] = new UIActionMenuGuestControlFileManagerDelete(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Rename] = new UIActionMenuGuestControlFileManagerRename(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Rename] = new UIActionMenuGuestControlFileManagerRename(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory] = new UIActionMenuGuestControlFileManagerCreateNewDirectory(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory] = new UIActionMenuGuestControlFileManagerCreateNewDirectory(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Copy] = new UIActionMenuGuestControlFileManagerCopy(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Copy] = new UIActionMenuGuestControlFileManagerCopy(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Cut] = new UIActionMenuGuestControlFileManagerCut(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Cut] = new UIActionMenuGuestControlFileManagerCut(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Paste] = new UIActionMenuGuestControlFileManagerPaste(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Paste] = new UIActionMenuGuestControlFileManagerPaste(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll] = new UIActionMenuGuestControlFileManagerSelectAll(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll] = new UIActionMenuGuestControlFileManagerSelectAll(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection] = new UIActionMenuGuestControlFileManagerInvertSelection(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection] = new UIActionMenuGuestControlFileManagerInvertSelection(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties] = new UIActionMenuGuestControlFileManagerShowProperties(this);
+    m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties] = new UIActionMenuGuestControlFileManagerShowProperties(this);
+
+
     /* Prepare update-handlers for known menus: */
 #ifdef VBOX_WS_MAC
@@ -1649 +2230 @@
     m_menuUpdateHandlers[UIActionIndex_M_LogWindow].ptf = &UIActionPool::updateMenuLogViewerWindow;
     m_menuUpdateHandlers[UIActionIndex_M_Log].ptf = &UIActionPool::updateMenuLogViewer;
+
+    m_menuUpdateHandlers[UIActionIndex_M_GuestControlFileManager].ptf = &UIActionPool::updateMenuGuestControlFileManager;
 
     /* Invalidate all known menus: */
@@ -1941 +2524 @@
 }
 
+void UIActionPool::updateMenuGuestControlFileManager()
+{
+    updateMenuGuestControlFileManagerWrapper(action(UIActionIndex_M_GuestControlFileManager)->menu());
+
+    /* Mark menu as valid: */
+    m_invalidations.remove(UIActionIndex_M_Log);
+
+}
+
+void UIActionPool::updateMenuGuestControlFileManagerWrapper(UIMenu *pMenu)
+{
+    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_S_Settings));
+    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_M_HostSubmenu));
+    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu));
+
+    UIMenu *pHostSubmenu = action(UIActionIndex_M_GuestControlFileManager_M_HostSubmenu)->menu();
+    if (pHostSubmenu)
+    {
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection));
+        addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
+    }
+
+    UIMenu *pGuestSubmenu = action(UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu)->menu();
+    if (pGuestSubmenu)
+    {
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection));
+        addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
+    }
+}
+
 void UIActionPool::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -97 +97 @@
     UIActionIndex_M_Log_S_Refresh,
     UIActionIndex_M_Log_S_Save,
+
+    /* Guest control file manager actions: */
+    UIActionIndex_M_GuestControlFileManager,
+    UIActionIndex_M_GuestControlFileManager_M_HostSubmenu,
+    UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu,
+    UIActionIndex_M_GuestControlFileManager_S_Settings,
+    UIActionIndex_M_GuestControlFileManager_S_Host_GoUp,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp,
+    UIActionIndex_M_GuestControlFileManager_S_Host_GoHome,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome,
+    UIActionIndex_M_GuestControlFileManager_S_Host_Refresh,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh,
+    UIActionIndex_M_GuestControlFileManager_S_Host_Delete,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_Delete,
+    UIActionIndex_M_GuestControlFileManager_S_Host_Rename,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_Rename,
+    UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory,
+    UIActionIndex_M_GuestControlFileManager_S_Host_Copy,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_Copy,
+    UIActionIndex_M_GuestControlFileManager_S_Host_Cut,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_Cut,
+    UIActionIndex_M_GuestControlFileManager_S_Host_Paste,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_Paste,
+    UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll,
+    UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection,
+    UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties,
+    UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties,
+
+
 
     /* Maximum index: */
@@ -572 +604 @@
     virtual void updateMenuLogViewerWrapper(UIMenu *pMenu);
 
+    /** Updates 'Guest Control Window' menu. */
+    virtual void updateMenuGuestControlFileManager();
+    /** Updates 'Guest Control' @a pMenu. */
+    virtual void updateMenuGuestControlFileManagerWrapper(UIMenu *pMenu);
+
     /** Updates shortcuts. */
     virtual void updateShortcuts();
@@ -612 +649 @@
 
 #endif /* !___UIActionPool_h___ */
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.cpp

@@ -325 +325 @@
 }
 
+QMenu *UIGuestControlFileManager::menu() const
+{
+    if (!m_pActionPool)
+        return 0;
+    return m_pActionPool->action(UIActionIndex_M_GuestControlFileManager)->menu();
+}
+
 void UIGuestControlFileManager::retranslateUi()
 {
@@ -394 +401 @@
             m_pFileTableContainerLayout->setSpacing(0);
             m_pFileTableContainerLayout->setContentsMargins(0, 0, 0, 0);
-            m_pGuestFileTable = new UIGuestFileTable;
+            m_pGuestFileTable = new UIGuestFileTable(m_pActionPool);
             m_pGuestFileTable->setEnabled(false);
 
-            m_pHostFileTable = new UIHostFileTable;
+            m_pHostFileTable = new UIHostFileTable(m_pActionPool);
             if (m_pHostFileTable)
             {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.h

@@ -78 +78 @@
                               const CGuest &comGuest, QWidget *pParent);
     ~UIGuestControlFileManager();
+    QMenu *menu() const;
     //const UIGuestControlFileManagerSettings& settings() const;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManagerDialog.cpp

@@ -96 +96 @@
         /* Configure widget: */
         setWidget(pWidget);
-        //setWidgetMenu(pWidget->menu());
+        setWidgetMenu(pWidget->menu());
 #ifdef VBOX_WS_MAC
         //setWidgetToolbar(pWidget->toolbar());

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.cpp

@@ -39 +39 @@
 # include "QILineEdit.h"
 # include "QIMessageBox.h"
+# include "UIActionPool.h"
 # include "UIErrorString.h"
 # include "UIGuestFileTable.h"
@@ -738 +739 @@
 *********************************************************************************************************************************/
 const unsigned UIGuestControlFileTable::m_iKiloByte = 1000;
-UIGuestControlFileTable::UIGuestControlFileTable(QWidget *pParent /* = 0 */)
+UIGuestControlFileTable::UIGuestControlFileTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QWidget>(pParent)
     , m_pRootItem(0)
     , m_pLocationLabel(0)
-    , m_pCopy(0)
-    , m_pCut(0)
-    , m_pPaste(0)
     , m_pPropertiesDialog(0)
+    , m_pActionPool(pActionPool)
+    , m_pToolBar(0)
     , m_pModel(0)
     , m_pView(0)
@@ -751 +751 @@
     , m_pMainLayout(0)
     , m_pLocationComboBox(0)
-    , m_pToolBar(0)
-    , m_pGoUp(0)
-    , m_pGoHome(0)
-    , m_pRefresh(0)
-    , m_pDelete(0)
-    , m_pRename(0)
-    , m_pCreateNewDirectory(0)
-    , m_pShowProperties(0)
-    , m_pSelectAll(0)
-    , m_pInvertSelection(0)
-
 {
     prepareObjects();
-    prepareActions();
 }
 
@@ -888 +876 @@
         return;
 
-    m_pGoUp = new QAction(this);
-    if (m_pGoUp)
-    {
-        connect(m_pGoUp, &QAction::triggered, this, &UIGuestControlFileTable::sltGoUp);
-        m_pGoUp->setIcon(UIIconPool::iconSet(QString(":/arrow_up_10px_x2.png")));
-        m_pToolBar->addAction(m_pGoUp);
-    }
-
-    m_pGoHome = new QAction(this);
-    if (m_pGoHome)
-    {
-        connect(m_pGoHome, &QAction::triggered, this, &UIGuestControlFileTable::sltGoHome);
-        m_pGoHome->setIcon(UIIconPool::iconSet(QString(":/nw_24px.png")));
-        m_pToolBar->addAction(m_pGoHome);
-    }
-
-    m_pRefresh = new QAction(this);
-    if (m_pRefresh)
-    {
-        connect(m_pRefresh, &QAction::triggered, this, &UIGuestControlFileTable::sltRefresh);
-        m_pRefresh->setIcon(UIIconPool::iconSet(QString(":/refresh_24px.png")));
-        m_pToolBar->addAction(m_pRefresh);
-    }
-
-    m_pToolBar->addSeparator();
-
-    m_pDelete = new QAction(this);
-    if (m_pDelete)
-    {
-        connect(m_pDelete, &QAction::triggered, this, &UIGuestControlFileTable::sltDelete);
-        m_pDelete->setIcon(UIIconPool::iconSet(QString(":/vm_delete_32px.png")));
-        m_pToolBar->addAction(m_pDelete);
-        m_selectionDependentActions.push_back(m_pDelete);
-    }
-
-    m_pRename = new QAction(this);
-    if (m_pRename)
-    {
-        connect(m_pRename, &QAction::triggered, this, &UIGuestControlFileTable::sltRename);
-        m_pRename->setIcon(UIIconPool::iconSet(QString(":/name_16px_x2.png")));
-        m_pToolBar->addAction(m_pRename);
-        m_selectionDependentActions.push_back(m_pRename);
-    }
-
-    m_pCreateNewDirectory = new QAction(this);
-    if (m_pCreateNewDirectory)
-    {
-        connect(m_pCreateNewDirectory, &QAction::triggered, this, &UIGuestControlFileTable::sltCreateNewDirectory);
-        m_pCreateNewDirectory->setIcon(UIIconPool::iconSet(QString(":/sf_add_16px.png")));
-        m_pToolBar->addAction(m_pCreateNewDirectory);
-    }
-
-    m_pCopy = new QAction(this);
-    if (m_pCopy)
-    {
-        m_pCopy->setIcon(UIIconPool::iconSet(QString(":/fd_copy_32px.png")));
-        m_pToolBar->addAction(m_pCopy);
-        connect(m_pCopy, &QAction::triggered, this, &UIGuestControlFileTable::sltCopy);
-        m_selectionDependentActions.push_back(m_pCopy);
-    }
-
-    m_pCut = new QAction(this);
-    if (m_pCut)
-    {
-        m_pCut->setIcon(UIIconPool::iconSet(QString(":/fd_move_32px.png")));
-        m_pToolBar->addAction(m_pCut);
-        connect(m_pCut, &QAction::triggered, this, &UIGuestControlFileTable::sltCut);
-        m_selectionDependentActions.push_back(m_pCut);
-    }
-
-    m_pPaste = new QAction(this);
-    if (m_pPaste)
-    {
-        m_pPaste->setIcon(UIIconPool::iconSet(QString(":/shared_clipboard_16px.png")));
-        m_pToolBar->addAction(m_pPaste);
-        connect(m_pPaste, &QAction::triggered, this, &UIGuestControlFileTable::sltPaste);
-        m_pPaste->setEnabled(false);
-    }
-
-    m_pToolBar->addSeparator();
-
-    m_pShowProperties = new QAction(this);
-    {
-        m_pShowProperties->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
-        m_pToolBar->addAction(m_pShowProperties);
-        connect(m_pShowProperties, &QAction::triggered, this, &UIGuestControlFileTable::sltShowProperties);
-        m_selectionDependentActions.push_back(m_pShowProperties);
-    }
-
-    m_pSelectAll = new QAction(this);
-    {
-        m_pSelectAll->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
-        m_pToolBar->addAction(m_pSelectAll);
-        connect(m_pSelectAll, &QAction::triggered, this, &UIGuestControlFileTable::sltSelectAll);
-    }
-
-    m_pInvertSelection = new QAction(this);
-    {
-        m_pInvertSelection->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
-        m_pToolBar->addAction(m_pInvertSelection);
-        connect(m_pInvertSelection, &QAction::triggered, this, &UIGuestControlFileTable::sltInvertSelection);
-    }
+    // m_pGoUp = new QAction(this);
+    // if (m_pGoUp)
+    // {
+    //     connect(m_pGoUp, &QAction::triggered, this, &UIGuestControlFileTable::sltGoUp);
+    //     m_pGoUp->setIcon(UIIconPool::iconSet(QString(":/arrow_up_10px_x2.png")));
+    //     m_pToolBar->addAction(m_pGoUp);
+    // }
+
+    // m_pGoHome = new QAction(this);
+    // if (m_pGoHome)
+    // {
+    //     connect(m_pGoHome, &QAction::triggered, this, &UIGuestControlFileTable::sltGoHome);
+    //     m_pGoHome->setIcon(UIIconPool::iconSet(QString(":/nw_24px.png")));
+    //     m_pToolBar->addAction(m_pGoHome);
+    // }
+
+    // m_pRefresh = new QAction(this);
+    // if (m_pRefresh)
+    // {
+    //     connect(m_pRefresh, &QAction::triggered, this, &UIGuestControlFileTable::sltRefresh);
+    //     m_pRefresh->setIcon(UIIconPool::iconSet(QString(":/refresh_24px.png")));
+    //     m_pToolBar->addAction(m_pRefresh);
+    // }
+
+    //m_pToolBar->addSeparator();
+
+    // m_pDelete = new QAction(this);
+    // if (m_pDelete)
+    // {
+    //     connect(m_pDelete, &QAction::triggered, this, &UIGuestControlFileTable::sltDelete);
+    //     m_pDelete->setIcon(UIIconPool::iconSet(QString(":/vm_delete_32px.png")));
+    //     m_pToolBar->addAction(m_pDelete);
+    //     m_selectionDependentActions.push_back(m_pDelete);
+    // }
+
+    // m_pRename = new QAction(this);
+    // if (m_pRename)
+    // {
+    //     connect(m_pRename, &QAction::triggered, this, &UIGuestControlFileTable::sltRename);
+    //     m_pRename->setIcon(UIIconPool::iconSet(QString(":/name_16px_x2.png")));
+    //     m_pToolBar->addAction(m_pRename);
+    //     m_selectionDependentActions.push_back(m_pRename);
+    // }
+
+    // m_pCreateNewDirectory = new QAction(this);
+    // if (m_pCreateNewDirectory)
+    // {
+    //     connect(m_pCreateNewDirectory, &QAction::triggered, this, &UIGuestControlFileTable::sltCreateNewDirectory);
+    //     m_pCreateNewDirectory->setIcon(UIIconPool::iconSet(QString(":/sf_add_16px.png")));
+    //     m_pToolBar->addAction(m_pCreateNewDirectory);
+    // }
+
+    // m_pCopy = new QAction(this);
+    // if (m_pCopy)
+    // {
+    //     m_pCopy->setIcon(UIIconPool::iconSet(QString(":/fd_copy_32px.png")));
+    //     m_pToolBar->addAction(m_pCopy);
+    //     connect(m_pCopy, &QAction::triggered, this, &UIGuestControlFileTable::sltCopy);
+    //     m_selectionDependentActions.push_back(m_pCopy);
+    // }
+
+    // m_pCut = new QAction(this);
+    // if (m_pCut)
+    // {
+    //     m_pCut->setIcon(UIIconPool::iconSet(QString(":/fd_move_32px.png")));
+    //     m_pToolBar->addAction(m_pCut);
+    //     connect(m_pCut, &QAction::triggered, this, &UIGuestControlFileTable::sltCut);
+    //     m_selectionDependentActions.push_back(m_pCut);
+    // }
+
+    // m_pPaste = new QAction(this);
+    // if (m_pPaste)
+    // {
+    //     m_pPaste->setIcon(UIIconPool::iconSet(QString(":/shared_clipboard_16px.png")));
+    //     m_pToolBar->addAction(m_pPaste);
+    //     connect(m_pPaste, &QAction::triggered, this, &UIGuestControlFileTable::sltPaste);
+    //     m_pPaste->setEnabled(false);
+    // }
+
+    // m_pToolBar->addSeparator();
+
+    // m_pShowProperties = new QAction(this);
+    // {
+    //     m_pShowProperties->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
+    //     m_pToolBar->addAction(m_pShowProperties);
+    //     connect(m_pShowProperties, &QAction::triggered, this, &UIGuestControlFileTable::sltShowProperties);
+    //     m_selectionDependentActions.push_back(m_pShowProperties);
+    // }
+
+    // m_pSelectAll = new QAction(this);
+    // {
+    //     m_pSelectAll->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
+    //     m_pToolBar->addAction(m_pSelectAll);
+    //     connect(m_pSelectAll, &QAction::triggered, this, &UIGuestControlFileTable::sltSelectAll);
+    // }
+
+    // m_pInvertSelection = new QAction(this);
+    // {
+    //     m_pInvertSelection->setIcon(UIIconPool::iconSet(QString(":/session_info_32px.png")));
+    //     m_pToolBar->addAction(m_pInvertSelection);
+    //     connect(m_pInvertSelection, &QAction::triggered, this, &UIGuestControlFileTable::sltInvertSelection);
+    // }
 
     disableSelectionDependentActions();
@@ -1300 +1288 @@
 
     m_copyCutBuffer = selectedItemPathList();
-    if (!m_copyCutBuffer.isEmpty())
-        m_pPaste->setEnabled(true);
-    else
-        m_pPaste->setEnabled(false);
+    // if (!m_copyCutBuffer.isEmpty())
+    //     m_pPaste->setEnabled(true);
+    // else
+    //     m_pPaste->setEnabled(false);
 }
 
@@ -1309 +1297 @@
 {
     m_copyCutBuffer = selectedItemPathList();
-    if (!m_copyCutBuffer.isEmpty())
-        m_pPaste->setEnabled(true);
-    else
-        m_pPaste->setEnabled(false);
+    // if (!m_copyCutBuffer.isEmpty())
+    //     m_pPaste->setEnabled(true);
+    // else
+    //     m_pPaste->setEnabled(false);
 }
 
@@ -1319 +1307 @@
     // paste them
     m_copyCutBuffer.clear();
-    m_pPaste->setEnabled(false);
+    //m_pPaste->setEnabled(false);
 }
 
@@ -1433 +1421 @@
 void UIGuestControlFileTable::retranslateUi()
 {
-    if (m_pGoUp)
-    {
-        m_pGoUp->setText(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
-        m_pGoUp->setToolTip(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
-        m_pGoUp->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
-    }
-
-    if (m_pGoHome)
-    {
-        m_pGoHome->setText(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
-        m_pGoHome->setToolTip(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
-        m_pGoHome->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
-    }
-
-    if (m_pRename)
-    {
-        m_pRename->setText(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
-        m_pRename->setToolTip(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
-        m_pRename->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
-    }
-
-    if (m_pRefresh)
-    {
-        m_pRefresh->setText(QApplication::translate("UIGuestControlFileManager", "Refresh"));
-        m_pRefresh->setToolTip(QApplication::translate("UIGuestControlFileManager", "Refresh the current directory"));
-        m_pRefresh->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Refresh the current directory"));
-    }
-    if (m_pDelete)
-    {
-        m_pDelete->setText(QApplication::translate("UIGuestControlFileManager", "Delete"));
-        m_pDelete->setToolTip(QApplication::translate("UIGuestControlFileManager", "Delete the selected item(s)"));
-        m_pDelete->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Delete the selected item(s)"));
-    }
-
-    if (m_pCreateNewDirectory)
-    {
-        m_pCreateNewDirectory->setText(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
-        m_pCreateNewDirectory->setToolTip(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
-        m_pCreateNewDirectory->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
-    }
-
-    if (m_pCopy)
-    {
-        m_pCopy->setText(QApplication::translate("UIGuestControlFileManager", "Copy the selected item"));
-        m_pCopy->setToolTip(QApplication::translate("UIGuestControlFileManager", "Copy the selected item(s)"));
-        m_pCopy->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Copy the selected item(s)"));
-
-    }
-
-    if (m_pCut)
-    {
-        m_pCut->setText(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
-        m_pCut->setToolTip(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
-        m_pCut->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
-
-    }
-
-    if ( m_pPaste)
-    {
-        m_pPaste->setText(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
-        m_pPaste->setToolTip(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
-        m_pPaste->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
-    }
-
-    if (m_pShowProperties)
-    {
-        m_pShowProperties->setText(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
-        m_pShowProperties->setToolTip(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
-        m_pShowProperties->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
-    }
-
-    if (m_pSelectAll)
-    {
-        m_pSelectAll->setText(QApplication::translate("UIGuestControlFileManager", "Select All"));
-        m_pSelectAll->setToolTip(QApplication::translate("UIGuestControlFileManager", "Select All"));
-        m_pSelectAll->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Select All"));
-    }
-
-    if (m_pInvertSelection)
-    {
-        m_pInvertSelection->setText(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
-        m_pInvertSelection->setToolTip(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
-        m_pInvertSelection->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
-    }
+    // if (m_pGoUp)
+    // {
+    //     m_pGoUp->setText(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
+    //     m_pGoUp->setToolTip(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
+    //     m_pGoUp->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
+    // }
+
+    // if (m_pGoHome)
+    // {
+    //     m_pGoHome->setText(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
+    //     m_pGoHome->setToolTip(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
+    //     m_pGoHome->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
+    // }
+
+    // if (m_pRename)
+    // {
+    //     m_pRename->setText(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
+    //     m_pRename->setToolTip(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
+    //     m_pRename->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
+    // }
+
+    // if (m_pRefresh)
+    // {
+    //     m_pRefresh->setText(QApplication::translate("UIGuestControlFileManager", "Refresh"));
+    //     m_pRefresh->setToolTip(QApplication::translate("UIGuestControlFileManager", "Refresh the current directory"));
+    //     m_pRefresh->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Refresh the current directory"));
+    // }
+    // if (m_pDelete)
+    // {
+    //     m_pDelete->setText(QApplication::translate("UIGuestControlFileManager", "Delete"));
+    //     m_pDelete->setToolTip(QApplication::translate("UIGuestControlFileManager", "Delete the selected item(s)"));
+    //     m_pDelete->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Delete the selected item(s)"));
+    // }
+
+    // if (m_pCreateNewDirectory)
+    // {
+    //     m_pCreateNewDirectory->setText(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
+    //     m_pCreateNewDirectory->setToolTip(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
+    //     m_pCreateNewDirectory->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
+    // }
+
+    // if (m_pCopy)
+    // {
+    //     m_pCopy->setText(QApplication::translate("UIGuestControlFileManager", "Copy the selected item"));
+    //     m_pCopy->setToolTip(QApplication::translate("UIGuestControlFileManager", "Copy the selected item(s)"));
+    //     m_pCopy->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Copy the selected item(s)"));
+
+    // }
+
+    // if (m_pCut)
+    // {
+    //     m_pCut->setText(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
+    //     m_pCut->setToolTip(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
+    //     m_pCut->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
+
+    // }
+
+    // if ( m_pPaste)
+    // {
+    //     m_pPaste->setText(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
+    //     m_pPaste->setToolTip(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
+    //     m_pPaste->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
+    // }
+
+    // if (m_pShowProperties)
+    // {
+    //     m_pShowProperties->setText(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
+    //     m_pShowProperties->setToolTip(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
+    //     m_pShowProperties->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
+    // }
+
+    // if (m_pSelectAll)
+    // {
+    //     m_pSelectAll->setText(QApplication::translate("UIGuestControlFileManager", "Select All"));
+    //     m_pSelectAll->setToolTip(QApplication::translate("UIGuestControlFileManager", "Select All"));
+    //     m_pSelectAll->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Select All"));
+    // }
+
+    // if (m_pInvertSelection)
+    // {
+    //     m_pInvertSelection->setText(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
+    //     m_pInvertSelection->setToolTip(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
+    //     m_pInvertSelection->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
+    // }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.h

@@ -37 +37 @@
 class QAction;
 class QFileInfo;
-
 class QComboBox;
 class QILabel;
@@ -45 +44 @@
 class QTextEdit;
 class QVBoxLayout;
+class UIActionPool;
 class UIFileTableItem;
 class UIGuestControlFileModel;
@@ -248 +248 @@
 public:
 
-    UIGuestControlFileTable(QWidget *pParent = 0);
+    UIGuestControlFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
     virtual ~UIGuestControlFileTable();
     /** Deletes all the tree nodes */
@@ -292 +292 @@
     bool             eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
     CGuestFsObjInfo  guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
+    virtual void     prepareActions();
 
     UIFileTableItem         *m_pRootItem;
     QILabel                 *m_pLocationLabel;
-    QAction                 *m_pCopy;
-    QAction                 *m_pCut;
-    QAction                 *m_pPaste;
+    // QAction                 *m_pCopy;
+    // QAction                 *m_pCut;
+    // QAction                 *m_pPaste;
     UIPropertiesDialog      *m_pPropertiesDialog;
+    UIActionPool            *m_pActionPool;
+    UIToolBar               *m_pToolBar;
+
     /** Stores the drive letters the file system has (for windows system). For non-windows
      *  systems this is empty and for windows system it should at least contain C:/ */
@@ -331 +335 @@
 
     void             prepareObjects();
-    void             prepareActions();
     /** @p itemIndex is assumed to be 'model' index not 'proxy model' index */
     void             deleteByIndex(const QModelIndex &itemIndex);
@@ -358 +361 @@
     QGridLayout     *m_pMainLayout;
     QComboBox       *m_pLocationComboBox;
-    UIToolBar       *m_pToolBar;
-    QAction         *m_pGoUp;
-    QAction         *m_pGoHome;
-    QAction         *m_pRefresh;
-    QAction         *m_pDelete;
-    QAction         *m_pRename;
-    QAction         *m_pCreateNewDirectory;
-    QAction         *m_pShowProperties;
-    QAction         *m_pSelectAll;
-    QAction         *m_pInvertSelection;
+    //QAction         *m_pGoUp;
+    //QAction         *m_pGoHome;
+    //QAction         *m_pRefresh;
+    //QAction         *m_pDelete;
+    //QAction         *m_pRename;
+    //QAction         *m_pCreateNewDirectory;
+    // QAction         *m_pShowProperties;
+    // QAction         *m_pSelectAll;
+    // QAction         *m_pInvertSelection;
     /** The vector of actions which need some selection to work on. Like cut, copy etc. */
     QVector<QAction*> m_selectionDependentActions;
     /** The absolue path list of the file objects which user has chosen to cut/copy. this
      *  list will be cleaned after a paste operation or overwritten by a subsequent cut/copy */
-    QStringList     m_copyCutBuffer;
-    QILineEdit     *m_pSearchLineEdit;
+    QStringList      m_copyCutBuffer;
+    QILineEdit      *m_pSearchLineEdit;
     friend class    UIGuestControlFileModel;
 };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

@@ -27 +27 @@
 /* GUI includes: */
 # include "QILabel.h"
+# include "UIActionPool.h"
 # include "UIErrorString.h"
 # include "UIGuestFileTable.h"
+# include "UIToolBar.h"
 
 /* COM includes: */
@@ -143 +145 @@
 }
 
-UIGuestFileTable::UIGuestFileTable(QWidget *pParent /*= 0*/)
-    :UIGuestControlFileTable(pParent)
-{
+UIGuestFileTable::UIGuestFileTable(UIActionPool *pActionPool, QWidget *pParent /*= 0*/)
+    :UIGuestControlFileTable(pActionPool, pParent)
+{
+    prepareActions();
     retranslateUi();
 }
@@ -586 +589 @@
 }
 
+void UIGuestFileTable::prepareActions()
+{
+    if (m_pToolBar && m_pActionPool)
+    {
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh));
+
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
+    }
+
+    UIGuestControlFileTable::prepareActions();
+}
+
 #include "UIGuestFileTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.h

@@ -26 +26 @@
 #include "UIGuestControlFileTable.h"
 
+/* Forward declarations: */
+class UIActionPool;
+
 /** This class scans the guest file system by using the VBox Guest Control API
  *  and populates the UIGuestControlFileModel*/
@@ -34 +37 @@
 public:
 
-    UIGuestFileTable(QWidget *pParent = 0);
+    UIGuestFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
     void initGuestFileTable(const CGuestSession &session);
     void copyGuestToHost(const QString& hostDestinationPath);
@@ -50 +53 @@
     virtual void    showProperties() /* override */;
     virtual void    determineDriveLetters() /* override */;
+    virtual void    prepareActions() /* override */;
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

@@ -27 +27 @@
 /* GUI includes: */
 # include "QILabel.h"
+# include "UIActionPool.h"
 # include "UIGuestControlFileModel.h"
 # include "UIHostFileTable.h"
+# include "UIToolBar.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -123 +125 @@
 *********************************************************************************************************************************/
 
-UIHostFileTable::UIHostFileTable(QWidget *pParent /* = 0 */)
-    :UIGuestControlFileTable(pParent)
+UIHostFileTable::UIHostFileTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
+    :UIGuestControlFileTable(pActionPool, pParent)
 {
     initializeFileTree();
@@ -140 +142 @@
 void UIHostFileTable::prepareActions()
 {
+    if (m_pToolBar && m_pActionPool)
+    {
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
+
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection));
+        m_pToolBar->addSeparator();
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
+    }
+
     /* Hide cut, copy, and paste for now. We will implement those
        when we have an API for host file operations: */
-    if (m_pCopy)
-        m_pCopy->setVisible(false);
-    if (m_pCut)
-        m_pCut->setVisible(false);
-    if (m_pPaste)
-        m_pPaste->setVisible(false);
+    // if (m_pCopy)
+    //     m_pCopy->setVisible(false);
+    // if (m_pCut)
+    //     m_pCut->setVisible(false);
+    // if (m_pPaste)
+    //     m_pPaste->setVisible(false);
+
+    UIGuestControlFileTable::prepareActions();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.h

@@ -22 +22 @@
 #include "UIGuestControlFileTable.h"
 
+/* Forward declarations: */
+class UIActionPool;
+
 /** This class scans the host file system by using the Qt API
     and connects to the UIGuestControlFileModel*/
@@ -30 +33 @@
 public:
 
-    UIHostFileTable(QWidget *pParent = 0);
+    UIHostFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
 
 protected: