Changeset 102726 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 29, 2023 2:13:40 PM (15 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160898

Message:

FE/Qt: bugref:10496: Provide UIPaneContainer with embedding type; This is useful to distinguish between window and tool modes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerPanel.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerPanel.h (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)
• widgets/UIPaneContainer.cpp (modified) (3 diffs)
• widgets/UIPaneContainer.h (modified) (3 diffs)

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

@@ -45 +45 @@
 #endif
 
-UIVMLogViewerPaneContainer::UIVMLogViewerPaneContainer(QWidget *pParent, UIVMLogViewerWidget *pViewer)
-    : UIPaneContainer(pParent)
+UIVMLogViewerPaneContainer::UIVMLogViewerPaneContainer(QWidget *pParent,
+                                                       UIVMLogViewerWidget *pViewer,
+                                                       EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
+    : UIPaneContainer(pParent, enmEmbedTo)
     , m_pViewer(pViewer)
     , m_pSearchWidget(0)

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

@@ -69 +69 @@
 public:
 
-    UIVMLogViewerPaneContainer(QWidget *pParent, UIVMLogViewerWidget *pViewer);
+    UIVMLogViewerPaneContainer(QWidget *pParent,
+                               UIVMLogViewerWidget *pViewer,
+                               EmbedTo enmEmbedTo = EmbedTo_Stack);
 
     /** @name Search page pass through functions

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

@@ -763 +763 @@
     connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltCurrentTabChanged);
 
-    m_pPanel = new UIVMLogViewerPaneContainer(0, this);
+    m_pPanel = new UIVMLogViewerPaneContainer(0, this, m_enmEmbedding);
     AssertReturnVoid(m_pPanel);
     installEventFilter(m_pPanel);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPaneContainer.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QComboBox>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QPlainTextEdit>
 #include <QTextCursor>
 #include <QToolButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -44 +44 @@
 #include <iprt/assert.h>
 
-UIPaneContainer::UIPaneContainer(QWidget *pParent /* = 0 */)
+UIPaneContainer::UIPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_enmEmbedTo(enmEmbedTo)
     , m_pTabWidget(0)
 {
@@ -58 +59 @@
 void UIPaneContainer::prepare()
 {
-    QHBoxLayout *pLayout = new QHBoxLayout(this);
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
     AssertReturnVoid(pLayout);
     pLayout->setContentsMargins(0, 0, 0, 0);
 
     /* Add the tab widget: */
-    m_pTabWidget = new QTabWidget();
+    m_pTabWidget = new QTabWidget;
+    AssertReturnVoid(m_pTabWidget);
     connect(m_pTabWidget, &QTabWidget::currentChanged, this, &UIPaneContainer::sigCurrentTabChanged);
-    AssertReturnVoid(m_pTabWidget);
     pLayout->addWidget(m_pTabWidget);
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPaneContainer.h

@@ -35 +35 @@
 #include <QWidget>
 #include <QKeySequence>
+
 /* GUI includes: */
+#include "QIManagerDialog.h"
 #include "QIWithRetranslateUI.h"
 
@@ -53 +55 @@
 public:
 
-    UIPaneContainer(QWidget *pParent = 0);
+    UIPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo = EmbedTo_Stack);
     void setCurrentIndex(int iIndex);
     int currentIndex() const;
@@ -70 +72 @@
 private:
 
-    QTabWidget    *m_pTabWidget;
+    EmbedTo  m_enmEmbedTo;
+
+    QTabWidget *m_pTabWidget;
 };