Changeset 67581 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 23, 2017 10:36:22 AM (8 years ago)

Author:

vboxsync

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

116336

Message:

FE/Qt: bugref:8847: Host Network Manager: Fixing dialog-button-box layout under macOS, not en easy thing..

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.cpp (modified) (1 diff)
• extensions/QIManagerDialog.h (modified) (4 diffs)
• hostnetwork/UIHostNetworkManager.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -140 +140 @@
     {
         /* Configure button-box: */
+#ifdef VBOX_WS_MAC
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Apply |  QDialogButtonBox::Close);
+#else
         m_pButtonBox->setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Save |  QDialogButtonBox::Close);
-        m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        m_pButtonBox->button(QDialogButtonBox::Reset)->hide();
-        m_pButtonBox->button(QDialogButtonBox::Save)->hide();
-        m_pButtonBox->button(QDialogButtonBox::Reset)->setEnabled(false);
-        m_pButtonBox->button(QDialogButtonBox::Save)->setEnabled(false);
+#endif
+        m_buttons[ButtonType_Reset] = m_pButtonBox->button(QDialogButtonBox::Reset);
+#ifdef VBOX_WS_MAC
+        m_buttons[ButtonType_Apply] = m_pButtonBox->button(QDialogButtonBox::Apply);
+#else
+        m_buttons[ButtonType_Apply] = m_pButtonBox->button(QDialogButtonBox::Save);
+#endif
+        m_buttons[ButtonType_Close] = m_pButtonBox->button(QDialogButtonBox::Close);
+        /* Assign shortcuts: */
+        button(ButtonType_Close)->setShortcut(Qt::Key_Escape);
+        /* Hide 'Reset' and 'Apply' initially: */
+        button(ButtonType_Reset)->hide();
+        button(ButtonType_Apply)->hide();
+        /* Disable 'Reset' and 'Apply' initially: */
+        button(ButtonType_Reset)->setEnabled(false);
+        button(ButtonType_Apply)->setEnabled(false);
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &QIManagerDialog::sigClose);
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -21 +21 @@
 /* Qt includes: */
 #include <QMainWindow>
+#include <QMap>
+
+/* Other VBox includes: */
+#include <iprt/cdefs.h>
 
 /* Forward declarations: */
+class QPushButton;
 class QIDialogButtonBox;
 class QIManagerDialog;
@@ -35 +40 @@
     EmbedTo_Dialog,
     EmbedTo_Stack
+};
+
+
+/** Dialog button types. */
+enum ButtonType
+{
+    ButtonType_Invalid = 0,
+    ButtonType_Reset   = RT_BIT(0),
+    ButtonType_Apply   = RT_BIT(1),
+    ButtonType_Close   = RT_BIT(2),
 };
 
@@ -133 +148 @@
         /** Returns the button-box instance. */
         QIDialogButtonBox *buttonBox() { return m_pButtonBox; }
+        /** Returns button of passed @a enmType. */
+        QPushButton *button(ButtonType enmType) { return m_buttons.value(enmType); }
     /** @} */
 
@@ -166 +183 @@
         /** Holds the dialog button-box instance. */
         QIDialogButtonBox *m_pButtonBox;
+
+        /** Holds the button-box button references. */
+        QMap<ButtonType, QPushButton*> m_buttons;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -1022 +1022 @@
 {
     /* Disable buttons first of all: */
-    buttonBox()->button(QDialogButtonBox::Reset)->setEnabled(false);
-    buttonBox()->button(QDialogButtonBox::Save)->setEnabled(false);
+    button(ButtonType_Reset)->setEnabled(false);
+    button(ButtonType_Apply)->setEnabled(false);
 
     /* Compare with known buttons: */
-    if (pButton == buttonBox()->button(QDialogButtonBox::Reset))
+    if (pButton == button(ButtonType_Reset))
         emit sigDataChangeRejected();
 
     else
 
-    if (pButton == buttonBox()->button(QDialogButtonBox::Save))
+    if (pButton == button(ButtonType_Apply))
         emit sigDataChangeAccepted();
 }
@@ -1041 +1041 @@
 
     /* Translate buttons: */
-    buttonBox()->button(QDialogButtonBox::Reset)->setText(tr("Reset"));
-    buttonBox()->button(QDialogButtonBox::Save)->setText(tr("Apply"));
-    buttonBox()->button(QDialogButtonBox::Close)->setText(tr("Close"));
-    buttonBox()->button(QDialogButtonBox::Reset)->setStatusTip(tr("Reset changes in current host network details"));
-    buttonBox()->button(QDialogButtonBox::Save)->setStatusTip(tr("Apply changes in current host network details"));
-    buttonBox()->button(QDialogButtonBox::Close)->setStatusTip(tr("Close dialog without saving"));
-    buttonBox()->button(QDialogButtonBox::Reset)->setShortcut(QString("Ctrl+Backspace"));
-    buttonBox()->button(QDialogButtonBox::Save)->setShortcut(QString("Ctrl+Return"));
-    //buttonBox()->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape); /* done in base-class */
-    buttonBox()->button(QDialogButtonBox::Reset)->
-        setToolTip(tr("Reset Changes (%1)").arg(buttonBox()->button(QDialogButtonBox::Reset)->shortcut().toString()));
-    buttonBox()->button(QDialogButtonBox::Save)->
-        setToolTip(tr("Apply Changes (%1)").arg(buttonBox()->button(QDialogButtonBox::Save)->shortcut().toString()));
-    buttonBox()->button(QDialogButtonBox::Close)->
-        setToolTip(tr("Close Window (%1)").arg(buttonBox()->button(QDialogButtonBox::Close)->shortcut().toString()));
+    button(ButtonType_Reset)->setText(tr("Reset"));
+    button(ButtonType_Apply)->setText(tr("Apply"));
+    button(ButtonType_Close)->setText(tr("Close"));
+    button(ButtonType_Reset)->setStatusTip(tr("Reset changes in current host network details"));
+    button(ButtonType_Apply)->setStatusTip(tr("Apply changes in current host network details"));
+    button(ButtonType_Close)->setStatusTip(tr("Close dialog without saving"));
+    button(ButtonType_Reset)->setShortcut(QString("Ctrl+Backspace"));
+    button(ButtonType_Apply)->setShortcut(QString("Ctrl+Return"));
+    //button(ButtonType_Close)->setShortcut(Qt::Key_Escape); /* done in base-class */
+    button(ButtonType_Reset)->setToolTip(tr("Reset Changes (%1)").arg(button(ButtonType_Reset)->shortcut().toString()));
+    button(ButtonType_Apply)->setToolTip(tr("Apply Changes (%1)").arg(button(ButtonType_Apply)->shortcut().toString()));
+    button(ButtonType_Close)->setToolTip(tr("Close Window (%1)").arg(button(ButtonType_Close)->shortcut().toString()));
 }
 
@@ -1090 +1087 @@
     /* Configure button-box: */
     connect(widget(), &UIHostNetworkManagerWidget::sigHostNetworkDetailsVisibilityChanged,
-            buttonBox()->button(QDialogButtonBox::Save), &QPushButton::setVisible);
+            button(ButtonType_Apply), &QPushButton::setVisible);
     connect(widget(), &UIHostNetworkManagerWidget::sigHostNetworkDetailsVisibilityChanged,
-            buttonBox()->button(QDialogButtonBox::Reset), &QPushButton::setVisible);
+            button(ButtonType_Reset), &QPushButton::setVisible);
     connect(widget(), &UIHostNetworkManagerWidget::sigHostNetworkDetailsDataChanged,
-            buttonBox()->button(QDialogButtonBox::Save), &QPushButton::setEnabled);
+            button(ButtonType_Apply), &QPushButton::setEnabled);
     connect(widget(), &UIHostNetworkManagerWidget::sigHostNetworkDetailsDataChanged,
-            buttonBox()->button(QDialogButtonBox::Reset), &QPushButton::setEnabled);
+            button(ButtonType_Reset), &QPushButton::setEnabled);
     connect(buttonBox(), &QIDialogButtonBox::clicked,
             this, &UIHostNetworkManager::sltHandleButtonBoxClick);