Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 75195) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 75196) @@ -1247,5 +1247,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer")); setStatusTip(QApplication::translate("UIActionPool", "Open pane with searching options")); - setToolTip(tr("Open Find Pane (%1)").arg(shortcut().toString())); + setToolTip(QApplication::translate("UIActionPool", "Open Find Pane (%1)").arg(shortcut().toString())); } }; @@ -1286,5 +1286,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer")); setStatusTip(QApplication::translate("UIActionPool", "Open pane with filtering options")); - setToolTip(tr("Open Filter Pane (%1)").arg(shortcut().toString())); + setToolTip(QApplication::translate("UIActionPool", "Open Filter Pane (%1)").arg(shortcut().toString())); } }; @@ -1325,5 +1325,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer")); setStatusTip(QApplication::translate("UIActionPool", "Open pane with bookmarking options")); - setToolTip(tr("Open Bookmark Pane (%1)").arg(shortcut().toString())); + setToolTip(QApplication::translate("UIActionPool", "Open Bookmark Pane (%1)").arg(shortcut().toString())); } }; @@ -1364,5 +1364,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer")); setStatusTip(QApplication::translate("UIActionPool", "Open pane with log viewer settings")); - setToolTip(tr("Open Settings Pane (%1)").arg(shortcut().toString())); + setToolTip(QApplication::translate("UIActionPool", "Open Settings Pane (%1)").arg(shortcut().toString())); } }; @@ -1403,5 +1403,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer")); setStatusTip(QApplication::translate("UIActionPool", "Refresh selected virtual machine log")); - setToolTip(tr("Refresh Virtual Machine Log (%1)").arg(shortcut().toString())); + setToolTip(QApplication::translate("UIActionPool", "Refresh Virtual Machine Log (%1)").arg(shortcut().toString())); } }; @@ -1442,5 +1442,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer")); setStatusTip(QApplication::translate("UIActionPool", "Save selected virtual machine log")); - setToolTip(tr("Save Virtual Machine Log (%1)").arg(shortcut().toString())); + setToolTip(QApplication::translate("UIActionPool", "Save Virtual Machine Log (%1)").arg(shortcut().toString())); } }; @@ -1529,4 +1529,77 @@ +/** Simple action extension, used as 'Copy to Guest' in guest control file manager action class. */ +class UIActionMenuGuestControlFileManagerCopyToGuest : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuGuestControlFileManagerCopyToGuest(UIActionPool *pParent) + : UIActionSimple(pParent, ":/arrow_left_10px_x2.png", ":/arrow_left_disabled_10px_x2.png") + {} + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("FileManagerCopyToGuest"); + } + + /** Returns default shortcut. */ + virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ + { + return QKeySequence(); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "Copy the selected object(s) from host to guest")); + setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); + setToolTip(QApplication::translate("UIActionPool", "Copy the Selected Object(s) from Host to Guest")); + setStatusTip(QApplication::translate("UIActionPool", "Copy the selected object(s) from host to guest")); + } +}; + +/** Simple action extension, used as 'Copy to Host' in guest control file manager action class. */ +class UIActionMenuGuestControlFileManagerCopyToHost : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuGuestControlFileManagerCopyToHost(UIActionPool *pParent) + : UIActionSimple(pParent, ":/arrow_right_10px_x2.png", ":/arrow_right_disabled_10px_x2.png") + {} + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("FileManagerCopyToHost"); + } + + /** Returns default shortcut. */ + virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */ + { + return QKeySequence(); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "Copy the selected object(s) from guest to host")); + setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); + setToolTip(QApplication::translate("UIActionPool", "Copy the Selected Object(s) from Guest to Host")); + setStatusTip(QApplication::translate("UIActionPool", "Copy the selected object(s) from guest to host")); + } +}; + + /** Simple action extension, used as 'File Manager Settings' in guest control file manager action class. */ class UIActionMenuGuestControlFileManagerSettings : public UIActionSimple @@ -1561,5 +1634,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Modify file manager settings")); - setToolTip(tr("Modify File Manager Settings")); + setToolTip(QApplication::translate("UIActionPool", "Modify File Manager Settings")); } }; @@ -1596,5 +1669,5 @@ 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")); + setToolTip(QApplication::translate("UIActionPool", "Go One Level Up to Parent Folder")); } }; @@ -1633,5 +1706,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Go to home folder")); - setToolTip(tr("Go to Home Folder")); + setToolTip(QApplication::translate("UIActionPool", "Go to Home Folder")); } }; @@ -1670,5 +1743,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Delete selected file object(s)")); - setToolTip(tr("Delete Selected File Object(s)")); + setToolTip(QApplication::translate("UIActionPool", "Delete Selected File Object(s)")); } }; @@ -1706,5 +1779,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Refresh")); - setToolTip(tr("Refresh")); + setToolTip(QApplication::translate("UIActionPool", "Refresh")); } }; @@ -1742,5 +1815,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Rename")); - setToolTip(tr("Rename")); + setToolTip(QApplication::translate("UIActionPool", "Rename")); } }; @@ -1777,5 +1850,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Create New Directory")); - setToolTip(tr("Create New Directory")); + setToolTip(QApplication::translate("UIActionPool", "Create New Directory")); } }; @@ -1813,5 +1886,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Copy selected file object(s)")); - setToolTip(tr("Copy Selected File Object(s)")); + setToolTip(QApplication::translate("UIActionPool", "Copy Selected File Object(s)")); } }; @@ -1848,5 +1921,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Cut selected file object(s)")); - setToolTip(tr("Cut Selected File Object(s)")); + setToolTip(QApplication::translate("UIActionPool", "Cut Selected File Object(s)")); } }; @@ -1883,5 +1956,5 @@ 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)")); + setToolTip(QApplication::translate("UIActionPool", "Paste Copied/Cut File Object(s)")); } }; @@ -1918,5 +1991,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Select all files objects")); - setToolTip(tr("Select All Files Objects")); + setToolTip(QApplication::translate("UIActionPool", "Select All Files Objects")); } }; @@ -1954,5 +2027,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager")); setStatusTip(QApplication::translate("UIActionPool", "Invert the current selection")); - setToolTip(tr("Invert The Current Selection")); + setToolTip(QApplication::translate("UIActionPool", "Invert The Current Selection")); } }; @@ -1990,5 +2063,5 @@ 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)")); + setToolTip(QApplication::translate("UIActionPool", "Show the Properties of Currently Selected File Object(s)")); } }; @@ -2207,4 +2280,7 @@ 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_CopyToGuest] = new UIActionMenuGuestControlFileManagerCopyToGuest(this); + m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToHost] = new UIActionMenuGuestControlFileManagerCopyToHost(this); + m_pool[UIActionIndex_M_GuestControlFileManager_S_Settings] = new UIActionMenuGuestControlFileManagerSettings(this); m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_GoUp] = new UIActionMenuGuestControlFileManagerGoUp(this); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 75195) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 75196) @@ -102,4 +102,6 @@ UIActionIndex_M_GuestControlFileManager_M_HostSubmenu, UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu, + UIActionIndex_M_GuestControlFileManager_S_CopyToGuest, + UIActionIndex_M_GuestControlFileManager_S_CopyToHost, UIActionIndex_M_GuestControlFileManager_S_Settings, UIActionIndex_M_GuestControlFileManager_S_Host_GoUp, Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75195) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75196) @@ -353,6 +353,4 @@ , m_pLogOutput(0) , m_pToolBar(0) - , m_pCopyGuestToHost(0) - , m_pCopyHostToGuest(0) , m_pFileTableContainerWidget(0) , m_pFileTableContainerLayout(0) @@ -392,23 +390,7 @@ void UIGuestControlFileManager::retranslateUi() { - if (m_pCopyGuestToHost) - { - m_pCopyGuestToHost->setText(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from guest to host")); - m_pCopyGuestToHost->setToolTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from guest to host")); - m_pCopyGuestToHost->setStatusTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from guest to host")); - } - - if (m_pCopyHostToGuest) - { - m_pCopyHostToGuest->setText(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from host to guest")); - m_pCopyHostToGuest->setToolTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from host to guest")); - m_pCopyHostToGuest->setStatusTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from host to guest")); - } - - m_pTabWidget->setTabText(0, QApplication::translate("UIGuestProcessControlWidget", "Log")); m_pTabWidget->setTabText(1, QApplication::translate("UIGuestProcessControlWidget", "File Operations")); m_pTabWidget->setTabText(2, QApplication::translate("UIGuestProcessControlWidget", "Terminal")); - } @@ -523,22 +505,13 @@ bottomSpacerWidget->setVisible(true); - m_pCopyGuestToHost = new QAction(this); - if(m_pCopyGuestToHost) - { - m_pCopyGuestToHost->setIcon(UIIconPool::iconSet(QString(":/arrow_left_10px_x2.png"))); - connect(m_pCopyGuestToHost, &QAction::triggered, this, &UIGuestControlFileManager::sltCopyGuestToHost); - } - - m_pCopyHostToGuest = new QAction(this); - if (m_pCopyHostToGuest) - { - m_pCopyHostToGuest->setIcon(UIIconPool::iconSet(QString(":/arrow_right_10px_x2.png"))); - connect(m_pCopyHostToGuest, &QAction::triggered, this, &UIGuestControlFileManager::sltCopyHostToGuest); - } - m_pToolBar->addWidget(topSpacerWidget); - m_pToolBar->addAction(m_pCopyGuestToHost); - m_pToolBar->addAction(m_pCopyHostToGuest); + m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost)); + m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest)); m_pToolBar->addWidget(bottomSpacerWidget); + + connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost), &QAction::triggered, + this, &UIGuestControlFileManager::sltCopyHostToGuest); + connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest), &QAction::triggered, + this, &UIGuestControlFileManager::sltCopyGuestToHost); m_pFileTableContainerLayout->addWidget(m_pToolBar); Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75195) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75196) @@ -128,6 +128,6 @@ QTextEdit *m_pLogOutput; UIToolBar *m_pToolBar; - QAction *m_pCopyGuestToHost; - QAction *m_pCopyHostToGuest; + // QAction *m_pCopyGuestToHost; + // QAction *m_pCopyHostToGuest; QWidget *m_pFileTableContainerWidget; QHBoxLayout *m_pFileTableContainerLayout;