Changeset 102732 in vbox for trunk/src/VBox

Timestamp:

Dec 29, 2023 4:35:15 PM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: Extend UIVLogViewerDialog with possibility to embed it to UIVirtualBoxManager tool stack; Ofc that is related to log viewer opened from VBox Manager only, not Runtime UI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerDialog.cpp (modified) (4 diffs)
• logviewer/UIVMLogViewerDialog.h (modified) (3 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -30 +30 @@
 # include <QFontDatabase>
 #endif
+#include <QAbstractButton>
 #include <QPushButton>
 #include <QVBoxLayout>
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
@@ -102 +104 @@
     button(ButtonType_Close)->setText(UIVMLogViewerWidget::tr("Close"));
     button(ButtonType_Help)->setText(UIVMLogViewerWidget::tr("Help"));
+    button(ButtonType_Embed)->setText(UIVMLogViewerWidget::tr("Embed"));
     button(ButtonType_Close)->setStatusTip(UIVMLogViewerWidget::tr("Close dialog"));
     button(ButtonType_Help)->setStatusTip(UIVMLogViewerWidget::tr("Show dialog help"));
+    button(ButtonType_Embed)->setStatusTip(UIVMLogViewerWidget::tr("Embed to manager window"));
     button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
     button(ButtonType_Help)->setShortcut(QKeySequence::HelpContents);
     button(ButtonType_Close)->setToolTip(UIVMLogViewerWidget::tr("Close Window (%1)").arg(button(ButtonType_Close)->shortcut().toString()));
     button(ButtonType_Help)->setToolTip(UIVMLogViewerWidget::tr("Show Help (%1)").arg(button(ButtonType_Help)->shortcut().toString()));
+    button(ButtonType_Embed)->setToolTip(UIVMLogViewerWidget::tr("Embed to Manager Window"));
 }
 
@@ -167 +172 @@
 }
 
+void UIVMLogViewerDialog::configureButtonBox()
+{
+    /* General handler for the button being clicked: */
+    connect(buttonBox(), &QIDialogButtonBox::clicked,
+            this, &UIVMLogViewerDialog::sltHandleButtonBoxClick);
+
+    /* Show/Enable Embed button depending for Manager, not for Runtime: */
+    button(ButtonType_Embed)->setVisible(m_strMachineName.isEmpty());
+    button(ButtonType_Embed)->setEnabled(m_strMachineName.isEmpty());
+}
+
 void UIVMLogViewerDialog::finalize()
 {
@@ -216 +232 @@
         button(ButtonType_Close)->setShortcut(shortcut);
 }
+
+void UIVMLogViewerDialog::sltHandleButtonBoxClick(QAbstractButton *pButton)
+{
+    /* Disable all buttons first of all: */
+    button(ButtonType_Embed)->setEnabled(false);
+
+    /* Compare with known buttons: */
+    if (pButton == button(ButtonType_Embed))
+        emit sigEmbed();
+}

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h

@@ -41 +41 @@
 
 /* Forward declarations: */
+class QAbstractButton;
 class UIActionPool;
 class UIVirtualMachineItem;
@@ -103 +104 @@
         /** Configures central-widget. */
         virtual void configureCentralWidget() RT_OVERRIDE;
+        /** Configures button-box. */
+        virtual void configureButtonBox() RT_OVERRIDE;
         /** Perform final preparations. */
         virtual void finalize() RT_OVERRIDE;
@@ -123 +126 @@
     void sltSetCloseButtonShortCut(QKeySequence shortcut);
 
+    /** Handles button-box button click. */
+    void sltHandleButtonBoxClick(QAbstractButton *pButton);
+
 private:
 

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

@@ -1081 +1081 @@
     sltCloseManagerWindow(enmType);
 
-    /// @todo add tools which can be embedded ..
+    /* Open known tool finally: */
+    switch (enmType)
+    {
+        case UIToolType_Logs: m_pWidget->setToolsTypeMachine(enmType); break;
+        default: break;
+    }
 }