Changeset 66910 in vbox for trunk/src/VBox

Timestamp:

May 16, 2017 2:08:48 PM (8 years ago)

Author:

vboxsync

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

115435

Message:

FE/Qt: bugref:8847: Host Network Manager: Had to adjust macOS layout a bit for one of radio buttons (to make it similar to another). Strange thing actually, layout visually had 1px border.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork

Files:

• UIHostNetworkDetailsDialog.cpp (modified) (3 diffs)
• UIHostNetworkDetailsDialog.h (modified) (1 diff)

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

@@ -46 +46 @@
     , m_pTabWidget(0)
     , m_pButtonAutomatic(0), m_pErrorPaneAutomatic(0)
-    , m_pButtonManual(0)
+    , m_pButtonManual(0), m_pErrorPaneManual(0)
     , m_pLabelIPv4(0), m_pEditorIPv4(0), m_pErrorPaneIPv4(0)
     , m_pLabelNMv4(0), m_pEditorNMv4(0), m_pErrorPaneNMv4(0)
@@ -283 +283 @@
             }
 
-            /* Create manual interface configuration radio-button: */
-            m_pButtonManual = new QRadioButton;
-            AssertPtrReturnVoid(m_pButtonManual);
-            {
-                /* Configure radio-button: */
-                connect(m_pButtonManual, &QRadioButton::toggled,
-                        this, &UIHostNetworkDetailsDialog::sltToggledButtonManual);
-                /* Add into layout: */
-                pLayoutInterface->addWidget(m_pButtonManual, 1, 0, 1, 3);
+            /* Create manual interface configuration layout: */
+            QHBoxLayout *pLayoutManual = new QHBoxLayout;
+            AssertPtrReturnVoid(pLayoutManual);
+            {
+                /* Configure layout: */
+                pLayoutManual->setContentsMargins(0, 0, 0, 0);
+                /* Create manual interface configuration radio-button: */
+                m_pButtonManual = new QRadioButton;
+                AssertPtrReturnVoid(m_pButtonManual);
+                {
+                    /* Configure radio-button: */
+                    connect(m_pButtonManual, &QRadioButton::toggled,
+                            this, &UIHostNetworkDetailsDialog::sltToggledButtonManual);
+                    /* Add into layout: */
+                    pLayoutManual->addWidget(m_pButtonManual);
+                }
+                /* Create manual interface configuration error pane: */
+                m_pErrorPaneManual = new QLabel;
+                AssertPtrReturnVoid(m_pErrorPaneManual);
+                {
+                    /* Configure label: */
+                    m_pErrorPaneManual->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+                    m_pErrorPaneManual->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+                    m_pErrorPaneManual->setPixmap(UIIconPool::iconSet(":/status_error_16px.png").pixmap(QSize(16, 16)));
+                    /* Add into layout: */
+                    pLayoutManual->addWidget(m_pErrorPaneManual);
+                }
+                /* Add into layout: */
+                pLayoutInterface->addLayout(pLayoutManual, 1, 0, 1, 3);
             }
 
@@ -766 +786 @@
                             && !m_newData.m_dhcpserver.m_fEnabled;
         m_pErrorPaneAutomatic->setVisible(fError);
+    }
+    if (!pWidget || pWidget == m_pErrorPaneManual)
+    {
+        const bool fError = false;
+        m_pErrorPaneManual->setVisible(fError);
     }
     if (!pWidget || pWidget == m_pErrorPaneIPv4)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.h

@@ -264 +264 @@
         /** Holds the manual interface configuration button. */
         QRadioButton *m_pButtonManual;
+        /** Holds the manual interface configuration error pane. */
+        QLabel       *m_pErrorPaneManual;
 
         /** Holds the IPv4 address label. */