Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 92414) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 92415) @@ -2242,6 +2242,8 @@ { setShortcutContext(Qt::WidgetWithChildrenShortcut); - setIcon(UIIconPool::iconSetFull(":/file_manager_session_32px.png", ":/file_manager_session_16px.png", - ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png")); + setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", + ":/%file_manager_options_16px.png", + ":/file_manager_options_disabled_32px.png", + ":/file_manager_options_disabled_16px.png")); } @@ -2266,5 +2268,5 @@ setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); setStatusTip(QApplication::translate("UIActionPool", "Open panel for VISO Creator configuration")); - setToolTip( QApplication::translate("UIActionPool", "Open Configuration Panel") + setToolTip(QApplication::translate("UIActionPool", "Open Configuration Panel") + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); } @@ -2283,14 +2285,16 @@ { setShortcutContext(Qt::WidgetWithChildrenShortcut); - setIcon(UIIconPool::iconSetFull(":/file_manager_session_32px.png", ":/file_manager_session_16px.png", - ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png")); - } - -protected: - - /** Returns shortcut extra-data ID. */ - virtual QString shortcutExtraDataID() const /* override */ - { - return QString("ToggleVISOCreatorOptionsurationPanel"); + setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", + ":/%file_manager_options_16px.png", + ":/file_manager_options_disabled_32px.png", + ":/file_manager_options_disabled_16px.png")); + } + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("ToggleVISOCreatorOptionsPanel"); } @@ -2307,5 +2311,177 @@ setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); setStatusTip(QApplication::translate("UIActionPool", "Open panel for VISO Creator options")); - setToolTip( QApplication::translate("UIActionPool", "Open Options Panel") + setToolTip(QApplication::translate("UIActionPool", "Open Options Panel") + + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); + } +}; + +class UIActionMenuVISOCreatorAdd : public UIActionSimple +{ + Q_OBJECT; + +public: + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuVISOCreatorAdd(UIActionPool *pParent) + : UIActionSimple(pParent, + ":/file_manager_copy_to_guest_24px.png", + ":/file_manager_copy_to_guest_16px.png", + ":/file_manager_copy_to_guest_disabled_24px.png", + ":/file_manager_copy_to_guest_disabled_16px.png") + { + setShortcutContext(Qt::WidgetWithChildrenShortcut); + } + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("Add"); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "&Add")); + setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); + setStatusTip(QApplication::translate("UIActionPool", "Add selected item(s) to VISO")); + setToolTip(QApplication::translate("UIActionPool", "Add Selected Item(s) to VISO") + + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); + } +}; + +class UIActionMenuVISOCreatorRemove : public UIActionSimple +{ + Q_OBJECT; + +public: + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuVISOCreatorRemove(UIActionPool *pParent) + : UIActionSimple(pParent, + ":/file_manager_delete_24px.png", + ":/file_manager_delete_16px.png", + ":/file_manager_delete_disabled_24px.png", + ":/file_manager_delete_disabled_16px.png") + { + setShortcutContext(Qt::WidgetWithChildrenShortcut); + } + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("Remove"); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "&Remove")); + setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); + setStatusTip(QApplication::translate("UIActionPool", "Remove selected item(s) from VISO")); + setToolTip(QApplication::translate("UIActionPool", "Remove Selected Item(s) from VISO") + + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); + } +}; + +class UIActionMenuVISOCreatorCreateNewDirectory : public UIActionSimple +{ + Q_OBJECT; + +public: + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuVISOCreatorCreateNewDirectory(UIActionPool *pParent) + : UIActionSimple(pParent, + ":/file_manager_new_directory_24px.png", + ":/file_manager_new_directory_16px.png", + ":/file_manager_new_directory_disabled_24px.png", + ":/file_manager_new_directory_disabled_16px.png") + { + setShortcutContext(Qt::WidgetWithChildrenShortcut); + } + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("NewDirectory"); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "&New Directory")); + setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); + setStatusTip(QApplication::translate("UIActionPool", "Create a new directory under the current location")); + setToolTip(QApplication::translate("UIActionPool", "Create a New Directory Under the Current Location") + + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); + } +}; + +class UIActionMenuVISOCreatorRename : public UIActionSimple +{ + Q_OBJECT; + +public: + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuVISOCreatorRename(UIActionPool *pParent) + : UIActionSimple(pParent, + ":/file_manager_rename_24px.png", + ":/file_manager_rename_16px.png", + ":/file_manager_rename_disabled_24px.png", + ":/file_manager_rename_disabled_16px.png") + { + setShortcutContext(Qt::WidgetWithChildrenShortcut); + } + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("Rename"); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "&New Directory")); + setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); + setStatusTip(QApplication::translate("UIActionPool", "Rename the selected object")); + setToolTip(QApplication::translate("UIActionPool", "Rename the Selected Object") + + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); + } +}; + +class UIActionMenuVISOCreatorReset : public UIActionSimple +{ + Q_OBJECT; + +public: + /** Constructs action passing @a pParent to the base-class. */ + UIActionMenuVISOCreatorReset(UIActionPool *pParent) + : UIActionSimple(pParent, + ":/cd_remove_16px.png", ":/cd_remove_disabled_16px.png") + { + setShortcutContext(Qt::WidgetWithChildrenShortcut); + } + +protected: + + /** Returns shortcut extra-data ID. */ + virtual QString shortcutExtraDataID() const /* override */ + { + return QString("Reset"); + } + + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { + setName(QApplication::translate("UIActionPool", "&New Directory")); + setShortcutScope(QApplication::translate("UIActionPool", "VISO Creator")); + setStatusTip(QApplication::translate("UIActionPool", "Reset the VISO content.")); + setToolTip(QApplication::translate("UIActionPool", "Reset the VISO content.") + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString()))); } @@ -2695,4 +2871,9 @@ m_pool[UIActionIndex_M_VISOCreator_ToggleConfigPanel] = new UIActionMenuVISOCreatorToggleConfigPanel(this); m_pool[UIActionIndex_M_VISOCreator_ToggleOptionsPanel] = new UIActionMenuVISOCreatorToggleOptionsPanel(this); + m_pool[UIActionIndex_M_VISOCreator_Add] = new UIActionMenuVISOCreatorAdd(this); + m_pool[UIActionIndex_M_VISOCreator_Remove] = new UIActionMenuVISOCreatorRemove(this); + m_pool[UIActionIndex_M_VISOCreator_CreateNewDirectory] = new UIActionMenuVISOCreatorCreateNewDirectory(this); + m_pool[UIActionIndex_M_VISOCreator_Rename] = new UIActionMenuVISOCreatorRename(this); + m_pool[UIActionIndex_M_VISOCreator_Reset] = new UIActionMenuVISOCreatorReset(this); /* Prepare update-handlers for known menus: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 92414) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 92415) @@ -142,4 +142,9 @@ UIActionIndex_M_VISOCreator_ToggleConfigPanel, UIActionIndex_M_VISOCreator_ToggleOptionsPanel, + UIActionIndex_M_VISOCreator_Add, + UIActionIndex_M_VISOCreator_Remove, + UIActionIndex_M_VISOCreator_CreateNewDirectory, + UIActionIndex_M_VISOCreator_Rename, + UIActionIndex_M_VISOCreator_Reset, /* Maximum index: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (revision 92414) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp (revision 92415) @@ -53,5 +53,5 @@ , m_pAddAction(0) , m_pRemoveAction(0) - , m_pNewDirectoryAction(0) + , m_pCreateNewDirectoryAction(0) , m_pRenameAction(0) , m_pResetAction(0) @@ -106,44 +106,11 @@ } +QMenu *UIVisoCreatorWidget::menu() const +{ + return m_pMainMenu; +} + void UIVisoCreatorWidget::retranslateUi() { - if (m_pActionConfiguration) - { - m_pActionConfiguration->setText(tr("&Configuration...")); - m_pActionConfiguration->setToolTip(tr("VISO Configuration")); - m_pActionConfiguration->setStatusTip(tr("Manage VISO Configuration")); - } - if (m_pActionOptions) - { - m_pActionOptions->setText(tr("&Options...")); - m_pActionOptions->setToolTip(tr("Dialog Options")); - m_pActionOptions->setStatusTip(tr("Manage Dialog Options")); - } - if (m_pMainMenu) - m_pMainMenu->setTitle(tr("VISO")); - - if (m_pAddAction) - { - m_pAddAction->setToolTip(QApplication::translate("UIVisoCreator", "Add selected file objects to VISO")); - m_pAddAction->setText(QApplication::translate("UIVisoCreator", "Add")); - } - - if (m_pRemoveAction) - { - m_pRemoveAction->setToolTip(QApplication::translate("UIVisoCreator", "Remove selected file objects from VISO")); - m_pRemoveAction->setText(QApplication::translate("UIVisoCreator", "Remove")); - } - if (m_pNewDirectoryAction) - { - m_pNewDirectoryAction->setToolTip(QApplication::translate("UIVisoCreator", "Create a new directory under the current location")); - m_pNewDirectoryAction->setText(QApplication::translate("UIVisoCreator", "New Directory")); - } - if (m_pResetAction) - { - m_pResetAction->setToolTip(QApplication::translate("UIVisoCreator", "Reset VISO content.")); - m_pResetAction->setText(QApplication::translate("UIVisoCreator", "Reset")); - } - if (m_pRenameAction) - m_pRenameAction->setToolTip(QApplication::translate("UIVisoCreator", "Rename the selected object")); } @@ -236,5 +203,5 @@ { menu.addAction(m_pRemoveAction); - menu.addAction(m_pNewDirectoryAction); + menu.addAction(m_pCreateNewDirectoryAction); menu.addAction(m_pResetAction); } @@ -261,10 +228,6 @@ #endif - // m_pMainMenu = menuBar()->addMenu(tr("VISO")); - - // if (m_pActionConfiguration) - // m_pMainMenu->addAction(m_pActionConfiguration); - // if (m_pActionOptions) - // m_pMainMenu->addAction(m_pActionOptions); + if (m_pActionPool && m_pActionPool->action(UIActionIndex_M_VISOCreator)) + m_pMainMenu = m_pActionPool->action(UIActionIndex_M_VISOCreator)->menu(); m_pToolBar = new QIToolBar(parentWidget()); @@ -369,6 +332,6 @@ m_pHostBrowser, &UIVisoHostBrowser::sltHandleAddAction); - if (m_pNewDirectoryAction) - connect(m_pNewDirectoryAction, &QAction::triggered, + if (m_pCreateNewDirectoryAction) + connect(m_pCreateNewDirectoryAction, &QAction::triggered, m_pVisoBrowser, &UIVisoContentBrowser::sltHandleCreateNewDirectory); if (m_pRemoveAction) @@ -386,73 +349,14 @@ { if (!m_pActionPool) - { - m_pActionConfiguration = new QAction(this); - if (m_pActionConfiguration) - { - m_pActionConfiguration->setCheckable(true); - m_pActionConfiguration->setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", - ":/%file_manager_options_16px.png", - ":/file_manager_options_disabled_32px.png", - ":/file_manager_options_disabled_16px.png")); - } - - m_pActionOptions = new QAction(this); - if (m_pActionOptions) - { - m_pActionOptions->setCheckable(true); - - m_pActionOptions->setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png", - ":/%file_manager_options_16px.png", - ":/file_manager_options_disabled_32px.png", - ":/file_manager_options_disabled_16px.png")); - } - - // m_pAddAction = new QAction(this); - // if (m_pAddAction) - // { - // m_pAddAction->setIcon(UIIconPool::iconSetFull(":/file_manager_copy_to_guest_24px.png", - // ":/file_manager_copy_to_guest_16px.png", - // ":/file_manager_copy_to_guest_disabled_24px.png", - // ":/file_manager_copy_to_guest_disabled_16px.png")); - // m_pAddAction->setText(QApplication::translate("UIVisoCreator", "Add")); - // m_pAddAction->setEnabled(false); - // } - // m_pRemoveAction = new QAction(this); - // if (m_pRemoveAction) - // { - // m_pRemoveAction->setIcon(UIIconPool::iconSetFull(":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png", - // ":/file_manager_delete_disabled_24px.png", ":/file_manager_delete_disabled_16px.png")); - // m_pRemoveAction->setEnabled(false); - // } - - // m_pNewDirectoryAction = new QAction(this); - // if (m_pNewDirectoryAction) - // { - // m_pNewDirectoryAction->setIcon(UIIconPool::iconSetFull(":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png", - // ":/file_manager_new_directory_disabled_24px.png", ":/file_manager_new_directory_disabled_16px.png")); - // m_pNewDirectoryAction->setEnabled(true); - // } - - // //m_pRenameAction = new QAction(this); - // if (m_pRenameAction) - // { - // /** @todo Handle rename correctly in the m_entryMap as well and then enable this rename action. */ - // /* m_pVerticalToolBar->addAction(m_pRenameAction); */ - // m_pRenameAction->setIcon(UIIconPool::iconSet(":/file_manager_rename_16px.png", ":/file_manager_rename_disabled_16px.png")); - // m_pRenameAction->setEnabled(false); - // } - - // m_pResetAction = new QAction(this); - // if (m_pResetAction) - // { - // m_pResetAction->setIcon(UIIconPool::iconSet(":/cd_remove_16px.png", ":/cd_remove_disabled_16px.png")); - // m_pResetAction->setEnabled(true); - // } - }// if (m_pActionPool) - else - { - m_pActionConfiguration = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel); - m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel); - } + return; + + m_pActionConfiguration = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel); + m_pActionOptions = m_pActionPool->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel); + + m_pAddAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Add); + m_pRemoveAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Remove); + m_pCreateNewDirectoryAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_CreateNewDirectory); + m_pRenameAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Rename); + m_pResetAction = m_pActionPool->action(UIActionIndex_M_VISOCreator_Reset); } @@ -467,11 +371,37 @@ m_pToolBar->addAction(m_pActionOptions); } - // m_pMainMenu->addAction(m_pActionConfiguration); - // m_pMainMenu->addAction(m_pActionOptions); - // m_pMainMenu->addSeparator(); - // m_pMainMenu->addAction(m_pAddAction); - // m_pMainMenu->addAction(m_pRemoveAction); - // m_pMainMenu->addAction(m_pNewDirectoryAction); - // m_pMainMenu->addAction(m_pResetAction); + if (m_pMainMenu) + { + m_pMainMenu->addAction(m_pActionConfiguration); + m_pMainMenu->addAction(m_pActionOptions); + m_pMainMenu->addSeparator(); + m_pMainMenu->addAction(m_pAddAction); + m_pMainMenu->addAction(m_pRemoveAction); + m_pMainMenu->addAction(m_pCreateNewDirectoryAction); + m_pMainMenu->addAction(m_pResetAction); + } + + if (m_pVerticalToolBar) + { + /* Add to dummy QWidget to toolbar to center the action icons vertically: */ + QWidget *topSpacerWidget = new QWidget(this); + topSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + topSpacerWidget->setVisible(true); + QWidget *bottomSpacerWidget = new QWidget(this); + bottomSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + bottomSpacerWidget->setVisible(true); + + m_pVerticalToolBar->addWidget(topSpacerWidget); + if (m_pAddAction) + m_pVerticalToolBar->addAction(m_pAddAction); + if (m_pRemoveAction) + m_pVerticalToolBar->addAction(m_pRemoveAction); + if (m_pCreateNewDirectoryAction) + m_pVerticalToolBar->addAction(m_pCreateNewDirectoryAction); + if (m_pResetAction) + m_pVerticalToolBar->addAction(m_pResetAction); + + m_pVerticalToolBar->addWidget(bottomSpacerWidget); + } } @@ -543,20 +473,4 @@ m_pVerticalToolBar->setOrientation(Qt::Vertical); - - /* Add to dummy QWidget to toolbar to center the action icons vertically: */ - QWidget *topSpacerWidget = new QWidget(this); - topSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); - topSpacerWidget->setVisible(true); - QWidget *bottomSpacerWidget = new QWidget(this); - bottomSpacerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); - bottomSpacerWidget->setVisible(true); - - // m_pVerticalToolBar->addWidget(topSpacerWidget); - // m_pVerticalToolBar->addAction(m_pAddAction); - // m_pVerticalToolBar->addAction(m_pRemoveAction); - // m_pVerticalToolBar->addAction(m_pNewDirectoryAction); - // m_pVerticalToolBar->addAction(m_pResetAction); - - m_pVerticalToolBar->addWidget(bottomSpacerWidget); } @@ -644,4 +558,5 @@ if (m_pVisoCreatorWidget) { + menuBar()->addMenu(m_pVisoCreatorWidget->menu()); pMainLayout->addWidget(m_pVisoCreatorWidget); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h (revision 92414) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h (revision 92415) @@ -61,4 +61,5 @@ QString currentPath() const; void setCurrentPath(const QString &strPath); + QMenu *menu() const; #ifdef VBOX_WS_MAC @@ -77,4 +78,5 @@ static int visoWriteQuotedString(PRTSTREAM pStrmDst, const char *pszPrefix, QString const &rStr, const char *pszPostFix); + protected: @@ -143,5 +145,5 @@ QAction *m_pAddAction; QAction *m_pRemoveAction; - QAction *m_pNewDirectoryAction; + QAction *m_pCreateNewDirectoryAction; QAction *m_pRenameAction; QAction *m_pResetAction;