Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 92487) @@ -1619,5 +1619,4 @@ case UIToolType_Logs: strResult = "Logs"; break; case UIToolType_VMActivity: strResult = "Activity"; break; - case UIToolType_VISOCreator: strResult = "VISOCreator"; break; default: { @@ -1646,5 +1645,4 @@ keys << "Logs"; values << UIToolType_Logs; keys << "Activity"; values << UIToolType_VMActivity; - keys << "VISOCreator"; values << UIToolType_VISOCreator; /* Invalid type for unknown words: */ if (!keys.contains(strToolType, Qt::CaseInsensitive)) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 92487) @@ -294,5 +294,4 @@ case UIToolType_Logs: case UIToolType_VMActivity: - case UIToolType_VISOCreator: return true; default: Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 92487) @@ -933,6 +933,5 @@ UIToolType_Snapshots, UIToolType_Logs, - UIToolType_VMActivity, - UIToolType_VISOCreator + UIToolType_VMActivity }; Q_DECLARE_METATYPE(UIToolType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 92487) @@ -3162,5 +3162,4 @@ m_menuUpdateHandlers[UIActionIndex_M_Activity].ptf = &UIActionPool::updateMenuVMActivityMonitor; m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager; - m_menuUpdateHandlers[UIActionIndex_M_VISOCreator].ptf = &UIActionPool::updateMenuVISOCreator; /* Invalidate all known menus: */ @@ -3556,19 +3555,4 @@ } -void UIActionPool::updateMenuVISOCreator() -{ - /* Get corresponding menu: */ - UIMenu *pMenu = action(UIActionIndex_M_VISOCreator)->menu(); - AssertPtrReturnVoid(pMenu); - /* Clear contents: */ - pMenu->clear(); - - pMenu->addAction(action(UIActionIndex_M_VISOCreator_ToggleConfigPanel)); - pMenu->addAction(action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel)); - - /* Mark menu as valid: */ - m_invalidations.remove(UIActionIndex_M_Activity); -} - void UIActionPool::updateMenuFileManagerWrapper(UIMenu *pMenu) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 92487) @@ -613,6 +613,4 @@ /** Updates 'File Manager' @a pMenu. */ void updateMenuFileManagerWrapper(UIMenu *pMenu); - /** Updates 'VISO Creator' pMenu. */ - void updateMenuVISOCreator(); /** Holds the map of actions. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp (revision 92487) @@ -1902,37 +1902,4 @@ setName(QApplication::translate("UIActionPool", "&Activity")); setStatusTip(QApplication::translate("UIActionPool", "Open the machine activity monitor pane")); - } -}; - -/** Simple action extension, used as 'Show VISO Creator' action class. */ -class UIActionToggleManagerToolsMachineShowVISOCreator : public UIActionToggle -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionToggleManagerToolsMachineShowVISOCreator(UIActionPool *pParent) - : UIActionToggle(pParent) - { - setProperty("UIToolType", QVariant::fromValue(UIToolType_VISOCreator)); - /// @todo use icons with check-boxes - setIcon(UIIconPool::iconSetFull(":/performance_monitor_32px.png", ":/performance_monitor_16px.png", - ":/performance_monitor_disabled_32px.png", ":/performance_monitor_disabled_16px.png")); - } - -protected: - - /** Returns shortcut extra-data ID. */ - virtual QString shortcutExtraDataID() const /* override */ - { - return QString("ToolsMachineVMVISOCreator"); - } - - /** Handles translation event. */ - virtual void retranslateUi() /* override */ - { - setName(QApplication::translate("UIActionPool", "&VISO")); - setStatusTip(QApplication::translate("UIActionPool", "Open the VISO Creator pane")); } }; @@ -3574,5 +3541,4 @@ m_pool[UIActionIndexMN_M_Group_M_Tools_T_Logs] = new UIActionToggleManagerToolsMachineShowLogs(this); m_pool[UIActionIndexMN_M_Group_M_Tools_T_Activity] = new UIActionToggleManagerToolsMachineShowActivity(this); - m_pool[UIActionIndexMN_M_Group_M_Tools_T_VISOCreator] = new UIActionToggleManagerToolsMachineShowVISOCreator(this); m_pool[UIActionIndexMN_M_Group_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this); m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this); @@ -3620,5 +3586,4 @@ m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Logs] = new UIActionToggleManagerToolsMachineShowLogs(this); m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Activity] = new UIActionToggleManagerToolsMachineShowActivity(this); - m_pool[UIActionIndexMN_M_Machine_M_Tools_T_VISOCreator] = new UIActionToggleManagerToolsMachineShowVISOCreator(this); m_pool[UIActionIndexMN_M_Machine_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this); m_pool[UIActionIndexMN_M_Machine_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this); Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h (revision 92487) @@ -84,5 +84,4 @@ UIActionIndexMN_M_Group_M_Tools_T_Logs, UIActionIndexMN_M_Group_M_Tools_T_Activity, - UIActionIndexMN_M_Group_M_Tools_T_VISOCreator, UIActionIndexMN_M_Group_S_Discard, UIActionIndexMN_M_Group_S_ShowLogDialog, @@ -129,5 +128,4 @@ UIActionIndexMN_M_Machine_M_Tools_T_Logs, UIActionIndexMN_M_Machine_M_Tools_T_Activity, - UIActionIndexMN_M_Machine_M_Tools_T_VISOCreator, UIActionIndexMN_M_Machine_S_Discard, UIActionIndexMN_M_Machine_S_ShowLogDialog, Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp (revision 92487) @@ -3530,7 +3530,4 @@ /* 'File Manager' menu: */ updateMenuFileManager(); - - /* 'VISO Creator' menu: */ - updateMenuVISOCreator(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp (revision 92487) @@ -32,5 +32,4 @@ #include "UIToolPaneMachine.h" #include "UIVirtualMachineItem.h" -#include "UIVisoCreator.h" #include "UIVMLogViewerWidget.h" @@ -49,5 +48,4 @@ , m_pPaneLogViewer(0) , m_pPaneVMActivityMonitor(0) - , m_pPaneVISOCreator(0) , m_fActive(false) { @@ -214,22 +212,4 @@ break; } - case UIToolType_VISOCreator: - { - m_pPaneVISOCreator = new UIVisoCreatorWidget(m_pActionPool, 0 /* Parent */, - false /* don't show toolbar*/, QString() /* Machine Name */); - AssertPtrReturnVoid(m_pPaneVISOCreator); -#ifndef VBOX_WS_MAC - const int iMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 4; - m_pPaneVISOCreator->setContentsMargins(iMargin, 0, iMargin, 0); -#endif - - /* Configure pane: */ - m_pPaneVISOCreator->setProperty("ToolType", QVariant::fromValue(UIToolType_VISOCreator)); - - /* Add into layout: */ - m_pLayout->addWidget(m_pPaneVISOCreator); - m_pLayout->setCurrentWidget(m_pPaneVISOCreator); - break; - } default: AssertFailedReturnVoid(); @@ -260,5 +240,4 @@ case UIToolType_Logs: m_pPaneLogViewer = 0; break; case UIToolType_VMActivity: m_pPaneVMActivityMonitor = 0; break; - case UIToolType_VISOCreator: m_pPaneVISOCreator = 0; break; default: break; } @@ -354,7 +333,4 @@ pCurrentToolWidget = m_pPaneVMActivityMonitor; break; - case UIToolType_VISOCreator: - pCurrentToolWidget = m_pPaneVISOCreator; - break; default: break; Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h (revision 92487) @@ -42,5 +42,4 @@ class UISnapshotPane; class UIVirtualMachineItem; -class UIVisoCreatorWidget; class UIVMLogViewerWidget; @@ -135,6 +134,4 @@ /** Holds the Performance Monitor pane instance. */ UIVMActivityToolWidget *m_pPaneVMActivityMonitor; - /** Holds the VISO Creator pane instance. */ - UIVisoCreatorWidget *m_pPaneVISOCreator; /** Holds whether this pane is active. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (revision 92487) @@ -3044,8 +3044,4 @@ m_pWidget->currentMachineTool() == UIToolType_VMActivity; actionPool()->action(UIActionIndex_M_Activity)->setVisible(fPerformanceMenuShown); - /* Determine whether VISO Creator menu should be visible: */ - const bool fVISOCreatorShown = (fMachineMenuShown || fGroupMenuShown) && - m_pWidget->currentMachineTool() == UIToolType_VISOCreator; - actionPool()->action(UIActionIndex_M_VISOCreator)->setVisible(fVISOCreatorShown); /* Hide action shortcuts: */ @@ -3225,10 +3221,4 @@ break; } - case UIToolType_VISOCreator: - { - actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_VISOCreator)->setChecked(true); - actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_VISOCreator)->setChecked(true); - break; - } default: break; Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp (revision 92487) @@ -966,14 +966,4 @@ break; } - case UIToolType_VISOCreator: - { - m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_VISOCreator_ToggleConfigPanel)); - m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_VISOCreator_ToggleOptionsPanel)); - m_pToolBar->addSeparator(); - m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings)); - m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)); - m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)); - break; - } case UIToolType_Error: { Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp (revision 92486) +++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp (revision 92487) @@ -463,5 +463,4 @@ case UIToolType_Logs: pItem->reconfigure(tr("Logs")); break; case UIToolType_VMActivity: pItem->reconfigure(tr("Activity")); break; - case UIToolType_VISOCreator: pItem->reconfigure(tr("VISO")); break; default: break; } @@ -540,8 +539,4 @@ m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_VMActivity, QString(), UIIconPool::iconSet(":/performance_monitor_24px.png", ":/performance_monitor_disabled_24px.png")); - - /* VISO Creator: */ - m_items << new UIToolsItem(scene(), UIToolClass_Machine, UIToolType_VISOCreator, QString(), - UIIconPool::iconSet(":/performance_monitor_24px.png", ":/performance_monitor_disabled_24px.png")); }