Changeset 102727 in vbox

Timestamp:

Dec 29, 2023 2:48:26 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: Reworking r160895 to move Detach button to global UIPaneContainer interface instead of particular log viewer preferences page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerPanel.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerPanel.h (modified) (1 diff)
• logviewer/UIVMLogViewerPreferencesWidget.cpp (modified) (4 diffs)
• logviewer/UIVMLogViewerPreferencesWidget.h (modified) (3 diffs)
• widgets/UIPaneContainer.cpp (modified) (5 diffs)
• widgets/UIPaneContainer.h (modified) (3 diffs)

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

@@ -48 +48 @@
                                                        UIVMLogViewerWidget *pViewer,
                                                        EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
-    : UIPaneContainer(pParent, enmEmbedTo)
+    : UIPaneContainer(pParent, enmEmbedTo, true /* detach allowed */)
     , m_pViewer(pViewer)
     , m_pSearchWidget(0)
@@ -103 +103 @@
     connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigResetToDefaults,
             this, &UIVMLogViewerPaneContainer::sigResetToDefaults);
-    connect(m_pPreferencesWidget, &UIVMLogViewerPreferencesWidget::sigDetach,
-            this, &UIVMLogViewerPaneContainer::sigDetach);
 
     retranslateUi();

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

@@ -63 +63 @@
     void sigChangeFont(QFont font);
     void sigResetToDefaults();
-    void sigDetach();
 
     void sigShowSearchPane();

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

@@ -36 +36 @@
 
 /* GUI includes: */
-#include "QIDialogButtonBox.h"
 #include "QIToolButton.h"
 #include "UIIconPool.h"
@@ -54 +53 @@
     , m_pOpenFontDialogButton(0)
     , m_pResetToDefaultsButton(0)
-    , m_pButtonBox(0)
     , m_iDefaultFontSize(9)
 {
@@ -156 +154 @@
     pMainLayout->addLayout(pContainerLayout);
     pMainLayout->addStretch(1);
-
-    /* Create button-box: */
-    m_pButtonBox = new QIDialogButtonBox;
-    if (m_pButtonBox)
-    {
-        /* Configure button-box: */
-        m_pButtonBox->setVisible(viewer()->embeddingType() == EmbedTo_Stack);
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Close);
-        connect(m_pButtonBox->button(QIDialogButtonBox::Close), &QPushButton::pressed,
-                this, &UIVMLogViewerPreferencesWidget::sigDetach);
-
-        /* Add into layout: */
-        pMainLayout->addWidget(m_pButtonBox);
-    }
 }
 
@@ -201 +185 @@
     m_pOpenFontDialogButton->setToolTip(UIVMLogViewerWidget::tr("Open a font dialog to select font face for the logviewer"));
     m_pResetToDefaultsButton->setToolTip(UIVMLogViewerWidget::tr("Reset options to application defaults"));
-
-    if (m_pButtonBox)
-    {
-        m_pButtonBox->button(QDialogButtonBox::Close)->setText(tr("Detach"));
-        m_pButtonBox->button(QDialogButtonBox::Close)->setStatusTip(tr("Open the tool in separate window"));
-    }
 }
 

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

@@ -39 +39 @@
 class QSpinBox;
 class QLabel;
-class QIDialogButtonBox;
 class QIToolButton;
 class UIVMLogViewerWidget;
@@ -55 +54 @@
     void sigChangeFont(QFont font);
     void sigResetToDefaults();
-    void sigDetach();
 
 public:
@@ -89 +87 @@
     QIToolButton *m_pResetToDefaultsButton;
 
-    QIDialogButtonBox *m_pButtonBox;
-
     /** Default font size in points. */
     const int    m_iDefaultFontSize;

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

@@ -30 +30 @@
 #include <QLabel>
 #include <QPlainTextEdit>
+#include <QPushButton>
 #include <QTextCursor>
 #include <QToolButton>
@@ -35 +36 @@
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
 #include "UIIconPool.h"
 #include "UIPaneContainer.h"
@@ -44 +46 @@
 #include <iprt/assert.h>
 
-UIPaneContainer::UIPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo /* = EmbedTo_Stack */)
+UIPaneContainer::UIPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo /* = EmbedTo_Stack */, bool fDetachAllowed /* = false */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_enmEmbedTo(enmEmbedTo)
+    , m_fDetachAllowed(fDetachAllowed)
     , m_pTabWidget(0)
+    , m_pButtonBox(0)
 {
     prepare();
@@ -55 +59 @@
 void UIPaneContainer::retranslateUi()
 {
+    if (m_pButtonBox)
+    {
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setText(tr("Detach"));
+        m_pButtonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Open the tool in separate window"));
+    }
 }
 
@@ -68 +77 @@
     connect(m_pTabWidget, &QTabWidget::currentChanged, this, &UIPaneContainer::sigCurrentTabChanged);
     pLayout->addWidget(m_pTabWidget);
+
+    /* Add the button-box: */
+    QWidget *pContainer = new QWidget;
+    AssertReturnVoid(pContainer);
+    pContainer->setVisible(m_enmEmbedTo == EmbedTo_Stack && m_fDetachAllowed);
+    QHBoxLayout *pSubLayout = new QHBoxLayout(pContainer);
+    AssertReturnVoid(pSubLayout);
+    const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
+    const int iR = qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin);
+    const int iB = qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin);
+    pSubLayout->setContentsMargins(iL, 0, iR, iB);
+    m_pButtonBox = new QIDialogButtonBox;
+    AssertReturnVoid(m_pButtonBox);
+    m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
+    connect(m_pButtonBox->button(QIDialogButtonBox::Cancel), &QPushButton::pressed,
+            this, &UIPaneContainer::sigDetach);
+    pSubLayout->addWidget(m_pButtonBox);
+    pLayout->addWidget(pContainer);
 }
 

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

@@ -42 +42 @@
 /* Forward declarations: */
 class QHBoxLayout;
+class QIDialogButtonBox;
 
 /** QWidget extension acting as the base class for all the dialog panels like file manager, logviewer etc. */
@@ -52 +53 @@
     void sigCurrentTabChanged(int iIndex);
     void sigHidden();
+    void sigDetach();
 
 public:
 
-    UIPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo = EmbedTo_Stack);
+    UIPaneContainer(QWidget *pParent, EmbedTo enmEmbedTo = EmbedTo_Stack, bool fDetachAllowed = false);
     void setCurrentIndex(int iIndex);
     int currentIndex() const;
@@ -73 +75 @@
 
     EmbedTo  m_enmEmbedTo;
+    bool     m_fDetachAllowed;
 
     QTabWidget *m_pTabWidget;
+
+    QIDialogButtonBox *m_pButtonBox;
 };