Changeset 102575 in vbox

Timestamp:

Dec 11, 2023 4:48:25 PM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: VBox Manager: Remove Show Log Viewer dialog action; Only pane opened embedded way should be allowed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (6 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (12 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (2 diffs)

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

@@ -1275 +1275 @@
 };
 
-/** Simple action extension, used as 'Show Machine Logs' action class. */
-class UIActionSimpleManagerCommonShowMachineLogs : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionSimpleManagerCommonShowMachineLogs(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png",
-                         ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    /** Returns shortcut extra-data ID. */
-    virtual QString shortcutExtraDataID() const RT_OVERRIDE
-    {
-        return QString("LogViewer");
-    }
-
-    /** Returns default shortcut. */
-    virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
-    {
-        return QKeySequence("Ctrl+L");
-    }
-
-    /** Handles translation event. */
-    virtual void retranslateUi() RT_OVERRIDE
-    {
-        setName(QApplication::translate("UIActionPool", "Show &Log..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Show log files of selected virtual machines"));
-    }
-};
-
 /** Simple action extension, used as 'Perform Refresh' action class. */
 class UIActionSimpleManagerCommonPerformRefresh : public UIActionSimple
@@ -1905 +1867 @@
     {
         return QString("ToolsMachineLogViewer");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
+    {
+        return QKeySequence("Ctrl+L");
     }
 
@@ -3662 +3630 @@
     m_pool[UIActionIndexMN_M_Group_M_Tools_T_FileManager] = new UIActionToggleManagerToolsMachineShowFileManager(this);
     m_pool[UIActionIndexMN_M_Group_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
-    m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);
-    m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);
     m_pool[UIActionIndexMN_M_Group_S_Refresh] = new UIActionSimpleManagerCommonPerformRefresh(this);
     m_pool[UIActionIndexMN_M_Group_S_ShowInFileManager] = new UIActionSimpleManagerCommonShowInFileManager(this);
@@ -3709 +3675 @@
     m_pool[UIActionIndexMN_M_Machine_M_Tools_T_FileManager] = new UIActionToggleManagerToolsMachineShowFileManager(this);
     m_pool[UIActionIndexMN_M_Machine_S_Discard] = new UIActionSimpleManagerCommonPerformDiscard(this);
-    m_pool[UIActionIndexMN_M_Machine_S_ShowLogDialog] = new UIActionSimpleManagerCommonShowMachineLogs(this);
     m_pool[UIActionIndexMN_M_Machine_S_Refresh] = new UIActionSimpleManagerCommonPerformRefresh(this);
     m_pool[UIActionIndexMN_M_Machine_S_ShowInFileManager] = new UIActionSimpleManagerCommonShowInFileManager(this);
@@ -3965 +3930 @@
                     // << action(UIActionIndexMN_M_Group_S_Detach)
                     << action(UIActionIndexMN_M_Group_S_Discard)
-                    << action(UIActionIndexMN_M_Group_S_ShowLogDialog)
                     << action(UIActionIndexMN_M_Group_S_Refresh)
                     << action(UIActionIndexMN_M_Group_S_ShowInFileManager)
@@ -4001 +3965 @@
                     // << action(UIActionIndexMN_M_Machine_S_Detach)
                     << action(UIActionIndexMN_M_Machine_S_Discard)
-                    << action(UIActionIndexMN_M_Machine_S_ShowLogDialog)
                     << action(UIActionIndexMN_M_Machine_S_Refresh)
                     << action(UIActionIndexMN_M_Machine_S_ShowInFileManager)

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

@@ -96 +96 @@
     UIActionIndexMN_M_Group_M_Tools_T_FileManager,
     UIActionIndexMN_M_Group_S_Discard,
-    UIActionIndexMN_M_Group_S_ShowLogDialog,
     UIActionIndexMN_M_Group_S_Refresh,
     UIActionIndexMN_M_Group_S_ShowInFileManager,
@@ -142 +141 @@
     UIActionIndexMN_M_Machine_M_Tools_T_FileManager,
     UIActionIndexMN_M_Machine_S_Discard,
-    UIActionIndexMN_M_Machine_S_ShowLogDialog,
     UIActionIndexMN_M_Machine_S_Refresh,
     UIActionIndexMN_M_Machine_S_ShowInFileManager,

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

@@ -588 +588 @@
     , m_fFirstMediumEnumerationHandled(false)
     , m_pActionPool(0)
-    , m_pLogViewerDialog(0)
     , m_pWidget(0)
     , m_iGeometrySaveTimerId(-1)
@@ -950 +949 @@
     updateActionsVisibility();
     updateActionsAppearance();
-
-    /* Make sure separate dialog closed when corresponding tool opened: */
-    switch (m_pWidget->toolsTypeMachine())
-    {
-        case UIToolType_Logs:
-            sltCloseLogViewerWindow();
-            break;
-        default:
-            break;
-    }
 }
 
@@ -1033 +1022 @@
             case UIToolType_Cloud: UICloudProfileManagerFactory(m_pActionPool).prepare(m_managers[enmType], this); break;
             case UIToolType_CloudConsole: UICloudConsoleManagerFactory(m_pActionPool).prepare(m_managers[enmType], this); break;
+            case UIToolType_Logs:
+            {
+                /* Compose a list of selected machine IDs: */
+                QList<QUuid> machineIDs;
+                /* For each selected item: */
+                foreach (UIVirtualMachineItem *pItem, currentItems())
+                {
+                    /* Make sure current item is local one: */
+                    UIVirtualMachineItemLocal *pItemLocal = pItem->toLocal();
+                    if (!pItemLocal)
+                        continue;
+                    /* Append machine ID: */
+                    machineIDs << pItemLocal->id();
+                }
+                UIVMLogViewerDialogFactory(m_pActionPool, machineIDs).prepare(m_managers[enmType], this);
+                break;
+            }
             default: break;
         }
@@ -1073 +1079 @@
             case UIToolType_Cloud: UICloudProfileManagerFactory().cleanup(m_managers[enmType]); break;
             case UIToolType_CloudConsole: UICloudConsoleManagerFactory().cleanup(m_managers[enmType]); break;
+            case UIToolType_Logs: UIVMLogViewerDialogFactory().cleanup(m_managers[enmType]); break;
             default: break;
         }
@@ -2211 +2218 @@
 }
 
-void UIVirtualBoxManager::sltOpenLogViewerWindow()
-{
-    /* Get selected items: */
-    QList<UIVirtualMachineItem*> items = currentItems();
-    AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
-
-    /* First check if instance of widget opened the embedded way: */
-    if (m_pWidget->isMachineToolOpened(UIToolType_Logs))
-    {
-        m_pWidget->setToolsTypeMachine(UIToolType_Details);
-        m_pWidget->closeMachineTool(UIToolType_Logs);
-    }
-
-    QList<QUuid> machineIDs;
-
-    /* For each selected item: */
-    foreach (UIVirtualMachineItem *pItem, items)
-    {
-        /* Make sure current item is local one: */
-        UIVirtualMachineItemLocal *pItemLocal = pItem->toLocal();
-        if (!pItemLocal)
-            continue;
-
-        /* Check if log could be show for the current item: */
-        if (!isActionEnabled(UIActionIndexMN_M_Group_S_ShowLogDialog, QList<UIVirtualMachineItem*>() << pItem))
-            continue;
-        machineIDs << pItem->id();
-    }
-
-    if (machineIDs.isEmpty())
-        return;
-    if (!m_pLogViewerDialog)
-    {
-        UIVMLogViewerDialogFactory dialogFactory(actionPool(), machineIDs);
-        dialogFactory.prepare(m_pLogViewerDialog, this);
-        if (m_pLogViewerDialog)
-            connect(m_pLogViewerDialog, &QIManagerDialog::sigClose,
-                    this, &UIVirtualBoxManager::sltCloseLogViewerWindow);
-    }
-    AssertPtrReturnVoid(m_pLogViewerDialog);
-    m_pLogViewerDialog->show();
-    m_pLogViewerDialog->setWindowState(m_pLogViewerDialog->windowState() & ~Qt::WindowMinimized);
-    m_pLogViewerDialog->activateWindow();
-}
-
-void UIVirtualBoxManager::sltCloseLogViewerWindow()
-{
-    if (!m_pLogViewerDialog)
-        return;
-
-    QIManagerDialog* pDialog = m_pLogViewerDialog;
-    m_pLogViewerDialog = 0;
-    pDialog->close();
-    UIVMLogViewerDialogFactory().cleanup(pDialog);
-}
-
 void UIVirtualBoxManager::sltPerformRefreshMachine()
 {
@@ -2568 +2519 @@
     connect(actionPool()->action(UIActionIndexMN_M_Group_S_Discard), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDiscardMachineState);
-    connect(actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltOpenLogViewerWindow);
     connect(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformRefreshMachine);
@@ -2612 +2561 @@
     connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDiscardMachineState);
-    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltOpenLogViewerWindow);
     connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformRefreshMachine);
@@ -3140 +3087 @@
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog));
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
         pMenu->addSeparator();
@@ -3206 +3152 @@
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
-        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog));
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenu->addSeparator();
@@ -3499 +3444 @@
     actionPool()->action(UIActionIndexMN_M_Group_S_Detach)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Detach, items));
     actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Discard, items));
-    actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_ShowLogDialog, items));
     actionPool()->action(UIActionIndexMN_M_Group_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Refresh, items));
     actionPool()->action(UIActionIndexMN_M_Group_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_ShowInFileManager, items));
@@ -3519 +3463 @@
     actionPool()->action(UIActionIndexMN_M_Machine_S_Detach)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Detach, items));
     actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Discard, items));
-    actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_ShowLogDialog, items));
     actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Refresh, items));
     actionPool()->action(UIActionIndexMN_M_Machine_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_ShowInFileManager, items));
@@ -3769 +3712 @@
                      m_pWidget->isCurrentStateItemSelected());
         }
-        case UIActionIndexMN_M_Group_S_ShowLogDialog:
-        case UIActionIndexMN_M_Machine_S_ShowLogDialog:
-        {
-            return isItemsLocal(items) &&
-                   isAtLeastOneItemAccessible(items);
-        }
         case UIActionIndexMN_M_Group_T_Pause:
         case UIActionIndexMN_M_Machine_T_Pause:

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

@@ -319 +319 @@
         /** Handles call to show machine tool corresponding to passed @a pAction. */
         void sltPerformShowMachineTool(QAction *pAction);
-
-        /** Handles call to open machine Log Viewer window. */
-        void sltOpenLogViewerWindow();
-        /** Handles call to close machine Log Viewer window. */
-        void sltCloseLogViewerWindow();
 
         /** Handles call to refresh machine. */
@@ -526 +521 @@
     QMap<WizardType, UINativeWizard*>  m_wizards;
 
-    /** Holds the instance of UIVMLogViewerDialog. */
-    QIManagerDialog *m_pLogViewerDialog;
-
     /** Holds the central-widget instance. */
     UIVirtualBoxManagerWidget *m_pWidget;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1487 +1487 @@
         pMenuGroup->addSeparator();
         pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog));
         pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
         pMenuGroup->addSeparator();
@@ -1515 +1514 @@
         pMenuMachine->addSeparator();
         pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog));
         pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenuMachine->addSeparator();