Changeset 92487 in vbox

Timestamp:

Nov 18, 2021 7:23:59 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10141. Removing VISO Creator from the set of machine tools.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• globals/UIActionPool.cpp (modified) (2 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• globals/UIActionPoolManager.cpp (modified) (3 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• globals/UIActionPoolRuntime.cpp (modified) (1 diff)
• manager/UIToolPaneMachine.cpp (modified) (5 diffs)
• manager/UIToolPaneMachine.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• manager/tools/UIToolsModel.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -1619 +1619 @@
         case UIToolType_Logs:               strResult = "Logs"; break;
         case UIToolType_VMActivity:         strResult = "Activity"; break;
-        case UIToolType_VISOCreator:        strResult = "VISOCreator"; break;
         default:
         {
@@ -1646 +1645 @@
     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))

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -294 +294 @@
                 case UIToolType_Logs:
                 case UIToolType_VMActivity:
-                case UIToolType_VISOCreator:
                     return true;
                 default:

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -933 +933 @@
     UIToolType_Snapshots,
     UIToolType_Logs,
-    UIToolType_VMActivity,
-    UIToolType_VISOCreator
+    UIToolType_VMActivity
 };
 Q_DECLARE_METATYPE(UIToolType);

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

@@ -3162 +3162 @@
     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 +3555 @@
 }
 
-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)
 {

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

@@ -613 +613 @@
     /** Updates 'File Manager' @a pMenu. */
     void updateMenuFileManagerWrapper(UIMenu *pMenu);
-    /** Updates 'VISO Creator' pMenu. */
-    void updateMenuVISOCreator();
 
     /** Holds the map of actions. */

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

@@ -1902 +1902 @@
         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 +3541 @@
     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 +3586 @@
     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);

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

@@ -84 +84 @@
     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 +128 @@
     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,

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

@@ -3530 +3530 @@
     /* 'File Manager' menu: */
     updateMenuFileManager();
-
-    /* 'VISO Creator' menu: */
-    updateMenuVISOCreator();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -32 +32 @@
 #include "UIToolPaneMachine.h"
 #include "UIVirtualMachineItem.h"
-#include "UIVisoCreator.h"
 #include "UIVMLogViewerWidget.h"
 
@@ -49 +48 @@
     , m_pPaneLogViewer(0)
     , m_pPaneVMActivityMonitor(0)
-    , m_pPaneVISOCreator(0)
     , m_fActive(false)
 {
@@ -214 +212 @@
                 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 +240 @@
             case UIToolType_Logs:        m_pPaneLogViewer = 0; break;
             case UIToolType_VMActivity:  m_pPaneVMActivityMonitor = 0; break;
-            case UIToolType_VISOCreator:  m_pPaneVISOCreator = 0; break;
             default: break;
         }
@@ -354 +333 @@
             pCurrentToolWidget = m_pPaneVMActivityMonitor;
             break;
-        case UIToolType_VISOCreator:
-            pCurrentToolWidget = m_pPaneVISOCreator;
-            break;
         default:
             break;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

@@ -42 +42 @@
 class UISnapshotPane;
 class UIVirtualMachineItem;
-class UIVisoCreatorWidget;
 class UIVMLogViewerWidget;
 
@@ -135 +134 @@
     /** Holds the Performance Monitor pane instance. */
     UIVMActivityToolWidget *m_pPaneVMActivityMonitor;
-    /** Holds the VISO Creator pane instance. */
-    UIVisoCreatorWidget *m_pPaneVISOCreator;
 
     /** Holds whether this pane is active. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -3044 +3044 @@
                                        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 +3221 @@
                 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;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -966 +966 @@
                     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:
                 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -463 +463 @@
             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 +539 @@
     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"));
 }