Changeset 85808 in vbox

Timestamp:

Aug 18, 2020 8:55:42 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9812. Removing UIGlobalSettingsNetwork.ui

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• src/settings/global/UIGlobalSettingsNetwork.cpp (modified) (5 diffs)
• src/settings/global/UIGlobalSettingsNetwork.h (modified) (4 diffs)
• src/settings/global/UIGlobalSettingsNetwork.ui (deleted)
• src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -25 +25 @@
     src/settings/global/UIGlobalSettingsGeneral.ui \
     src/settings/global/UIGlobalSettingsLanguage.ui \
-    src/settings/global/UIGlobalSettingsNetwork.ui \
     src/settings/global/UIGlobalSettingsExtension.ui \
     src/settings/global/UIGlobalSettingsProxy.ui

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QMenu>
 
 /* GUI includes: */
+#include "QILabelSeparator.h"
+#include "QITreeWidget.h"
 #include "UICommon.h"
-#include "UIIconPool.h"
 #include "UIConverter.h"
 #include "UIErrorString.h"
-#include "UIMessageCenter.h"
 #include "UIGlobalSettingsNetwork.h"
 #include "UIGlobalSettingsNetworkDetailsNAT.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIToolBar.h"
 
 /* COM includes: */
@@ -215 +219 @@
     : m_pActionAddNATNetwork(0), m_pActionRemoveNATNetwork(0), m_pActionEditNATNetwork(0)
     , m_pCache(0)
+    , m_pTreeNetworkNAT(0)
+    , m_pNetworkLabel(0)
+    , m_pLayoutNAT(0)
+    , m_pToolbarNetworkNAT(0)
 {
     /* Prepare: */
@@ -340 +348 @@
 void UIGlobalSettingsNetwork::retranslateUi()
 {
-    /* Translate uic generated strings: */
-    Ui::UIGlobalSettingsNetwork::retranslateUi(this);
+    m_pNetworkLabel->setText(tr("&NAT Networks"));
+    m_pTreeNetworkNAT->setWhatsThis(tr("Lists all available NAT networks."));
 
     /* Translate tree-widget columns: */
@@ -478 +486 @@
 void UIGlobalSettingsNetwork::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UIGlobalSettingsNetwork::setupUi(this);
+    prepareWidgets();
 
     /* Prepare cache: */
@@ -498 +505 @@
     /* Apply language settings: */
     retranslateUi();
+}
+
+void UIGlobalSettingsNetwork::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UIGlobalSettingsNetwork"));
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    pMainLayout->setContentsMargins(0, 0, 0, 0);
+    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
+    m_pNetworkLabel = new QILabelSeparator();
+    m_pNetworkLabel->setObjectName(QStringLiteral("m_pNetworkLabel"));
+    pMainLayout->addWidget(m_pNetworkLabel);
+
+    m_pLayoutNAT = new QHBoxLayout();
+    m_pLayoutNAT->setSpacing(3);
+    m_pLayoutNAT->setObjectName(QStringLiteral("m_pLayoutNAT"));
+    m_pTreeNetworkNAT = new QITreeWidget();
+    m_pTreeNetworkNAT->setObjectName(QStringLiteral("m_pTreeNetworkNAT"));
+    QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pTreeNetworkNAT->sizePolicy().hasHeightForWidth());
+    m_pTreeNetworkNAT->setSizePolicy(sizePolicy);
+    m_pTreeNetworkNAT->setMinimumSize(QSize(0, 150));
+    m_pTreeNetworkNAT->setRootIsDecorated(false);
+    m_pLayoutNAT->addWidget(m_pTreeNetworkNAT);
+
+    m_pToolbarNetworkNAT = new UIToolBar();
+    m_pToolbarNetworkNAT->setObjectName(QStringLiteral("m_pToolbarNetworkNAT"));
+    m_pLayoutNAT->addWidget(m_pToolbarNetworkNAT);
+
+    pMainLayout->addLayout(m_pLayoutNAT);
+    m_pNetworkLabel->setBuddy(m_pTreeNetworkNAT);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

@@ -24 +24 @@
 /* GUI includes: */
 #include "UISettingsPage.h"
-#include "UIGlobalSettingsNetwork.gen.h"
 #include "UIPortForwardingTable.h"
 
 /* Forward declarations: */
+class QILabelSeparator;
+class QITreeWidget;
+class QTreeWidgetItem;
 class UIItemNetworkNAT;
+class UIToolBar;
 struct UIDataSettingsGlobalNetwork;
 struct UIDataSettingsGlobalNetworkNAT;
@@ -36 +39 @@
 
 /** Global settings: Network page. */
-class SHARED_LIBRARY_STUFF UIGlobalSettingsNetwork : public UISettingsPageGlobal,
-                                                     public Ui::UIGlobalSettingsNetwork
+class SHARED_LIBRARY_STUFF UIGlobalSettingsNetwork : public UISettingsPageGlobal
 {
     Q_OBJECT;
@@ -90 +92 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Prepares NAT network tree. */
     void prepareNATNetworkTree();
@@ -132 +136 @@
     /** Holds the page data cache instance. */
     UISettingsCacheGlobalNetwork *m_pCache;
+
+    /** @name Widgets
+     * @{ */
+       QITreeWidget *m_pTreeNetworkNAT;
+       QILabelSeparator *m_pNetworkLabel;
+       QHBoxLayout *m_pLayoutNAT;
+       UIToolBar *m_pToolbarNetworkNAT;
+    /** @} */
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp

@@ -19 +19 @@
 #include <QCheckBox>
 #include <QRegExpValidator>
+#include <QGridLayout>
 #include <QLabel>
 #include <QLineEdit>