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

Timestamp:

Dec 29, 2023 3:50:33 PM (16 months ago)

Author:

vboxsync

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

160901

Message:

FE/Qt: Reworking r160898 to make dialog-button-box handling similar to other manager classes, like Cloud Profile/Console or Media/Network managers.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIPaneContainer.cpp (modified) (3 diffs)
• UIPaneContainer.h (modified) (2 diffs)

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

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QAbstractButton>
 #include <QComboBox>
 #include <QLabel>
@@ -78 +79 @@
     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);
+    /* If parent embedded into stack: */
+    if (m_enmEmbedTo == EmbedTo_Stack && m_fDetachAllowed)
+    {
+        /* Add the button-box: */
+        QWidget *pContainer = new QWidget;
+        AssertReturnVoid(pContainer);
+        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, &QIDialogButtonBox::clicked, this, &UIPaneContainer::sltHandleButtonBoxClick);
+        pSubLayout->addWidget(m_pButtonBox);
+        pLayout->addWidget(pContainer);
+    }
 }
 
@@ -101 +104 @@
     hide();
     emit sigHidden();
+}
+
+void UIPaneContainer::sltHandleButtonBoxClick(QAbstractButton *pButton)
+{
+    /* Make sure button-box exists: */
+    AssertPtrReturnVoid(m_pButtonBox);
+
+    /* Disable buttons first of all: */
+    m_pButtonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
+
+    /* Compare with known buttons: */
+    if (pButton == m_pButtonBox->button(QDialogButtonBox::Cancel))
+        emit sigDetach();
 }
 

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

@@ -41 +41 @@
 
 /* Forward declarations: */
+class QAbstractButton;
 class QHBoxLayout;
 class QIDialogButtonBox;
@@ -72 +73 @@
     void sltHide();
 
+    void sltHandleButtonBoxClick(QAbstractButton *pButton);
+
 private: