Changeset 92731 in vbox for trunk/src/VBox

Timestamp:

Dec 3, 2021 11:24:28 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10163: UINetworkManager: Initial implementation for cloud networks tab; No subnet id stuff for now, rest is there.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/globals/UIMessageCenter.cpp (modified) (1 diff)
• src/globals/UIMessageCenter.h (modified) (1 diff)
• src/networkmanager/UIDetailsWidgetCloudNetwork.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetNATNetwork.cpp ) (10 diffs)
• src/networkmanager/UIDetailsWidgetCloudNetwork.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetNATNetwork.h ) (8 diffs)
• src/networkmanager/UINetworkManager.cpp (modified) (27 diffs)
• src/networkmanager/UINetworkManager.h (modified) (9 diffs)
• src/notificationcenter/UINotificationObjects.cpp (modified) (5 diffs)
• src/notificationcenter/UINotificationObjects.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -626 +626 @@
         src/activity/overview/UIVMActivityOverviewWidget.h \
         src/activity/overview/UIVMActivityToolWidget.h \
+        src/networkmanager/UIDetailsWidgetCloudNetwork.h \
         src/networkmanager/UIDetailsWidgetHostNetwork.h \
         src/networkmanager/UIDetailsWidgetNATNetwork.h \
@@ -1130 +1131 @@
         src/activity/overview/UIVMActivityOverviewWidget.cpp \
         src/activity/overview/UIVMActivityToolWidget.cpp \
+        src/networkmanager/UIDetailsWidgetCloudNetwork.cpp \
         src/networkmanager/UIDetailsWidgetHostNetwork.cpp \
         src/networkmanager/UIDetailsWidgetNATNetwork.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1307 +1307 @@
 }
 
+bool UIMessageCenter::confirmCloudNetworkRemoval(const QString &strName, QWidget *pParent /* = 0*/) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>Do you want to remove the cloud network <nobr><b>%1</b>?</nobr></p>"
+                             "<p>If this network is in use by one or more virtual "
+                             "machine network adapters these adapters will no longer be "
+                             "usable until you correct their settings by either choosing "
+                             "a different network name or a different adapter attachment "
+                             "type.</p>")
+                             .arg(strName),
+                          0 /* auto-confirm id */,
+                          tr("Remove") /* ok button text */,
+                          QString() /* cancel button text */,
+                          false /* ok button by default? */);
+}
+
 bool UIMessageCenter::confirmHostOnlyInterfaceRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -356 +356 @@
     /** @name VirtualBox Manager / Network Manager warnings.
       * @{ */
+        bool confirmCloudNetworkRemoval(const QString &strName, QWidget *pParent = 0) const;
         bool confirmHostOnlyInterfaceRemoval(const QString &strName, QWidget *pParent = 0) const;
         bool confirmNATNetworkRemoval(const QString &strName, QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetCloudNetwork.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIDetailsWidgetNATNetwork class implementation.
+ * VBox Qt GUI - UIDetailsWidgetCloudNetwork class implementation.
  */
 
@@ -28 +28 @@
 
 /* GUI includes: */
+#include "QIComboBox.h"
 #include "QIDialogButtonBox.h"
 #include "QILineEdit.h"
 #include "QITabWidget.h"
 #include "UIIconPool.h"
-#include "UIDetailsWidgetNATNetwork.h"
+#include "UICloudNetworkingStuff.h"
+#include "UIDetailsWidgetCloudNetwork.h"
 #include "UIMessageCenter.h"
 #include "UINetworkManagerUtils.h"
 #include "UINotificationCenter.h"
 
-/* Other VBox includes: */
-#include "iprt/assert.h"
-#include "iprt/cidr.h"
-
-
-UIDetailsWidgetNATNetwork::UIDetailsWidgetNATNetwork(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
+
+UIDetailsWidgetCloudNetwork::UIDetailsWidgetCloudNetwork(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_enmEmbedding(enmEmbedding)
-    , m_pTabWidget(0)
     , m_pLabelNetworkName(0)
     , m_pEditorNetworkName(0)
-    , m_pGroupBoxIPv4(0)
-    , m_pLabelNetworkIPv4Prefix(0)
-    , m_pEditorNetworkIPv4Prefix(0)
-    , m_pCheckboxSupportsDHCP(0)
-    , m_pGroupBoxIPv6(0)
-    , m_pLabelNetworkIPv6Prefix(0)
-    , m_pEditorNetworkIPv6Prefix(0)
-    , m_pCheckboxAdvertiseDefaultIPv6Route(0)
+    , m_pLabelProviderName(0)
+    , m_pComboProviderName(0)
+    , m_pLabelProfileName(0)
+    , m_pComboProfileName(0)
     , m_pButtonBoxOptions(0)
-    , m_pTabWidgetForwarding(0)
-    , m_pForwardingTableIPv4(0)
-    , m_pForwardingTableIPv6(0)
-    , m_pButtonBoxForwarding(0)
-    , m_fHoldPosition(false)
 {
     prepare();
 }
 
-void UIDetailsWidgetNATNetwork::setData(const UIDataNATNetwork &data,
-                                        const QStringList &busyNames /* = QStringList() */,
-                                        bool fHoldPosition /* = false */)
+void UIDetailsWidgetCloudNetwork::setData(const UIDataCloudNetwork &data,
+                                          const QStringList &busyNames /* = QStringList() */)
 {
     /* Cache old/new data: */
@@ -74 +61 @@
     m_newData = m_oldData;
     m_busyNames = busyNames;
-    m_fHoldPosition = fHoldPosition;
-
-    /* Load 'Options' data: */
-    loadDataForOptions();
-    /* Load 'Forwarding' data: */
-    loadDataForForwarding();
-}
-
-bool UIDetailsWidgetNATNetwork::revalidate() const
+
+    /* Load data: */
+    loadData();
+}
+
+bool UIDetailsWidgetCloudNetwork::revalidate() const
 {
     /* Make sure network name isn't empty: */
@@ -100 +84 @@
     }
 
-    /* Make sure IPv4 prefix isn't empty: */
-    if (m_newData.m_strPrefixIPv4.isEmpty())
-    {
-        UINotificationMessage::warnAboutNoIPv4PrefixSpecified(m_newData.m_strName);
-        return false;
-    }
-    /* Make sure IPv6 prefix isn't empty if IPv6 is supported: */
-    if (m_newData.m_fSupportsIPv6 && m_newData.m_strPrefixIPv6.isEmpty())
-    {
-        UINotificationMessage::warnAboutNoIPv6PrefixSpecified(m_newData.m_strName);
-        return false;
-    }
-
-    /* Validate 'Forwarding' tab content: */
-    return m_pForwardingTableIPv4->validate() && m_pForwardingTableIPv6->validate();
-}
-
-void UIDetailsWidgetNATNetwork::updateButtonStates()
+    return true;
+}
+
+void UIDetailsWidgetCloudNetwork::updateButtonStates()
 {
 //    if (m_oldData != m_newData)
@@ -134 +104 @@
         m_pButtonBoxOptions->button(QDialogButtonBox::Ok)->setEnabled(m_oldData != m_newData);
     }
-    if (m_pButtonBoxForwarding)
-    {
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->setEnabled(m_oldData != m_newData);
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->setEnabled(m_oldData != m_newData);
-    }
 
     /* Notify listeners as well: */
@@ -144 +109 @@
 }
 
-void UIDetailsWidgetNATNetwork::retranslateUi()
-{
-    /* Translate tab-widget: */
-    if (m_pTabWidget)
-    {
-        m_pTabWidget->setTabText(0, tr("&General Options"));
-        m_pTabWidget->setTabText(1, tr("&Port Forwarding"));
-    }
-
+void UIDetailsWidgetCloudNetwork::retranslateUi()
+{
     if (m_pLabelNetworkName)
         m_pLabelNetworkName->setText(tr("N&ame:"));
     if (m_pEditorNetworkName)
         m_pEditorNetworkName->setToolTip(tr("Holds the name for this network."));
-    if (m_pLabelNetworkIPv4Prefix)
-        m_pLabelNetworkIPv4Prefix->setText(tr("Pref&ix:"));
-    if (m_pEditorNetworkIPv4Prefix)
-        m_pEditorNetworkIPv4Prefix->setToolTip(tr("Holds the IPv4 prefix for this network."));
-    if (m_pLabelNetworkIPv6Prefix)
-        m_pLabelNetworkIPv6Prefix->setText(tr("Prefi&x:"));
-    if (m_pEditorNetworkIPv6Prefix)
-        m_pEditorNetworkIPv6Prefix->setToolTip(tr("Holds the IPv6 prefix for this network."));
-    if (m_pCheckboxSupportsDHCP)
-    {
-        m_pCheckboxSupportsDHCP->setText(tr("Enable &DHCP"));
-        m_pCheckboxSupportsDHCP->setToolTip(tr("When checked, this network will support DHCP."));
-    }
-    if (m_pGroupBoxIPv4)
-        m_pGroupBoxIPv4->setTitle(tr("IPv&4"));
-    if (m_pGroupBoxIPv6)
-    {
-        m_pGroupBoxIPv6->setTitle(tr("IPv&6"));
-        m_pGroupBoxIPv6->setToolTip(tr("When checked, this network will support IPv6."));
-    }
-    if (m_pCheckboxAdvertiseDefaultIPv6Route)
-    {
-        m_pCheckboxAdvertiseDefaultIPv6Route->setText(tr("Advertise Default IPv6 &Route"));
-        m_pCheckboxAdvertiseDefaultIPv6Route->setToolTip(tr("When checked, this network will be advertised as the default IPv6 route."));
-    }
+    if (m_pLabelProviderName)
+        m_pLabelProviderName->setText(tr("&Provider:"));
+    if (m_pComboProviderName)
+    {
+        m_pComboProviderName->setToolTip(tr("Holds the cloud provider for this network."));
+        m_pComboProviderName->setItemText(0, "--");
+    }
+    if (m_pLabelProfileName)
+        m_pLabelProfileName->setText(tr("P&rofile:"));
+    if (m_pComboProfileName)
+        m_pComboProfileName->setToolTip(tr("Holds the cloud profile for this network."));
     if (m_pButtonBoxOptions)
     {
@@ -195 +139 @@
             setToolTip(tr("Apply Changes (%1)").arg(m_pButtonBoxOptions->button(QDialogButtonBox::Ok)->shortcut().toString()));
     }
-
-    /* Translate 'Forwarding' tab content: */
-    if (m_pTabWidgetForwarding)
-    {
-        m_pTabWidgetForwarding->setTabText(0, tr("IPv&4"));
-        m_pTabWidgetForwarding->setTabText(1, tr("IPv&6"));
-    }
-    if (m_pButtonBoxForwarding)
-    {
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->setText(tr("Reset"));
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->setText(tr("Apply"));
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->setShortcut(QString("Ctrl+Return"));
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Reset changes in current interface details"));
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->setStatusTip(tr("Apply changes in current interface details"));
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->
-            setToolTip(tr("Reset Changes (%1)").arg(m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->shortcut().toString()));
-        m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->
-            setToolTip(tr("Apply Changes (%1)").arg(m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->shortcut().toString()));
-    }
-
-    // WORKAROUND:
-    // Adjust name layout indent:
-    int iLeft, iTop, iRight, iBottom;
-    // We assume that IPv4 group-box has the same margin as IPv6 one:
-    m_pGroupBoxIPv4->layout()->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
-    // We assume that IPv4 label has the same text as IPv6 one:
-    QFontMetrics fm(m_pLabelNetworkIPv4Prefix->font());
-    const int iIndent = iLeft + 1 /* group-box frame width */
-                      + fm.width(m_pLabelNetworkIPv4Prefix->text().remove('&'));
-    m_pLayoutName->setColumnMinimumWidth(0, iIndent);
-}
-
-void UIDetailsWidgetNATNetwork::sltNetworkNameChanged(const QString &strText)
+}
+
+void UIDetailsWidgetCloudNetwork::sltNetworkNameChanged(const QString &strText)
 {
     m_newData.m_strName = strText;
@@ -234 +147 @@
 }
 
-void UIDetailsWidgetNATNetwork::sltNetworkIPv4PrefixChanged(const QString &strText)
-{
-    m_newData.m_strPrefixIPv4 = strText;
+void UIDetailsWidgetCloudNetwork::sltCloudProviderNameChanged(int iIndex)
+{
+    /* Store provider: */
+    m_newData.m_strProvider = m_pComboProviderName->itemData(iIndex).toString();
+
+    /* Update profiles: */
+    prepareProfiles();
+    /* And store selected profile: */
+    sltCloudProfileNameChanged(m_pComboProfileName->currentIndex());
+
+    /* Update button states finally: */
     updateButtonStates();
 }
 
-void UIDetailsWidgetNATNetwork::sltNetworkIPv6PrefixChanged(const QString &strText)
-{
-    m_newData.m_strPrefixIPv6 = strText;
+void UIDetailsWidgetCloudNetwork::sltCloudProfileNameChanged(int iIndex)
+{
+    /* Store profile: */
+    m_newData.m_strProfile = m_pComboProfileName->itemData(iIndex).toString();
+
+    /* Update button states finally: */
     updateButtonStates();
 }
 
-void UIDetailsWidgetNATNetwork::sltSupportsDHCPChanged(bool fChecked)
-{
-    m_newData.m_fSupportsDHCP = fChecked;
-    updateButtonStates();
-}
-
-void UIDetailsWidgetNATNetwork::sltSupportsIPv6Changed(bool fChecked)
-{
-    m_newData.m_fSupportsIPv6 = fChecked;
-    loadDataForOptions();
-    updateButtonStates();
-}
-
-void UIDetailsWidgetNATNetwork::sltAdvertiseDefaultIPv6RouteChanged(bool fChecked)
-{
-    m_newData.m_fAdvertiseDefaultIPv6Route = fChecked;
-    updateButtonStates();
-}
-
-void UIDetailsWidgetNATNetwork::sltForwardingRulesIPv4Changed()
-{
-    m_newData.m_rules4 = m_pForwardingTableIPv4->rules();
-    updateButtonStates();
-}
-
-void UIDetailsWidgetNATNetwork::sltForwardingRulesIPv6Changed()
-{
-    m_newData.m_rules6 = m_pForwardingTableIPv6->rules();
-    updateButtonStates();
-}
-
-void UIDetailsWidgetNATNetwork::sltHandleButtonBoxClick(QAbstractButton *pButton)
-{
-    /* Make sure button-boxes exist: */
-    if (!m_pButtonBoxOptions || !m_pButtonBoxForwarding)
+void UIDetailsWidgetCloudNetwork::sltHandleButtonBoxClick(QAbstractButton *pButton)
+{
+    /* Make sure button-box exist: */
+    if (!m_pButtonBoxOptions)
         return;
 
@@ -286 +179 @@
     m_pButtonBoxOptions->button(QDialogButtonBox::Cancel)->setEnabled(false);
     m_pButtonBoxOptions->button(QDialogButtonBox::Ok)->setEnabled(false);
-    m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel)->setEnabled(false);
-    m_pButtonBoxForwarding->button(QDialogButtonBox::Ok)->setEnabled(false);
 
     /* Compare with known buttons: */
-    if (   pButton == m_pButtonBoxOptions->button(QDialogButtonBox::Cancel)
-        || pButton == m_pButtonBoxForwarding->button(QDialogButtonBox::Cancel))
+    if (pButton == m_pButtonBoxOptions->button(QDialogButtonBox::Cancel))
         emit sigDataChangeRejected();
     else
-    if (   pButton == m_pButtonBoxOptions->button(QDialogButtonBox::Ok)
-        || pButton == m_pButtonBoxForwarding->button(QDialogButtonBox::Ok))
+    if (pButton == m_pButtonBoxOptions->button(QDialogButtonBox::Ok))
         emit sigDataChangeAccepted();
 }
 
-void UIDetailsWidgetNATNetwork::prepare()
-{
-    /* Prepare this: */
+void UIDetailsWidgetCloudNetwork::prepare()
+{
+    /* Prepare everything: */
     prepareThis();
+    prepareProviders();
+    prepareProfiles();
 
     /* Apply language settings: */
@@ -311 +202 @@
 }
 
-void UIDetailsWidgetNATNetwork::prepareThis()
-{
-    /* Create layout: */
-    new QVBoxLayout(this);
-    if (layout())
-    {
-        /* Configure layout: */
-        layout()->setContentsMargins(0, 0, 0, 0);
-
-        /* Prepare tab-widget: */
-        prepareTabWidget();
-    }
-}
-
-void UIDetailsWidgetNATNetwork::prepareTabWidget()
-{
-    /* Create tab-widget: */
-    m_pTabWidget = new QITabWidget(this);
-    if (m_pTabWidget)
-    {
-        /* Prepare 'Options' tab: */
-        prepareTabOptions();
-        /* Prepare 'Forwarding' tab: */
-        prepareTabForwarding();
-
-        /* Add into layout: */
-        layout()->addWidget(m_pTabWidget);
-    }
-}
-
-void UIDetailsWidgetNATNetwork::prepareTabOptions()
-{
-    /* Prepare 'Options' tab: */
-    QWidget *pTabOptions = new QWidget(m_pTabWidget);
-    if (pTabOptions)
-    {
-        /* Prepare 'Options' layout: */
-        QVBoxLayout *pLayoutOptions = new QVBoxLayout(pTabOptions);
+void UIDetailsWidgetCloudNetwork::prepareThis()
+{
+    /* Prepare main layout: */
+    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
+    if (pLayoutMain)
+    {
+#ifdef VBOX_WS_MAC
+        pLayoutMain->setSpacing(10);
+        pLayoutMain->setContentsMargins(10, 10, 10, 10);
+#endif
+
+        /* Prepare options widget layout: */
+        QGridLayout *pLayoutOptions = new QGridLayout;
         if (pLayoutOptions)
         {
-#ifdef VBOX_WS_MAC
-            pLayoutOptions->setSpacing(10);
-            pLayoutOptions->setContentsMargins(10, 10, 10, 10);
-#endif
-
-            /* Prepare name widget layout: */
-            m_pLayoutName = new QGridLayout;
-            if (m_pLayoutName)
-            {
-                /* Prepare network name label: */
-                m_pLabelNetworkName = new QLabel(pTabOptions);
+            /* Prepare network name label: */
+            m_pLabelNetworkName = new QLabel(this);
+            if (m_pLabelNetworkName)
+            {
+                m_pLabelNetworkName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                pLayoutOptions->addWidget(m_pLabelNetworkName, 0, 0);
+            }
+            /* Prepare network name editor: */
+            m_pEditorNetworkName = new QLineEdit(this);
+            if (m_pEditorNetworkName)
+            {
                 if (m_pLabelNetworkName)
-                {
-                    m_pLabelNetworkName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    m_pLayoutName->addWidget(m_pLabelNetworkName, 0, 0);
-                }
-                /* Prepare network name editor: */
-                m_pEditorNetworkName = new QLineEdit(pTabOptions);
-                if (m_pEditorNetworkName)
-                {
-                    if (m_pLabelNetworkName)
-                        m_pLabelNetworkName->setBuddy(m_pEditorNetworkName);
-                    connect(m_pEditorNetworkName, &QLineEdit::textEdited,
-                            this, &UIDetailsWidgetNATNetwork::sltNetworkNameChanged);
-
-                    m_pLayoutName->addWidget(m_pEditorNetworkName, 0, 1);
-                }
-
-                pLayoutOptions->addLayout(m_pLayoutName);
-            }
-
-            /* Prepare IPv4 group-box: */
-            m_pGroupBoxIPv4 = new QGroupBox(pTabOptions);
-            if (m_pGroupBoxIPv4)
-            {
-                /* Prepare settings widget layout: */
-                QGridLayout *pLayoutSettings = new QGridLayout(m_pGroupBoxIPv4);
-                if (pLayoutSettings)
-                {
-                    pLayoutSettings->setColumnStretch(2, 1);
-
-                    /* Prepare network IPv4 prefix label: */
-                    m_pLabelNetworkIPv4Prefix = new QLabel(pTabOptions);
-                    if (m_pLabelNetworkIPv4Prefix)
-                    {
-                        m_pLabelNetworkIPv4Prefix->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                        pLayoutSettings->addWidget(m_pLabelNetworkIPv4Prefix, 1, 0);
-                    }
-                    /* Prepare network IPv4 prefix editor: */
-                    m_pEditorNetworkIPv4Prefix = new QLineEdit(pTabOptions);
-                    if (m_pEditorNetworkIPv4Prefix)
-                    {
-                        if (m_pLabelNetworkIPv4Prefix)
-                            m_pLabelNetworkIPv4Prefix->setBuddy(m_pEditorNetworkIPv4Prefix);
-                        connect(m_pEditorNetworkIPv4Prefix, &QLineEdit::textEdited,
-                                this, &UIDetailsWidgetNATNetwork::sltNetworkIPv4PrefixChanged);
-
-                        pLayoutSettings->addWidget(m_pEditorNetworkIPv4Prefix, 1, 1, 1, 2);
-                    }
-
-                    /* Prepare 'supports DHCP' check-box: */
-                    m_pCheckboxSupportsDHCP = new QCheckBox(pTabOptions);
-                    if (m_pCheckboxSupportsDHCP)
-                    {
-                        connect(m_pCheckboxSupportsDHCP, &QCheckBox::toggled,
-                                this, &UIDetailsWidgetNATNetwork::sltSupportsDHCPChanged);
-                        pLayoutSettings->addWidget(m_pCheckboxSupportsDHCP, 2, 1);
-                    }
-                }
-
-                pLayoutOptions->addWidget(m_pGroupBoxIPv4);
-            }
-
-            /* Prepare IPv6 group-box: */
-            m_pGroupBoxIPv6 = new QGroupBox(pTabOptions);
-            if (m_pGroupBoxIPv6)
-            {
-                m_pGroupBoxIPv6->setCheckable(true);
-                connect(m_pGroupBoxIPv6, &QGroupBox::toggled,
-                        this, &UIDetailsWidgetNATNetwork::sltSupportsIPv6Changed);
-
-                /* Prepare settings widget layout: */
-                QGridLayout *pLayoutSettings = new QGridLayout(m_pGroupBoxIPv6);
-                if (pLayoutSettings)
-                {
-                    pLayoutSettings->setColumnStretch(2, 1);
-
-                    /* Prepare network IPv6 prefix label: */
-                    m_pLabelNetworkIPv6Prefix = new QLabel(pTabOptions);
-                    if (m_pLabelNetworkIPv6Prefix)
-                    {
-                        m_pLabelNetworkIPv6Prefix->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                        pLayoutSettings->addWidget(m_pLabelNetworkIPv6Prefix, 0, 0);
-                    }
-                    /* Prepare network IPv6 prefix editor: */
-                    m_pEditorNetworkIPv6Prefix = new QLineEdit(pTabOptions);
-                    if (m_pEditorNetworkIPv6Prefix)
-                    {
-                        if (m_pLabelNetworkIPv6Prefix)
-                            m_pLabelNetworkIPv6Prefix->setBuddy(m_pEditorNetworkIPv6Prefix);
-                        connect(m_pEditorNetworkIPv6Prefix, &QLineEdit::textEdited,
-                                this, &UIDetailsWidgetNATNetwork::sltNetworkIPv6PrefixChanged);
-
-                        pLayoutSettings->addWidget(m_pEditorNetworkIPv6Prefix, 0, 1, 1, 2);
-                    }
-
-                    /* Prepare 'advertise default IPv6 route' check-box: */
-                    m_pCheckboxAdvertiseDefaultIPv6Route = new QCheckBox(pTabOptions);
-                    if (m_pCheckboxAdvertiseDefaultIPv6Route)
-                    {
-                        connect(m_pCheckboxAdvertiseDefaultIPv6Route, &QCheckBox::toggled,
-                                this, &UIDetailsWidgetNATNetwork::sltAdvertiseDefaultIPv6RouteChanged);
-                        pLayoutSettings->addWidget(m_pCheckboxAdvertiseDefaultIPv6Route, 1, 1, 1, 2);
-                    }
-                }
-
-                pLayoutOptions->addWidget(m_pGroupBoxIPv6);
-            }
-
-            /* If parent embedded into stack: */
-            if (m_enmEmbedding == EmbedTo_Stack)
-            {
-                /* Prepare button-box: */
-                m_pButtonBoxOptions = new QIDialogButtonBox(pTabOptions);
-                if (m_pButtonBoxOptions)
-                {
-                    m_pButtonBoxOptions->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                    connect(m_pButtonBoxOptions, &QIDialogButtonBox::clicked, this, &UIDetailsWidgetNATNetwork::sltHandleButtonBoxClick);
-
-                    pLayoutOptions->addWidget(m_pButtonBoxOptions);
-                }
-            }
+                    m_pLabelNetworkName->setBuddy(m_pEditorNetworkName);
+                connect(m_pEditorNetworkName, &QLineEdit::textEdited,
+                        this, &UIDetailsWidgetCloudNetwork::sltNetworkNameChanged);
+
+                pLayoutOptions->addWidget(m_pEditorNetworkName, 0, 1);
+            }
+
+            /* Prepare cloud provider name label: */
+            m_pLabelProviderName = new QLabel(this);
+            if (m_pLabelProviderName)
+            {
+                m_pLabelProviderName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                pLayoutOptions->addWidget(m_pLabelProviderName, 1, 0);
+            }
+            /* Prepare cloud provider name combo: */
+            m_pComboProviderName = new QIComboBox(this);
+            if (m_pComboProviderName)
+            {
+                if (m_pLabelProviderName)
+                    m_pLabelProviderName->setBuddy(m_pComboProviderName);
+                connect(m_pComboProviderName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                        this, &UIDetailsWidgetCloudNetwork::sltCloudProviderNameChanged);
+
+                pLayoutOptions->addWidget(m_pComboProviderName, 1, 1);
+            }
+
+            /* Prepare cloud profile name label: */
+            m_pLabelProfileName = new QLabel(this);
+            if (m_pLabelProfileName)
+            {
+                m_pLabelProfileName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                pLayoutOptions->addWidget(m_pLabelProfileName, 2, 0);
+            }
+            /* Prepare cloud profile name combo: */
+            m_pComboProfileName = new QIComboBox(this);
+            if (m_pComboProfileName)
+            {
+                if (m_pLabelProfileName)
+                    m_pLabelProfileName->setBuddy(m_pComboProfileName);
+                connect(m_pComboProfileName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                        this, &UIDetailsWidgetCloudNetwork::sltCloudProfileNameChanged);
+
+                pLayoutOptions->addWidget(m_pComboProfileName, 2, 1);
+            }
+
+            pLayoutMain->addLayout(pLayoutOptions);
         }
 
-        m_pTabWidget->addTab(pTabOptions, QString());
-    }
-}
-
-void UIDetailsWidgetNATNetwork::prepareTabForwarding()
-{
-    /* Prepare 'Forwarding' tab: */
-    QWidget *pTabForwarding = new QWidget(m_pTabWidget);
-    if (pTabForwarding)
-    {
-        /* Prepare 'Forwarding' layout: */
-        QGridLayout *pLayoutForwarding = new QGridLayout(pTabForwarding);
-        if (pLayoutForwarding)
+        /* If parent embedded into stack: */
+        if (m_enmEmbedding == EmbedTo_Stack)
         {
-#ifdef VBOX_WS_MAC
-            /* Configure layout: */
-            pLayoutForwarding->setSpacing(10);
-            pLayoutForwarding->setContentsMargins(10, 10, 10, 10);
-#endif
-
-            /* Prepare forwarding tab-widget: */
-            m_pTabWidgetForwarding = new QITabWidget(pTabForwarding);
-            if (m_pTabWidgetForwarding)
-            {
-                /* Prepare IPv4 forwarding table: */
-                m_pForwardingTableIPv4 = new UIPortForwardingTable(UIPortForwardingDataList(),
-                                                                   false /* ip IPv6 protocol */,
-                                                                   false /* allow empty guest IPs */);
-                if (m_pForwardingTableIPv4)
-                {
-                    connect(m_pForwardingTableIPv4, &UIPortForwardingTable::sigDataChanged,
-                            this, &UIDetailsWidgetNATNetwork::sltForwardingRulesIPv4Changed);
-                    m_pTabWidgetForwarding->addTab(m_pForwardingTableIPv4, QString());
-                }
-                /* Prepare IPv6 forwarding table: */
-                m_pForwardingTableIPv6 = new UIPortForwardingTable(UIPortForwardingDataList(),
-                                                                   true /* ip IPv6 protocol */,
-                                                                   false /* allow empty guest IPs */);
-                if (m_pForwardingTableIPv6)
-                {
-                    connect(m_pForwardingTableIPv4, &UIPortForwardingTable::sigDataChanged,
-                            this, &UIDetailsWidgetNATNetwork::sltForwardingRulesIPv6Changed);
-                    m_pTabWidgetForwarding->addTab(m_pForwardingTableIPv6, QString());
-                }
-
-                pLayoutForwarding->addWidget(m_pTabWidgetForwarding, 0, 0);
-            }
-
-            /* If parent embedded into stack: */
-            if (m_enmEmbedding == EmbedTo_Stack)
-            {
-                /* Prepare button-box: */
-                m_pButtonBoxForwarding = new QIDialogButtonBox(pTabForwarding);
-                if (m_pButtonBoxForwarding)
-                {
-                    m_pButtonBoxForwarding->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-                    connect(m_pButtonBoxForwarding, &QIDialogButtonBox::clicked, this, &UIDetailsWidgetNATNetwork::sltHandleButtonBoxClick);
-
-                    pLayoutForwarding->addWidget(m_pButtonBoxForwarding, 1, 0);
-                }
+            /* Prepare button-box: */
+            m_pButtonBoxOptions = new QIDialogButtonBox(this);
+            if (m_pButtonBoxOptions)
+            {
+                m_pButtonBoxOptions->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+                connect(m_pButtonBoxOptions, &QIDialogButtonBox::clicked, this, &UIDetailsWidgetCloudNetwork::sltHandleButtonBoxClick);
+
+                pLayoutMain->addWidget(m_pButtonBoxOptions);
             }
         }
-
-        m_pTabWidget->addTab(pTabForwarding, QString());
-    }
-}
-
-void UIDetailsWidgetNATNetwork::loadDataForOptions()
+    }
+}
+
+void UIDetailsWidgetCloudNetwork::prepareProviders()
+{
+    /* Sanity check: */
+    AssertPtrReturnVoid(m_pComboProviderName);
+
+    /* Remember current item data to be able to restore it: */
+    QString strOldData;
+    if (m_pComboProviderName->currentIndex() != -1)
+        strOldData = m_pComboProviderName->currentData().toString();
+
+    /* Block signals while updating: */
+    m_pComboProviderName->blockSignals(true);
+
+    /* Clear combo initially: */
+    m_pComboProviderName->clear();
+
+    /* Add empty item: */
+    m_pComboProviderName->addItem(QString());
+
+    /* Iterate through existing providers: */
+    foreach (const CCloudProvider &comProvider, listCloudProviders())
+    {
+        /* Skip if we have nothing to populate (file missing?): */
+        if (comProvider.isNull())
+            continue;
+        /* Acquire provider name: */
+        QString strProviderName;
+        if (!cloudProviderName(comProvider, strProviderName))
+            continue;
+        /* Acquire provider short name: */
+        QString strProviderShortName;
+        if (!cloudProviderShortName(comProvider, strProviderShortName))
+            continue;
+
+        /* Compose empty item, fill the data: */
+        m_pComboProviderName->addItem(strProviderName);
+        m_pComboProviderName->setItemData(m_pComboProviderName->count() - 1, strProviderShortName);
+    }
+
+    /* Set previous/default item if possible: */
+    int iNewIndex = -1;
+    if (   iNewIndex == -1
+        && !strOldData.isNull())
+        iNewIndex = m_pComboProviderName->findData(strOldData);
+    if (   iNewIndex == -1
+        && m_pComboProviderName->count() > 0)
+        iNewIndex = 0;
+    if (iNewIndex != -1)
+        m_pComboProviderName->setCurrentIndex(iNewIndex);
+
+    /* Unblock signals after update: */
+    m_pComboProviderName->blockSignals(false);
+}
+
+void UIDetailsWidgetCloudNetwork::prepareProfiles()
+{
+    /* Sanity check: */
+    AssertPtrReturnVoid(m_pComboProfileName);
+
+    /* Remember current item data to be able to restore it: */
+    QString strOldData;
+    if (m_pComboProfileName->currentIndex() != -1)
+        strOldData = m_pComboProfileName->currentData().toString();
+
+    /* Block signals while updating: */
+    m_pComboProfileName->blockSignals(true);
+
+    /* Clear combo initially: */
+    m_pComboProfileName->clear();
+
+    /* Acquire provider short name: */
+    const QString strProviderShortName = m_pComboProviderName->currentData().toString();
+    if (!strProviderShortName.isEmpty())
+    {
+        /* Acquire provider: */
+        CCloudProvider comProvider = cloudProviderByShortName(strProviderShortName);
+        if (comProvider.isNotNull())
+        {
+            /* Iterate through existing profiles: */
+            foreach (const CCloudProfile &comProfile, listCloudProfiles(comProvider))
+            {
+                /* Skip if we have nothing to populate (wtf happened?): */
+                if (comProfile.isNull())
+                    continue;
+                /* Acquire current profile name: */
+                QString strProfileName;
+                if (!cloudProfileName(comProfile, strProfileName))
+                    continue;
+
+                /* Compose item, fill the data: */
+                m_pComboProfileName->addItem(strProfileName);
+                m_pComboProfileName->setItemData(m_pComboProfileName->count() - 1, strProfileName);
+            }
+
+            /* Set previous/default item if possible: */
+            int iNewIndex = -1;
+            if (   iNewIndex == -1
+                && !strOldData.isNull())
+                iNewIndex = m_pComboProfileName->findData(strOldData);
+            if (   iNewIndex == -1
+                && m_pComboProfileName->count() > 0)
+                iNewIndex = 0;
+            if (iNewIndex != -1)
+                m_pComboProfileName->setCurrentIndex(iNewIndex);
+        }
+    }
+
+    /* Unblock signals after update: */
+    m_pComboProfileName->blockSignals(false);
+}
+
+void UIDetailsWidgetCloudNetwork::loadData()
 {
     /* Check whether network exists and enabled: */
     const bool fIsNetworkExists = m_newData.m_fExists;
-    const bool fIsIPv6Supported = m_newData.m_fSupportsIPv6;
-
-    /* Update 'Options' field availability: */
+
+    /* Update field availability: */
     m_pLabelNetworkName->setEnabled(fIsNetworkExists);
     m_pEditorNetworkName->setEnabled(fIsNetworkExists);
-    m_pGroupBoxIPv4->setEnabled(fIsNetworkExists);
-    m_pLabelNetworkIPv4Prefix->setEnabled(fIsNetworkExists);
-    m_pEditorNetworkIPv4Prefix->setEnabled(fIsNetworkExists);
-    m_pCheckboxSupportsDHCP->setEnabled(fIsNetworkExists);
-    m_pGroupBoxIPv6->setEnabled(fIsNetworkExists);
-    m_pLabelNetworkIPv6Prefix->setEnabled(fIsNetworkExists && fIsIPv6Supported);
-    m_pEditorNetworkIPv6Prefix->setEnabled(fIsNetworkExists && fIsIPv6Supported);
-    m_pCheckboxAdvertiseDefaultIPv6Route->setEnabled(fIsNetworkExists && fIsIPv6Supported);
-
-    /* Load 'Options' fields: */
+    m_pLabelProviderName->setEnabled(fIsNetworkExists);
+    m_pComboProviderName->setEnabled(fIsNetworkExists);
+    m_pLabelProfileName->setEnabled(fIsNetworkExists);
+    m_pComboProfileName->setEnabled(fIsNetworkExists);
+
+    /* Load fields: */
     m_pEditorNetworkName->setText(m_newData.m_strName);
-    m_pEditorNetworkIPv4Prefix->setText(m_newData.m_strPrefixIPv4);
-    m_pCheckboxSupportsDHCP->setChecked(m_newData.m_fSupportsDHCP);
-    m_pGroupBoxIPv6->setChecked(m_newData.m_fSupportsIPv6);
-    m_pEditorNetworkIPv6Prefix->setText(m_newData.m_strPrefixIPv6);
-    m_pCheckboxAdvertiseDefaultIPv6Route->setChecked(m_newData.m_fAdvertiseDefaultIPv6Route);
-}
-
-void UIDetailsWidgetNATNetwork::loadDataForForwarding()
-{
-    /* Check whether network exists and enabled: */
-    const bool fIsNetworkExists = m_newData.m_fExists;
-
-    /* Update 'Forwarding' field availability: */
-    m_pForwardingTableIPv4->setEnabled(fIsNetworkExists);
-    m_pForwardingTableIPv6->setEnabled(fIsNetworkExists);
-
-    /* Calculate/load guest address hints: */
-    char szTmpIp[16];
-    RTNETADDRIPV4 rtNetwork4;
-    int iPrefix4;
-    const int rc = RTNetStrToIPv4Cidr(m_newData.m_strPrefixIPv4.toUtf8().constData(), &rtNetwork4, &iPrefix4);
-    RTStrPrintf(szTmpIp, sizeof(szTmpIp), "%RTnaipv4", rtNetwork4);
-    if (RT_SUCCESS(rc))
-        m_pForwardingTableIPv4->setGuestAddressHint(QString(szTmpIp));
-
-    /* Load 'Forwarding' fields: */
-    m_pForwardingTableIPv4->setRules(m_newData.m_rules4, m_fHoldPosition);
-    m_pForwardingTableIPv6->setRules(m_newData.m_rules6, m_fHoldPosition);
-    m_fHoldPosition = false;
-}
+    const int iProviderIndex = m_pComboProviderName->findData(m_newData.m_strProvider);
+    m_pComboProviderName->setCurrentIndex(iProviderIndex == -1 ? 0 : iProviderIndex);
+    const int iProfileIndex = m_pComboProfileName->findData(m_newData.m_strProfile);
+    m_pComboProfileName->setCurrentIndex(iProfileIndex == -1 ? 0 : iProfileIndex);
+}

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UIDetailsWidgetCloudNetwork.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIDetailsWidgetNATNetwork class declaration.
+ * VBox Qt GUI - UIDetailsWidgetCloudNetwork class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetNATNetwork_h
-#define FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetNATNetwork_h
+#ifndef FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetCloudNetwork_h
+#define FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetCloudNetwork_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -38 +38 @@
 class QLineEdit;
 class QRadioButton;
+class QIComboBox;
 class QIDialogButtonBox;
 class QILineEdit;
@@ -43 +44 @@
 
 
-/** Network Manager: NAT network data structure. */
-struct UIDataNATNetwork
+/** Network Manager: Cloud network data structure. */
+struct UIDataCloudNetwork
 {
     /** Constructs data. */
-    UIDataNATNetwork()
+    UIDataCloudNetwork()
         : m_fExists(false)
+        , m_fEnabled(true)
         , m_strName(QString())
-        , m_strPrefixIPv4(QString())
-        , m_strPrefixIPv6(QString())
-        , m_fSupportsDHCP(false)
-        , m_fSupportsIPv6(false)
-        , m_fAdvertiseDefaultIPv6Route(false)
+        , m_strProvider(QString())
+        , m_strProfile(QString())
     {}
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool equal(const UIDataNATNetwork &other) const
+    bool equal(const UIDataCloudNetwork &other) const
     {
         return true
                && (m_fExists == other.m_fExists)
+               && (m_fEnabled == other.m_fEnabled)
                && (m_strName == other.m_strName)
-               && (m_strPrefixIPv4 == other.m_strPrefixIPv4)
-               && (m_strPrefixIPv6 == other.m_strPrefixIPv6)
-               && (m_fSupportsDHCP == other.m_fSupportsDHCP)
-               && (m_fSupportsIPv6 == other.m_fSupportsIPv6)
-               && (m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route)
-               && (m_rules4 == other.m_rules4)
-               && (m_rules6 == other.m_rules6)
+               && (m_strProvider == other.m_strProvider)
+               && (m_strProfile == other.m_strProfile)
                ;
     }
 
     /** Returns whether the @a other passed data is equal to this one. */
-    bool operator==(const UIDataNATNetwork &other) const { return equal(other); }
+    bool operator==(const UIDataCloudNetwork &other) const { return equal(other); }
     /** Returns whether the @a other passed data is different from this one. */
-    bool operator!=(const UIDataNATNetwork &other) const { return !equal(other); }
+    bool operator!=(const UIDataCloudNetwork &other) const { return !equal(other); }
 
     /** Holds whether this network is not NULL. */
-    bool                      m_fExists;
+    bool     m_fExists;
+    /** Holds whether network is enabled. */
+    bool     m_fEnabled;
     /** Holds network name. */
-    QString                   m_strName;
-    /** Holds network IPv4 prefix. */
-    QString                   m_strPrefixIPv4;
-    /** Holds network IPv6 prefix. */
-    QString                   m_strPrefixIPv6;
-    /** Holds whether this network supports DHCP. */
-    bool                      m_fSupportsDHCP;
-    /** Holds whether this network supports IPv6. */
-    bool                      m_fSupportsIPv6;
-    /** Holds whether this network advertised as default IPv6 route. */
-    bool                      m_fAdvertiseDefaultIPv6Route;
-    /** Holds IPv4 port forwarding rules. */
-    UIPortForwardingDataList  m_rules4;
-    /** Holds IPv6 port forwarding rules. */
-    UIPortForwardingDataList  m_rules6;
+    QString  m_strName;
+    /** Holds cloud provider name. */
+    QString  m_strProvider;
+    /** Holds cloud profile name. */
+    QString  m_strProfile;
 };
 
 
-/** Network Manager: NAT network details-widget. */
-class UIDetailsWidgetNATNetwork : public QIWithRetranslateUI<QWidget>
+/** Network Manager: Cloud network details-widget. */
+class UIDetailsWidgetCloudNetwork : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -118 +105 @@
     /** Constructs medium details dialog passing @a pParent to the base-class.
       * @param  enmEmbedding  Brings embedding type. */
-    UIDetailsWidgetNATNetwork(EmbedTo enmEmbedding, QWidget *pParent = 0);
+    UIDetailsWidgetCloudNetwork(EmbedTo enmEmbedding, QWidget *pParent = 0);
 
     /** Returns the host network data. */
-    const UIDataNATNetwork &data() const { return m_newData; }
+    const UIDataCloudNetwork &data() const { return m_newData; }
     /** Defines the host network @a data.
-      * @param  busyNames      Holds the list of names busy by other
-      *                        NAT networks.
-      * @param  fHoldPosition  Holds whether we should try to keep
-      *                        port forwarding rule position intact. */
-    void setData(const UIDataNATNetwork &data,
-                 const QStringList &busyNames = QStringList(),
-                 bool fHoldPosition = false);
+      * @param  busyNames  Holds the list of names busy by other
+      *                    Cloud networks. */
+    void setData(const UIDataCloudNetwork &data,
+                 const QStringList &busyNames = QStringList());
 
     /** @name Change handling stuff.
@@ -151 +135 @@
         /** Handles network name text change. */
         void sltNetworkNameChanged(const QString &strText);
-        /** Handles network IPv4 prefix text change. */
-        void sltNetworkIPv4PrefixChanged(const QString &strText);
-        /** Handles network IPv6 prefix text change. */
-        void sltNetworkIPv6PrefixChanged(const QString &strText);
-        /** Handles network supports DHCP choice change. */
-        void sltSupportsDHCPChanged(bool fChecked);
-        /** Handles network supports IPv6 choice change. */
-        void sltSupportsIPv6Changed(bool fChecked);
-        /** Handles network advertised as default IPv6 route choice change. */
-        void sltAdvertiseDefaultIPv6RouteChanged(bool fChecked);
-
-        /** Handles IPv4 forwarding rules table change. */
-        void sltForwardingRulesIPv4Changed();
-        /** Handles IPv6 forwarding rules table change. */
-        void sltForwardingRulesIPv6Changed();
+        /** Handles cloud provider name index change. */
+        void sltCloudProviderNameChanged(int iIndex);
+        /** Handles cloud profile name index change. */
+        void sltCloudProfileNameChanged(int iIndex);
 
         /** Handles button-box button click. */
@@ -179 +152 @@
         /** Prepares this. */
         void prepareThis();
-        /** Prepares tab-widget. */
-        void prepareTabWidget();
-        /** Prepares 'Options' tab. */
-        void prepareTabOptions();
-        /** Prepares 'Forwarding' tab. */
-        void prepareTabForwarding();
+        /** Prepares providers. */
+        void prepareProviders();
+        /** Prepares profiles. */
+        void prepareProfiles();
     /** @} */
 
     /** @name Loading stuff.
       * @{ */
-        /** Loads 'Options' data. */
-        void loadDataForOptions();
-        /** Loads 'Forwarding' data. */
-        void loadDataForForwarding();
+        /** Loads data. */
+        void loadData();
     /** @} */
 
@@ -201 +170 @@
 
         /** Holds the old data copy. */
-        UIDataNATNetwork  m_oldData;
+        UIDataCloudNetwork  m_oldData;
         /** Holds the new data copy. */
-        UIDataNATNetwork  m_newData;
-
-        /** Holds the tab-widget. */
-        QITabWidget *m_pTabWidget;
+        UIDataCloudNetwork  m_newData;
     /** @} */
 
     /** @name Network variables.
       * @{ */
-        /** Holds the name layout instance. */
-        QGridLayout       *m_pLayoutName;
         /** Holds the network name label instance. */
-        QLabel            *m_pLabelNetworkName;
+        QLabel     *m_pLabelNetworkName;
         /** Holds the network name editor instance. */
-        QLineEdit         *m_pEditorNetworkName;
-        /** Holds the IPv4 group-box instance. */
-        QGroupBox         *m_pGroupBoxIPv4;
-        /** Holds the network IPv4 prefix label instance. */
-        QLabel            *m_pLabelNetworkIPv4Prefix;
-        /** Holds the network IPv4 prefix editor instance. */
-        QLineEdit         *m_pEditorNetworkIPv4Prefix;
-        /** Holds the 'supports DHCP' check-box instance. */
-        QCheckBox         *m_pCheckboxSupportsDHCP;
-        /** Holds the IPv4 group-box instance. */
-        QGroupBox         *m_pGroupBoxIPv6;
-        /** Holds the network IPv6 prefix label instance. */
-        QLabel            *m_pLabelNetworkIPv6Prefix;
-        /** Holds the network IPv6 prefix editor instance. */
-        QLineEdit         *m_pEditorNetworkIPv6Prefix;
-        /** Holds the 'advertise default IPv6 route' check-box instance. */
-        QCheckBox         *m_pCheckboxAdvertiseDefaultIPv6Route;
+        QLineEdit  *m_pEditorNetworkName;
+        /** Holds the cloud provider name label instance. */
+        QLabel     *m_pLabelProviderName;
+        /** Holds the cloud provider name combo instance. */
+        QIComboBox *m_pComboProviderName;
+        /** Holds the cloud profile name label instance. */
+        QLabel     *m_pLabelProfileName;
+        /** Holds the cloud profile name combo instance. */
+        QIComboBox *m_pComboProfileName;
+
         /** Holds the 'Options' button-box instance. */
         QIDialogButtonBox *m_pButtonBoxOptions;
-    /** @} */
-
-    /** @name Forwarding variables.
-      * @{ */
-        /** */
-        QITabWidget           *m_pTabWidgetForwarding;
-        /** */
-        UIPortForwardingTable *m_pForwardingTableIPv4;
-        /** */
-        UIPortForwardingTable *m_pForwardingTableIPv6;
-        /** Holds the 'Forwarding' button-box instance. */
-        QIDialogButtonBox     *m_pButtonBoxForwarding;
         /** Holds the list of names busy by other
           * NAT networks. */
-        QStringList            m_busyNames;
-        /** Holds whether we should try to keep
-          * port forwarding rule position intact. */
-        bool                   m_fHoldPosition;
+        QStringList        m_busyNames;
     /** @} */
 };
 
 
-#endif /* !FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetNATNetwork_h */
-
+#endif /* !FEQT_INCLUDED_SRC_networkmanager_UIDetailsWidgetCloudNetwork_h */

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp

@@ -28 +28 @@
 #include "UIActionPoolManager.h"
 #include "UIConverter.h"
+#include "UIDetailsWidgetCloudNetwork.h"
 #include "UIDetailsWidgetHostNetwork.h"
 #include "UIDetailsWidgetNATNetwork.h"
@@ -43 +44 @@
 
 /* COM includes: */
+#include "CCloudNetwork.h"
 #include "CDHCPServer.h"
 #include "CHost.h"
@@ -57 +59 @@
     TabWidgetIndex_HostNetwork,
     TabWidgetIndex_NATNetwork,
+    TabWidgetIndex_CloudNetwork,
 };
 
@@ -82 +85 @@
 
 
+/** Cloud network tree-widget column indexes. */
+enum CloudNetworkColumn
+{
+    CloudNetworkColumn_Name,
+    CloudNetworkColumn_Provider,
+    CloudNetworkColumn_Profile,
+    CloudNetworkColumn_Max,
+};
+
+
 /** Network Manager: Host Network tree-widget item. */
 class UIItemHostNetwork : public QITreeWidgetItem, public UIDataHostNetwork
@@ -104 +117 @@
 /** Network Manager: NAT Network tree-widget item. */
 class UIItemNATNetwork : public QITreeWidgetItem, public UIDataNATNetwork
+{
+    Q_OBJECT;
+
+public:
+
+    /** Updates item fields from data. */
+    void updateFields();
+
+    /** Returns item name. */
+    QString name() const { return m_strName; }
+
+protected:
+
+    /** Returns default text. */
+    virtual QString defaultText() const /* override */;
+};
+
+
+/** Network Manager: Cloud Network tree-widget item. */
+class UIItemCloudNetwork : public QITreeWidgetItem, public UIDataCloudNetwork
 {
     Q_OBJECT;
@@ -266 +299 @@
 
 /*********************************************************************************************************************************
+*   Class UIItemCloudNetwork implementation.                                                                                     *
+*********************************************************************************************************************************/
+
+void UIItemCloudNetwork::updateFields()
+{
+    /* Compose item fields: */
+    setText(CloudNetworkColumn_Name, m_strName);
+    setText(CloudNetworkColumn_Provider, m_strProvider);
+    setText(CloudNetworkColumn_Profile, m_strProfile);
+
+    /* Compose item tool-tip: */
+    const QString strTable("<table cellspacing=5>%1</table>");
+    const QString strHeader("<tr><td><nobr>%1:&nbsp;</nobr></td><td><nobr>%2</nobr></td></tr>");
+    QString strToolTip;
+
+    /* Network information: */
+    strToolTip += strHeader.arg(tr("Network Name"), m_strName);
+    strToolTip += strHeader.arg(tr("Provider"), m_strProvider);
+    strToolTip += strHeader.arg(tr("Profile"), m_strProfile);
+
+    /* Assign tool-tip finally: */
+    setToolTip(CloudNetworkColumn_Name, strTable.arg(strToolTip));
+}
+
+QString UIItemCloudNetwork::defaultText() const
+{
+    return tr("%1, %2", "col.2 text, col.1 name").arg(text(1)).arg(parentTree()->headerItem()->text(0));
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINetworkManagerWidget implementation.                                                                                 *
 *********************************************************************************************************************************/
@@ -285 +349 @@
     , m_pTreeWidgetNATNetwork(0)
     , m_pDetailsWidgetNATNetwork(0)
+    , m_pTabCloudNetwork(0)
+    , m_pLayoutCloudNetwork(0)
+    , m_pTreeWidgetCloudNetwork(0)
+    , m_pDetailsWidgetCloudNetwork(0)
 {
     prepare();
@@ -313 +381 @@
         m_pTabWidget->setTabText(0, UINetworkManager::tr("Host-only Networks"));
         m_pTabWidget->setTabText(1, UINetworkManager::tr("NAT Networks"));
+        m_pTabWidget->setTabText(2, UINetworkManager::tr("Cloud Networks"));
     }
 
@@ -336 +405 @@
         m_pTreeWidgetNATNetwork->setHeaderLabels(fields);
     }
+
+    /* Translate cloud network tree-widget: */
+    if (m_pTreeWidgetCloudNetwork)
+    {
+        const QStringList fields = QStringList()
+                                   << UINetworkManager::tr("Name")
+                                   << UINetworkManager::tr("Provider")
+                                   << UINetworkManager::tr("Profile");
+        m_pTreeWidgetCloudNetwork->setHeaderLabels(fields);
+    }
 }
 
@@ -366 +445 @@
         case TabWidgetIndex_HostNetwork: sltHandleCurrentItemChangeHostNetwork(); break;
         case TabWidgetIndex_NATNetwork: sltHandleCurrentItemChangeNATNetwork(); break;
+        case TabWidgetIndex_CloudNetwork: sltHandleCurrentItemChangeCloudNetwork(); break;
         default: break;
     }
@@ -380 +460 @@
         case TabWidgetIndex_HostNetwork: sltApplyDetailsChangesHostNetwork(); break;
         case TabWidgetIndex_NATNetwork: sltApplyDetailsChangesNATNetwork(); break;
+        case TabWidgetIndex_CloudNetwork: sltApplyDetailsChangesCloudNetwork(); break;
         default: break;
     }
@@ -668 +749 @@
 }
 
+void UINetworkManagerWidget::sltCreateCloudNetwork()
+{
+    /* For cloud networks only: */
+    if (m_pTabWidget->currentIndex() != TabWidgetIndex_CloudNetwork)
+        return;
+
+    /* Compose a set of busy names: */
+    QSet<QString> names;
+    for (int i = 0; i < m_pTreeWidgetCloudNetwork->topLevelItemCount(); ++i)
+        names << qobject_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->childItem(i))->name();
+    /* Compose a map of busy indexes: */
+    QMap<int, bool> presence;
+    const QString strNameTemplate("CloudNetwork%1");
+    const QRegExp regExp(strNameTemplate.arg("([\\d]*)"));
+    foreach (const QString &strName, names)
+        if (regExp.indexIn(strName) != -1)
+            presence[regExp.cap(1).toInt()] = true;
+    /* Search for a minimum index: */
+    int iMinimumIndex = 0;
+    for (int i = 0; !presence.isEmpty() && i <= presence.lastKey() + 1; ++i)
+        if (!presence.contains(i))
+        {
+            iMinimumIndex = i;
+            break;
+        }
+    /* Compose resulting index and name: */
+    const QString strNetworkName = strNameTemplate.arg(iMinimumIndex == 0 ? QString() : QString::number(iMinimumIndex));
+
+    /* Compose new item data: */
+    UIDataCloudNetwork oldData;
+    oldData.m_fEnabled = true;
+    oldData.m_strName = strNetworkName;
+    oldData.m_strProvider = QString();
+    oldData.m_strProfile = QString();
+
+    /* Get VirtualBox for further activities: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
+
+    /* Create network: */
+    CCloudNetwork comNetwork = comVBox.CreateCloudNetwork(oldData.m_strName);
+    CCloudNetwork comNetworkBase = comNetwork;
+
+    /* Show error message if necessary: */
+    if (!comVBox.isOk())
+        UINotificationMessage::cannotCreateCloudNetwork(comVBox);
+    else
+    {
+        /* Save whether network enabled: */
+        if (comNetwork.isOk())
+            comNetwork.SetEnabled(oldData.m_fEnabled);
+        /* Save cloud network name: */
+        if (comNetwork.isOk())
+            comNetwork.SetNetworkName(oldData.m_strName);
+        /* Save cloud provider: */
+        if (comNetwork.isOk())
+            comNetwork.SetProvider(oldData.m_strProvider);
+        /* Save cloud profile: */
+        if (comNetwork.isOk())
+            comNetwork.SetProfile(oldData.m_strProfile);
+
+        /* Show error message if necessary: */
+        if (!comNetwork.isOk())
+            UINotificationMessage::cannotChangeCloudNetworkParameter(comNetwork);
+
+        /* Add network to the tree: */
+        UIDataCloudNetwork newData;
+        loadCloudNetwork(comNetworkBase, newData);
+        createItemForCloudNetwork(newData, true);
+
+        /* Adjust tree-widgets: */
+        sltAdjustTreeWidgets();
+    }
+}
+
+void UINetworkManagerWidget::sltRemoveCloudNetwork()
+{
+    /* For cloud networks only: */
+    if (m_pTabWidget->currentIndex() != TabWidgetIndex_CloudNetwork)
+        return;
+
+    /* Check cloud network tree-widget: */
+    AssertMsgReturnVoid(m_pTreeWidgetCloudNetwork, ("Cloud network tree-widget isn't created!\n"));
+
+    /* Get network item: */
+    UIItemCloudNetwork *pItem = static_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->currentItem());
+    AssertMsgReturnVoid(pItem, ("Current item must not be null!\n"));
+
+    /* Get network name: */
+    const QString strNetworkName(pItem->name());
+
+    /* Confirm host network removal: */
+    if (!msgCenter().confirmCloudNetworkRemoval(strNetworkName, this))
+        return;
+
+    /* Get VirtualBox for further activities: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
+
+    /* Find corresponding network: */
+    const CCloudNetwork &comNetwork = comVBox.FindCloudNetworkByName(strNetworkName);
+
+    /* Show error message if necessary: */
+    if (!comVBox.isOk() || comNetwork.isNull())
+        UINotificationMessage::cannotFindCloudNetwork(comVBox, strNetworkName);
+    else
+    {
+        /* Remove network finally: */
+        comVBox.RemoveCloudNetwork(comNetwork);
+
+        /* Show error message if necessary: */
+        if (!comVBox.isOk())
+            UINotificationMessage::cannotRemoveCloudNetwork(comVBox, strNetworkName);
+        else
+        {
+            /* Move selection to somewhere else: */
+            if (m_pTreeWidgetCloudNetwork->itemBelow(pItem))
+                m_pTreeWidgetCloudNetwork->setCurrentItem(m_pTreeWidgetCloudNetwork->itemBelow(pItem));
+            else if (m_pTreeWidgetCloudNetwork->itemAbove(pItem))
+                m_pTreeWidgetCloudNetwork->setCurrentItem(m_pTreeWidgetCloudNetwork->itemAbove(pItem));
+            else
+                m_pTreeWidgetCloudNetwork->setCurrentItem(0);
+
+            /* Remove interface from the tree: */
+            delete pItem;
+
+            /* Adjust tree-widgets: */
+            sltAdjustTreeWidgets();
+        }
+    }
+}
+
 void UINetworkManagerWidget::sltToggleDetailsVisibility(bool fVisible)
 {
@@ -679 +890 @@
             if (m_pDetailsWidgetNATNetwork)
                 m_pDetailsWidgetNATNetwork->setVisible(false);
+            if (m_pDetailsWidgetCloudNetwork)
+                m_pDetailsWidgetCloudNetwork->setVisible(false);
             if (m_pDetailsWidgetHostNetwork)
                 m_pDetailsWidgetHostNetwork->setVisible(fVisible);
@@ -687 +900 @@
             if (m_pDetailsWidgetHostNetwork)
                 m_pDetailsWidgetHostNetwork->setVisible(false);
+            if (m_pDetailsWidgetCloudNetwork)
+                m_pDetailsWidgetCloudNetwork->setVisible(false);
             if (m_pDetailsWidgetNATNetwork)
                 m_pDetailsWidgetNATNetwork->setVisible(fVisible);
             break;
         }
+        case TabWidgetIndex_CloudNetwork:
+        {
+            if (m_pDetailsWidgetHostNetwork)
+                m_pDetailsWidgetHostNetwork->setVisible(false);
+            if (m_pDetailsWidgetNATNetwork)
+                m_pDetailsWidgetNATNetwork->setVisible(false);
+            if (m_pDetailsWidgetCloudNetwork)
+                m_pDetailsWidgetCloudNetwork->setVisible(fVisible);
+            break;
+        }
     }
     /* Notify external listeners: */
@@ -709 +934 @@
             if (m_pDetailsWidgetNATNetwork)
                 m_pDetailsWidgetNATNetwork->setVisible(false);
+            if (m_pDetailsWidgetCloudNetwork)
+                m_pDetailsWidgetCloudNetwork->setVisible(false);
             if (m_pDetailsWidgetHostNetwork)
                 m_pDetailsWidgetHostNetwork->setVisible(fVisible);
@@ -717 +944 @@
             if (m_pDetailsWidgetHostNetwork)
                 m_pDetailsWidgetHostNetwork->setVisible(false);
+            if (m_pDetailsWidgetCloudNetwork)
+                m_pDetailsWidgetCloudNetwork->setVisible(false);
             if (m_pDetailsWidgetNATNetwork)
                 m_pDetailsWidgetNATNetwork->setVisible(fVisible);
+            break;
+        }
+        case TabWidgetIndex_CloudNetwork:
+        {
+            if (m_pDetailsWidgetHostNetwork)
+                m_pDetailsWidgetHostNetwork->setVisible(false);
+            if (m_pDetailsWidgetNATNetwork)
+                m_pDetailsWidgetNATNetwork->setVisible(false);
+            if (m_pDetailsWidgetCloudNetwork)
+                m_pDetailsWidgetCloudNetwork->setVisible(fVisible);
             break;
         }
@@ -774 +1013 @@
         m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_DHCP, iWidth3);
         m_pTreeWidgetNATNetwork->setColumnWidth(NATNetworkColumn_Name, iTotal - iWidth1 - iWidth2 - iWidth3);
+    }
+
+    /* Check cloud network tree-widget: */
+    if (m_pTreeWidgetCloudNetwork)
+    {
+        /* Get the tree-widget abstract interface: */
+        QAbstractItemView *pItemView = m_pTreeWidgetCloudNetwork;
+        /* Get the tree-widget header-view: */
+        QHeaderView *pItemHeader = m_pTreeWidgetCloudNetwork->header();
+
+        /* Calculate the total tree-widget width: */
+        const int iTotal = m_pTreeWidgetCloudNetwork->viewport()->width();
+        /* Look for a minimum width hints for non-important columns: */
+        const int iMinWidth1 = qMax(pItemView->sizeHintForColumn(CloudNetworkColumn_Provider), pItemHeader->sectionSizeHint(CloudNetworkColumn_Provider));
+        const int iMinWidth2 = qMax(pItemView->sizeHintForColumn(CloudNetworkColumn_Profile), pItemHeader->sectionSizeHint(CloudNetworkColumn_Profile));
+        /* Propose suitable width hints for non-important columns: */
+        const int iWidth1 = iMinWidth1 < iTotal / CloudNetworkColumn_Max ? iMinWidth1 : iTotal / CloudNetworkColumn_Max;
+        const int iWidth2 = iMinWidth2 < iTotal / CloudNetworkColumn_Max ? iMinWidth2 : iTotal / CloudNetworkColumn_Max;
+        /* Apply the proposal: */
+        m_pTreeWidgetCloudNetwork->setColumnWidth(CloudNetworkColumn_Provider, iWidth1);
+        m_pTreeWidgetCloudNetwork->setColumnWidth(CloudNetworkColumn_Profile, iWidth2);
+        m_pTreeWidgetCloudNetwork->setColumnWidth(CloudNetworkColumn_Name, iTotal - iWidth1 - iWidth2);
     }
 }
@@ -1121 +1382 @@
 }
 
+void UINetworkManagerWidget::sltHandleCurrentItemChangeCloudNetwork()
+{
+    /* Check cloud network tree-widget: */
+    AssertMsgReturnVoid(m_pTreeWidgetCloudNetwork, ("Cloud network tree-widget isn't created!\n"));
+
+    /* Get network item: */
+    UIItemCloudNetwork *pItem = static_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->currentItem());
+
+    /* Update actions availability: */
+    m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
+
+    /* Check Cloud network details-widget: */
+    AssertMsgReturnVoid(m_pDetailsWidgetCloudNetwork, ("Cloud network details-widget isn't created!\n"));
+
+    /* If there is an item => update details data: */
+    if (pItem)
+    {
+        QStringList busyNamesForItem = busyNamesCloud();
+        busyNamesForItem.removeAll(pItem->name());
+        m_pDetailsWidgetCloudNetwork->setData(*pItem, busyNamesForItem);
+    }
+    /* Otherwise => clear details: */
+    else
+        m_pDetailsWidgetCloudNetwork->setData(UIDataCloudNetwork());
+}
+
+void UINetworkManagerWidget::sltHandleContextMenuRequestCloudNetwork(const QPoint &position)
+{
+    /* Check cloud network tree-widget: */
+    AssertMsgReturnVoid(m_pTreeWidgetCloudNetwork, ("Cloud network tree-widget isn't created!\n"));
+
+    /* Compose temporary context-menu: */
+    QMenu menu;
+    if (m_pTreeWidgetCloudNetwork->itemAt(position))
+    {
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details));
+    }
+    else
+    {
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create));
+//        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh));
+    }
+    /* And show it: */
+    menu.exec(m_pTreeWidgetCloudNetwork->mapToGlobal(position));
+}
+
+void UINetworkManagerWidget::sltApplyDetailsChangesCloudNetwork()
+{
+    /* Check cloud network tree-widget: */
+    AssertMsgReturnVoid(m_pTreeWidgetCloudNetwork, ("Cloud network tree-widget isn't created!\n"));
+
+    /* Get Cloud network item: */
+    UIItemCloudNetwork *pItem = static_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->currentItem());
+    AssertMsgReturnVoid(pItem, ("Current item must not be null!\n"));
+
+    /* Check Cloud network details-widget: */
+    AssertMsgReturnVoid(m_pDetailsWidgetCloudNetwork, ("Cloud network details-widget isn't created!\n"));
+
+    /* Revalidate Cloud network details: */
+    if (m_pDetailsWidgetCloudNetwork->revalidate())
+    {
+        /* Get item data: */
+        UIDataCloudNetwork oldData = *pItem;
+        UIDataCloudNetwork newData = m_pDetailsWidgetCloudNetwork->data();
+
+        /* Get VirtualBox for further activities: */
+        CVirtualBox comVBox = uiCommon().virtualBox();
+
+        /* Find corresponding network: */
+        CCloudNetwork comNetwork = comVBox.FindCloudNetworkByName(oldData.m_strName);
+        CCloudNetwork comNetworkBase = comNetwork;
+
+        /* Show error message if necessary: */
+        if (!comVBox.isOk() || comNetwork.isNull())
+            UINotificationMessage::cannotFindCloudNetwork(comVBox, oldData.m_strName);
+        else
+        {
+            /* Save whether cloud network enabled: */
+            if (comNetwork.isOk() && newData.m_fEnabled != oldData.m_fEnabled)
+                comNetwork.SetEnabled(newData.m_fEnabled);
+            /* Save cloud network name: */
+            if (comNetwork.isOk() && newData.m_strName != oldData.m_strName)
+                comNetwork.SetNetworkName(newData.m_strName);
+            /* Save cloud provider: */
+            if (comNetwork.isOk() && newData.m_strProvider != oldData.m_strProvider)
+                comNetwork.SetProvider(newData.m_strProvider);
+            /* Save cloud profile: */
+            if (comNetwork.isOk() && newData.m_strProfile != oldData.m_strProfile)
+                comNetwork.SetProfile(newData.m_strProfile);
+
+            /* Show error message if necessary: */
+            if (!comNetwork.isOk())
+                UINotificationMessage::cannotChangeCloudNetworkParameter(comNetwork);
+
+            /* Update network in the tree: */
+            UIDataCloudNetwork data;
+            loadCloudNetwork(comNetworkBase, data);
+            updateItemForCloudNetwork(data, true, pItem);
+
+            /* Make sure current item fetched: */
+            sltHandleCurrentItemChangeCloudNetwork();
+
+            /* Adjust tree-widgets: */
+            sltAdjustTreeWidgets();
+        }
+    }
+
+    /* Make sure button states updated: */
+    m_pDetailsWidgetNATNetwork->updateButtonStates();
+}
+
 void UINetworkManagerWidget::prepare()
 {
@@ -1139 +1512 @@
     loadHostNetworks();
     loadNATNetworks();
+    loadCloudNetworks();
 }
 
@@ -1154 +1528 @@
     connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create), &QAction::triggered,
             this, &UINetworkManagerWidget::sltCreateNATNetwork);
+    connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create), &QAction::triggered,
+            this, &UINetworkManagerWidget::sltCreateCloudNetwork);
     connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove), &QAction::triggered,
             this, &UINetworkManagerWidget::sltRemoveHostNetwork);
     connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove), &QAction::triggered,
             this, &UINetworkManagerWidget::sltRemoveNATNetwork);
+    connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove), &QAction::triggered,
+            this, &UINetworkManagerWidget::sltRemoveCloudNetwork);
     connect(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details), &QAction::toggled,
             this, &UINetworkManagerWidget::sltToggleDetailsVisibility);
@@ -1186 +1564 @@
         prepareDetailsWidgetHostNetwork();
         prepareDetailsWidgetNATNetwork();
+        prepareDetailsWidgetCloudNetwork();
     }
 }
@@ -1228 +1607 @@
         prepareTabHostNetwork();
         prepareTabNATNetwork();
+        prepareTabCloudNetwork();
 
         /* Add into layout: */
@@ -1355 +1735 @@
         /* Add into layout: */
         layout()->addWidget(m_pDetailsWidgetNATNetwork);
+    }
+}
+
+void UINetworkManagerWidget::prepareTabCloudNetwork()
+{
+    /* Prepare cloud network tab: */
+    m_pTabCloudNetwork = new QWidget(m_pTabWidget);
+    if (m_pTabCloudNetwork)
+    {
+        /* Prepare cloud network layout: */
+        m_pLayoutCloudNetwork = new QVBoxLayout(m_pTabCloudNetwork);
+        if (m_pLayoutCloudNetwork)
+            prepareTreeWidgetCloudNetwork();
+
+        /* Add into tab-widget: */
+        m_pTabWidget->insertTab(TabWidgetIndex_CloudNetwork, m_pTabCloudNetwork, QString());
+    }
+}
+
+void UINetworkManagerWidget::prepareTreeWidgetCloudNetwork()
+{
+    /* Prepare cloud network tree-widget: */
+    m_pTreeWidgetCloudNetwork = new QITreeWidget(m_pTabCloudNetwork);
+    if (m_pTreeWidgetCloudNetwork)
+    {
+        m_pTreeWidgetCloudNetwork->setRootIsDecorated(false);
+        m_pTreeWidgetCloudNetwork->setAlternatingRowColors(true);
+        m_pTreeWidgetCloudNetwork->setContextMenuPolicy(Qt::CustomContextMenu);
+        m_pTreeWidgetCloudNetwork->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        m_pTreeWidgetCloudNetwork->setColumnCount(CloudNetworkColumn_Max);
+        m_pTreeWidgetCloudNetwork->setSortingEnabled(true);
+        m_pTreeWidgetCloudNetwork->sortByColumn(CloudNetworkColumn_Name, Qt::AscendingOrder);
+        m_pTreeWidgetCloudNetwork->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
+        connect(m_pTreeWidgetCloudNetwork, &QITreeWidget::currentItemChanged,
+                this, &UINetworkManagerWidget::sltHandleCurrentItemChangeCloudNetwork);
+        connect(m_pTreeWidgetCloudNetwork, &QITreeWidget::customContextMenuRequested,
+                this, &UINetworkManagerWidget::sltHandleContextMenuRequestCloudNetwork);
+        connect(m_pTreeWidgetCloudNetwork, &QITreeWidget::itemDoubleClicked,
+                m_pActionPool->action(UIActionIndexMN_M_Network_T_Details), &QAction::setChecked);
+
+        /* Add into layout: */
+        m_pLayoutCloudNetwork->addWidget(m_pTreeWidgetCloudNetwork);
+    }
+}
+
+void UINetworkManagerWidget::prepareDetailsWidgetCloudNetwork()
+{
+    /* Prepare cloud network details-widget: */
+    m_pDetailsWidgetCloudNetwork = new UIDetailsWidgetCloudNetwork(m_enmEmbedding, this);
+    if (m_pDetailsWidgetCloudNetwork)
+    {
+        m_pDetailsWidgetCloudNetwork->setVisible(false);
+        m_pDetailsWidgetCloudNetwork->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+        connect(m_pDetailsWidgetCloudNetwork, &UIDetailsWidgetCloudNetwork::sigDataChanged,
+                this, &UINetworkManagerWidget::sigDetailsDataChangedCloudNetwork);
+        connect(m_pDetailsWidgetCloudNetwork, &UIDetailsWidgetCloudNetwork::sigDataChangeRejected,
+                this, &UINetworkManagerWidget::sltHandleCurrentItemChangeCloudNetwork);
+        connect(m_pDetailsWidgetCloudNetwork, &UIDetailsWidgetCloudNetwork::sigDataChangeAccepted,
+                this, &UINetworkManagerWidget::sltApplyDetailsChangesCloudNetwork);
+
+        /* Add into layout: */
+        layout()->addWidget(m_pDetailsWidgetCloudNetwork);
     }
 }
@@ -1576 +2018 @@
 }
 
+void UINetworkManagerWidget::loadCloudNetworks()
+{
+    /* Check cloud network tree-widget: */
+    if (!m_pTreeWidgetCloudNetwork)
+        return;
+
+    /* Clear tree first of all: */
+    m_pTreeWidgetCloudNetwork->clear();
+
+    /* Get VirtualBox for further activities: */
+    const CVirtualBox comVBox = uiCommon().virtualBox();
+
+    /* Get interfaces for further activities: */
+    const QVector<CCloudNetwork> networks = comVBox.GetCloudNetworks();
+
+    /* Show error message if necessary: */
+    if (!comVBox.isOk())
+        UINotificationMessage::cannotAcquireVirtualBoxParameter(comVBox);
+    else
+    {
+        /* For each cloud network => load it to the tree: */
+        foreach (const CCloudNetwork &comNetwork, networks)
+        {
+            UIDataCloudNetwork data;
+            loadCloudNetwork(comNetwork, data);
+            createItemForCloudNetwork(data, false);
+        }
+
+        /* Choose the 1st item as current initially: */
+        m_pTreeWidgetCloudNetwork->setCurrentItem(m_pTreeWidgetCloudNetwork->topLevelItem(0));
+        sltHandleCurrentItemChangeCloudNetwork();
+
+        /* Adjust tree-widgets: */
+        sltAdjustTreeWidgets();
+    }
+}
+
+void UINetworkManagerWidget::loadCloudNetwork(const CCloudNetwork &comNetwork, UIDataCloudNetwork &data)
+{
+    /* Gather network settings: */
+    if (comNetwork.isNotNull())
+        data.m_fExists = true;
+    if (comNetwork.isNotNull())
+        data.m_fEnabled = comNetwork.GetEnabled();
+    if (comNetwork.isOk())
+        data.m_strName = comNetwork.GetNetworkName();
+    if (comNetwork.isOk())
+        data.m_strProvider = comNetwork.GetProvider();
+    if (comNetwork.isOk())
+        data.m_strProfile = comNetwork.GetProfile();
+
+    /* Show error message if necessary: */
+    if (!comNetwork.isOk())
+        UINotificationMessage::cannotAcquireCloudNetworkParameter(comNetwork);
+}
+
 void UINetworkManagerWidget::createItemForHostNetwork(const UIDataHostNetwork &data, bool fChooseItem)
 {
@@ -1639 +2137 @@
 }
 
+void UINetworkManagerWidget::createItemForCloudNetwork(const UIDataCloudNetwork &data, bool fChooseItem)
+{
+    /* Create new item: */
+    UIItemCloudNetwork *pItem = new UIItemCloudNetwork;
+    if (pItem)
+    {
+        /* Configure item: */
+        pItem->UIDataCloudNetwork::operator=(data);
+        pItem->updateFields();
+        /* Add item to the tree: */
+        m_pTreeWidgetCloudNetwork->addTopLevelItem(pItem);
+        /* And choose it as current if necessary: */
+        if (fChooseItem)
+            m_pTreeWidgetCloudNetwork->setCurrentItem(pItem);
+    }
+}
+
+void UINetworkManagerWidget::updateItemForCloudNetwork(const UIDataCloudNetwork &data, bool fChooseItem, UIItemCloudNetwork *pItem)
+{
+    /* Update passed item: */
+    if (pItem)
+    {
+        /* Configure item: */
+        pItem->UIDataCloudNetwork::operator=(data);
+        pItem->updateFields();
+        /* And choose it as current if necessary: */
+        if (fChooseItem)
+            m_pTreeWidgetCloudNetwork->setCurrentItem(pItem);
+    }
+}
+
 QStringList UINetworkManagerWidget::busyNamesNAT() const
 {
@@ -1645 +2174 @@
     {
         UIItemNATNetwork *pItem = qobject_cast<UIItemNATNetwork*>(m_pTreeWidgetNATNetwork->childItem(i));
+        const QString strItemName(pItem->name());
+        if (!strItemName.isEmpty() && !names.contains(strItemName))
+            names << strItemName;
+    }
+    return names;
+}
+
+QStringList UINetworkManagerWidget::busyNamesCloud() const
+{
+    QStringList names;
+    for (int i = 0; i < m_pTreeWidgetCloudNetwork->topLevelItemCount(); ++i)
+    {
+        UIItemCloudNetwork *pItem = qobject_cast<UIItemCloudNetwork*>(m_pTreeWidgetCloudNetwork->childItem(i));
         const QString strItemName(pItem->name());
         if (!strItemName.isEmpty() && !names.contains(strItemName))
@@ -1758 +2300 @@
     connect(widget(), &UINetworkManagerWidget::sigDetailsDataChangedNATNetwork,
             button(ButtonType_Reset), &QPushButton::setEnabled);
+    connect(widget(), &UINetworkManagerWidget::sigDetailsDataChangedCloudNetwork,
+            button(ButtonType_Apply), &QPushButton::setEnabled);
+    connect(widget(), &UINetworkManagerWidget::sigDetailsDataChangedCloudNetwork,
+            button(ButtonType_Reset), &QPushButton::setEnabled);
     connect(buttonBox(), &QIDialogButtonBox::clicked,
             this, &UINetworkManager::sltHandleButtonBoxClick);

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.h

@@ -30 +30 @@
 
 /* Forward declarations: */
+class CCloudNetwork;
 class CHostNetworkInterface;
 class CNATNetwork;
@@ -39 +40 @@
 class QITreeWidget;
 class UIActionPool;
+class UIDetailsWidgetCloudNetwork;
 class UIDetailsWidgetHostNetwork;
 class UIDetailsWidgetNATNetwork;
+class UIItemCloudNetwork;
 class UIItemHostNetwork;
 class UIItemNATNetwork;
 class QIToolBar;
+struct UIDataCloudNetwork;
 struct UIDataHostNetwork;
 struct UIDataNATNetwork;
@@ -62 +66 @@
     /** Notifies listeners about NAT network details data @a fDiffers. */
     void sigDetailsDataChangedNATNetwork(bool fDiffers);
+    /** Notifies listeners about cloud network details data @a fDiffers. */
+    void sigDetailsDataChangedCloudNetwork(bool fDiffers);
 
 public:
@@ -121 +127 @@
         /** Handles command to remove NAT network. */
         void sltRemoveNATNetwork();
+
+        /** Handles command to create cloud network. */
+        void sltCreateCloudNetwork();
+        /** Handles command to remove cloud network. */
+        void sltRemoveCloudNetwork();
 
         /** Handles command to make details @a fVisible. */
@@ -151 +162 @@
         /** Handles command to apply NAT network details changes. */
         void sltApplyDetailsChangesNATNetwork();
+
+        /** Handles cloud network tree-widget current item change. */
+        void sltHandleCurrentItemChangeCloudNetwork();
+        /** Handles cloud network context-menu request for tree-widget @a position. */
+        void sltHandleContextMenuRequestCloudNetwork(const QPoint &position);
+        /** Handles command to apply cloud network details changes. */
+        void sltApplyDetailsChangesCloudNetwork();
     /** @} */
 
@@ -179 +197 @@
         /** Prepares NAT network details-widget. */
         void prepareDetailsWidgetNATNetwork();
+        /** Prepares cloud network tab. */
+        void prepareTabCloudNetwork();
+        /** Prepares cloud network tree-widget. */
+        void prepareTreeWidgetCloudNetwork();
+        /** Prepares cloud network details-widget. */
+        void prepareDetailsWidgetCloudNetwork();
         /** Load settings: */
         void loadSettings();
@@ -194 +218 @@
         /** Loads NAT @a comNetwork data to passed @a data container. */
         void loadNATNetwork(const CNATNetwork &comNetwork, UIDataNATNetwork &data);
+
+        /** Loads cloud networks. */
+        void loadCloudNetworks();
+        /** Loads cloud @a comNetwork data to passed @a data container. */
+        void loadCloudNetwork(const CCloudNetwork &comNetwork, UIDataCloudNetwork &data);
     /** @} */
 
@@ -208 +237 @@
         void updateItemForNATNetwork(const UIDataNATNetwork &data, bool fChooseItem, UIItemNATNetwork *pItem);
 
+        /** Creates a new cloud network tree-widget item on the basis of passed @a data, @a fChooseItem if requested. */
+        void createItemForCloudNetwork(const UIDataCloudNetwork &data, bool fChooseItem);
+        /** Updates passed cloud network tree-widget item on the basis of passed @a data, @a fChooseItem if requested. */
+        void updateItemForCloudNetwork(const UIDataCloudNetwork &data, bool fChooseItem, UIItemCloudNetwork *pItem);
+
         /** Returns a list of busy NAT network names. */
         QStringList busyNamesNAT() const;
+        /** Returns a list of busy cloud network names. */
+        QStringList busyNamesCloud() const;
     /** @} */
 
@@ -250 +286 @@
         /** Holds the NAT network details-widget instance. */
         UIDetailsWidgetNATNetwork *m_pDetailsWidgetNATNetwork;
+
+        /** Holds the cloud network tab. */
+        QWidget                     *m_pTabCloudNetwork;
+        /** Holds the cloud network tab layout. */
+        QVBoxLayout                 *m_pLayoutCloudNetwork;
+        /** Holds the cloud network tree-widget instance. */
+        QITreeWidget                *m_pTreeWidgetCloudNetwork;
+        /** Holds the cloud network details-widget instance. */
+        UIDetailsWidgetCloudNetwork *m_pDetailsWidgetCloudNetwork;
     /** @} */
 };

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -39 +39 @@
 #include "CBooleanFormValue.h"
 #include "CChoiceFormValue.h"
+#include "CCloudNetwork.h"
 #include "CCloudProfile.h"
 #include "CCloudProvider.h"
@@ -669 +670 @@
 
 /* static */
+void UINotificationMessage::cannotAcquireCloudNetworkParameter(const CCloudNetwork &comNetwork)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Cloud network failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire cloud network parameter.") +
+        UIErrorString::formatErrorInfo(comNetwork));
+}
+
+/* static */
 void UINotificationMessage::cannotAcquireHostNetworkInterfaceParameter(const CHostNetworkInterface &comInterface)
 {
@@ -804 +814 @@
         QApplication::translate("UIMessageCenter", "Failed to change DHCP server parameter.") +
         UIErrorString::formatErrorInfo(comServer));
+}
+
+/* static */
+void UINotificationMessage::cannotChangeCloudNetworkParameter(const CCloudNetwork &comNetwork)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Cloud network failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to change cloud network parameter.") +
+        UIErrorString::formatErrorInfo(comNetwork));
 }
 
@@ -1050 +1069 @@
 
 /* static */
+void UINotificationMessage::cannotFindCloudNetwork(const CVirtualBox &comVBox, const QString &strNetworkName)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't find cloud network ..."),
+        QApplication::translate("UIMessageCenter", "Unable to find the cloud network <b>%1</b>.")
+                                                   .arg(strNetworkName) +
+        UIErrorString::formatErrorInfo(comVBox));
+}
+
+/* static */
 void UINotificationMessage::cannotFindHostNetworkInterface(const CHost &comHost, const QString &strInterfaceName)
 {
@@ -1086 +1115 @@
         QApplication::translate("UIMessageCenter", "Failed to remove the DHCP server for the network interface <b>%1</b>.")
                                                    .arg(strInterfaceName) +
+        UIErrorString::formatErrorInfo(comVBox));
+}
+
+/* static */
+void UINotificationMessage::cannotCreateCloudNetwork(const CVirtualBox &comVBox)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't create cloud network ..."),
+        QApplication::translate("UIMessageCenter", "Failed to create a cloud network.") +
+        UIErrorString::formatErrorInfo(comVBox));
+}
+
+/* static */
+void UINotificationMessage::cannotRemoveCloudNetwork(const CVirtualBox &comVBox, const QString &strNetworkName)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't remove cloud network ..."),
+        QApplication::translate("UIMessageCenter", "Failed to remove the cloud network <b>%1</b>.")
+                                                   .arg(strNetworkName) +
         UIErrorString::formatErrorInfo(comVBox));
 }

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -285 +285 @@
           * @param  comServer  Brings the object parameter get acquired from. */
         static void cannotAcquireDHCPServerParameter(const CDHCPServer &comServer);
+        /** Notifies about inability to acquire ICloudNetwork parameter.
+          * @param  comNetwork  Brings the object parameter get acquired from. */
+        static void cannotAcquireCloudNetworkParameter(const CCloudNetwork &comNetwork);
         /** Notifies about inability to acquire IHostNetworkInterface parameter.
           * @param  comInterface  Brings the object parameter get acquired from. */
@@ -333 +336 @@
           * @param  comServer  Brings the object parameter being changed for. */
         static void cannotChangeDHCPServerParameter(const CDHCPServer &comServer);
+        /** Notifies about inability to change ICloudNetwork parameter.
+          * @param  comNetwork  Brings the object parameter being changed for. */
+        static void cannotChangeCloudNetworkParameter(const CCloudNetwork &comNetwork);
         /** Notifies about inability to change IHostNetworkInterface parameter.
           * @param  comInterface  Brings the object parameter being changed for. */
@@ -421 +427 @@
         static void cannotOpenExtPackFile(const CExtPackFile &comExtPackFile, const QString &strFilename);
 
+        /** Notifies about inability to find cloud network.
+          * @param  comVBox         Brings common VBox object being search through.
+          * @param  strNetworkName  Brings network name. */
+        static void cannotFindCloudNetwork(const CVirtualBox &comVBox, const QString &strNetworkName);
         /** Notifies about inability to find host network interface.
           * @param  comHost  Brings the host being search through.
@@ -437 +447 @@
           * @param  strInterfaceName  Brings the interface name. */
         static void cannotRemoveDHCPServer(const CVirtualBox &comVBox, const QString &strInterfaceName);
+        /** Notifies about inability to create cloud network.
+          * @param  comVBox  Brings common VBox object trying to create cloud network. */
+        static void cannotCreateCloudNetwork(const CVirtualBox &comVBox);
+        /** Notifies about inability to remove cloud network.
+          * @param  comVBox         Brings common VBox object trying to remove cloud network.
+          * @param  strNetworkName  Brings the network name. */
+        static void cannotRemoveCloudNetwork(const CVirtualBox &comVBox, const QString &strNetworkName);
         /** Notifies about inability to create NAT network.
           * @param  comVBox  Brings common VBox object trying to create NAT network. */