Changeset 23054 in vbox for trunk/src

Timestamp:

Sep 16, 2009 9:13:01 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Changing Network Attachment Type during runtime.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (8 diffs)
• include/VBoxVMSettingsNetwork.h (modified) (4 diffs)
• src/VBoxConsoleWnd.cpp (modified) (16 diffs)
• src/VBoxVMSettingsNetwork.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -30 +30 @@
 #include "VBoxProblemReporter.h"
 #include "VBoxHelpActions.h"
+#include "VBoxVMSettingsNetwork.h"
 
 /* Qt includes */
@@ -63 +64 @@
 
 class VBoxMiniToolBar;
+
+class VBoxVMSettingsNetworkPage;
 
 /* We want to make the first action highlighted but not
@@ -213 +216 @@
     void devicesUnmountDVD();
     void devicesSwitchVrdp (bool);
+    void devicesOpenNetworkDialog();
     void devicesOpenSFDialog();
     void devicesInstallGuestAdditions();
@@ -218 +222 @@
     void prepareFloppyMenu();
     void prepareDVDMenu();
-    void prepareNetworkMenu();
-
-    void setDynamicMenuItemStatusTip (QAction *aAction);
 
     void captureFloppy (QAction *aAction);
     void captureDVD (QAction *aAction);
-    void activateNetworkMenu (QAction *aAction);
     void switchUSB (QAction *aAction);
 
@@ -236 +236 @@
     void updateMouseState (int state);
     void updateAdditionsState (const QString&, bool, bool, bool);
-    void updateNetworkAdarptersState();
+    void updateNetworkAdaptersState();
     void updateUsbState();
     void updateMediaDriveState (VBoxDefs::MediaType aType);
@@ -291 +291 @@
     QAction *mDevicesUnmountDVDAction;
     QAction *mDevicesSwitchVrdpAction;
+    QAction *mDevicesNetworkDialogAction;
     QAction *mDevicesSFDialogAction;
     QAction *mDevicesInstallGuestToolsAction;
@@ -323 +324 @@
     /* see showIndicatorContextMenu for a description of mDevicesSFMenu */
     /* QMenu *mDevicesSFMenu; */
-    QMenu *mDevicesNetworkMenu;
     VBoxUSBMenu *mDevicesUSBMenu;
     /* VBoxSwitchMenu *mDevicesVRDPMenu; */
@@ -436 +436 @@
 
 
+class VBoxVMSettingsNetworkDialogPage : public VBoxVMSettingsNetworkPage
+{
+    Q_OBJECT;
+
+public:
+
+    VBoxVMSettingsNetworkDialogPage() : VBoxVMSettingsNetworkPage(true) {}
+
+    void getFrom (const CMachine &aMachine) { VBoxVMSettingsNetworkPage::getFrom(aMachine); }
+    void putBackTo() { VBoxVMSettingsNetworkPage::putBackTo(); }
+
+};
+
+class VBoxNetworkDialog : public QIWithRetranslateUI<QDialog>
+{
+    Q_OBJECT;
+
+public:
+
+    VBoxNetworkDialog (QWidget*, CSession&);
+
+protected:
+
+    void retranslateUi();
+
+protected slots:
+
+    virtual void accept();
+
+protected:
+
+    void showEvent (QShowEvent*);
+
+private:
+
+    VBoxVMSettingsNetworkDialogPage *mSettings;
+    CSession &mSession;
+};
+
+
 #endif // __VBoxConsoleWnd_h__

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsNetwork.h

@@ -39 +39 @@
 public:
 
-    VBoxVMSettingsNetwork (VBoxVMSettingsNetworkPage *aParent);
+    VBoxVMSettingsNetwork (VBoxVMSettingsNetworkPage *aParent, bool aDisableStaticControls = false);
 
     void getFromAdapter (const CNetworkAdapter &aAdapter);
@@ -79 +79 @@
 
     bool mPolished;
+    bool mDisableStaticControls;
 };
 
@@ -87 +88 @@
 public:
 
-    VBoxVMSettingsNetworkPage();
+    VBoxVMSettingsNetworkPage(bool aDisableStaticControls = false);
 
     QStringList brgList (bool aRefresh = false);
@@ -115 +116 @@
     QStringList mIntList;
     QStringList mHoiList;
+
+    bool mDisableStaticControls;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -366 +366 @@
                              ":/cd_unmount_dis_16px.png"));
 
+    mDevicesNetworkDialogAction = new QAction (mRunningOrPausedActions);
+    mDevicesNetworkDialogAction->setIcon (
+        VBoxGlobal::iconSet (":/nw_16px.png",
+                             ":/nw_disabled_16px.png"));
+
     mDevicesSFDialogAction = new QAction (mRunningOrPausedActions);
     mDevicesSFDialogAction->setIcon (
@@ -461 +466 @@
     mDevicesMenu->addSeparator();
 
-    mDevicesNetworkMenu = mDevicesMenu->addMenu (VBoxGlobal::iconSet (":/nw_16px.png", ":/nw_disabled_16px.png"), QString::null);
+    mDevicesMenu->addAction (mDevicesNetworkDialogAction);
     mDevicesMenu->addSeparator();
 
@@ -652 +657 @@
     connect (mDevicesUnmountDVDAction, SIGNAL(triggered()), this, SLOT(devicesUnmountDVD()));
     connect (mDevicesSwitchVrdpAction, SIGNAL(toggled (bool)), this, SLOT(devicesSwitchVrdp (bool)));
+    connect (mDevicesNetworkDialogAction, SIGNAL(triggered()), this, SLOT(devicesOpenNetworkDialog()));
     connect (mDevicesSFDialogAction, SIGNAL(triggered()), this, SLOT(devicesOpenSFDialog()));
     connect (mDevicesInstallGuestToolsAction, SIGNAL(triggered()), this, SLOT(devicesInstallGuestAdditions()));
@@ -658 +664 @@
     connect (mDevicesMountFloppyMenu, SIGNAL(aboutToShow()), this, SLOT(prepareFloppyMenu()));
     connect (mDevicesMountDVDMenu, SIGNAL(aboutToShow()), this, SLOT(prepareDVDMenu()));
-    connect (mDevicesNetworkMenu, SIGNAL(aboutToShow()), this, SLOT(prepareNetworkMenu()));
 
     connect (statusBar(), SIGNAL(messageChanged (const QString &)), this, SLOT(statusTipChanged (const QString &)));
@@ -665 +670 @@
     connect (mDevicesMountDVDMenu, SIGNAL(triggered(QAction *)), this, SLOT(captureDVD(QAction *)));
     connect (mDevicesUSBMenu, SIGNAL(triggered(QAction *)), this, SLOT(switchUSB(QAction *)));
-    connect (mDevicesNetworkMenu, SIGNAL(triggered(QAction *)), this, SLOT(activateNetworkMenu(QAction *)));
-
-    connect (mDevicesMountFloppyMenu, SIGNAL (hovered (QAction *)),
-             this, SLOT (setDynamicMenuItemStatusTip (QAction *)));
-    connect (mDevicesMountDVDMenu, SIGNAL (hovered (QAction *)),
-             this, SLOT (setDynamicMenuItemStatusTip (QAction *)));
-    connect (mDevicesNetworkMenu, SIGNAL (hovered (QAction *)),
-             this, SLOT (setDynamicMenuItemStatusTip (QAction *)));
 
     /* Cleanup the status bar tip when a menu with dynamic items is
@@ -681 +678 @@
              statusBar(), SLOT (clearMessage()));
     connect (mDevicesMountDVDMenu, SIGNAL (aboutToHide()),
-             statusBar(), SLOT (clearMessage()));
-    connect (mDevicesNetworkMenu, SIGNAL (aboutToHide()),
              statusBar(), SLOT (clearMessage()));
 
@@ -970 +965 @@
              this, SLOT (updateUsbState()));
     connect (console, SIGNAL (networkStateChange()),
-             this, SLOT (updateNetworkAdarptersState()));
+             this, SLOT (updateNetworkAdaptersState()));
     connect (console, SIGNAL (sharedFoldersChanged()),
              this, SLOT (updateSharedFoldersState()));
@@ -1749 +1744 @@
         tr ("Enable or disable remote desktop (RDP) connections to this machine"));
 
+    mDevicesNetworkDialogAction->setText (tr ("&Network Adapters..."));
+    mDevicesNetworkDialogAction->setStatusTip (
+        tr ("Open the dialog to change settings of the Network Adapters"));
+
     mDevicesSFDialogAction->setText (tr ("&Shared Folders..."));
     mDevicesSFDialogAction->setStatusTip (
@@ -1777 +1776 @@
     mDevicesMountFloppyMenu->setTitle (tr ("Mount &Floppy"));
     mDevicesMountDVDMenu->setTitle (tr ("Mount &CD/DVD-ROM"));
-    mDevicesNetworkMenu->setTitle (tr ("&Network Adapters"));
     mDevicesUSBMenu->setTitle (tr ("&USB Devices"));
 
@@ -1984 +1982 @@
                                        : KDeviceActivity_Null);
 
-        mDevicesNetworkMenu->setEnabled (isRunningOrPaused && count > 0);
+        mDevicesNetworkDialogAction->setEnabled (isRunningOrPaused && count > 0);
 
         /* update tooltip */
@@ -2955 +2953 @@
 }
 
+void VBoxConsoleWnd::devicesOpenNetworkDialog()
+{
+    if (!console) return;
+
+    VBoxNetworkDialog dlg (console, csession);
+    dlg.exec();
+}
+
 void VBoxConsoleWnd::devicesOpenSFDialog()
 {
@@ -3238 +3244 @@
 }
 
-/**
- *  Prepares the "Network adapter" menu by populating the existent adapters.
- */
-void VBoxConsoleWnd::prepareNetworkMenu()
-{
-    mDevicesNetworkMenu->clear();
-    ulong count = qMin ((ULONG) 4,
-        vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount());
-    for (ulong slot = 0; slot < count; ++ slot)
-    {
-        CNetworkAdapter adapter = csession.GetMachine().GetNetworkAdapter (slot);
-        QAction *action = mDevicesNetworkMenu->addAction (tr ("Adapter %1", "network").arg (slot+1));
-        action->setEnabled (adapter.GetEnabled());
-        action->setCheckable (true);
-        action->setChecked (adapter.GetEnabled() && adapter.GetCableConnected());
-        action->setData (static_cast<qulonglong> (slot));
-    }
-}
-
-void VBoxConsoleWnd::setDynamicMenuItemStatusTip (QAction *aAction)
-{
-    QString tip;
-
-    if (sender() == mDevicesNetworkMenu)
-    {
-        tip = aAction->isChecked() ?
-            tr ("Disconnect the cable from the selected virtual network adapter") :
-            tr ("Connect the cable to the selected virtual network adapter");
-    }
-
-    if (!tip.isNull())
-    {
-        StatusTipEvent *ev = new StatusTipEvent (tip);
-        QApplication::postEvent (this, ev);
-        mWaitForStatusBarChange = true;
-    }
-}
-
 void VBoxConsoleWnd::statusTipChanged (const QString & /*aMes*/)
 {
@@ -3340 +3308 @@
         }
     }
-}
-
-/**
- *  Switch the cable connected/disconnected for the selected network adapter
- */
-void VBoxConsoleWnd::activateNetworkMenu (QAction *aAction)
-{
-    ulong slot = aAction->data().toULongLong();
-    CNetworkAdapter adapter = csession.GetMachine().GetNetworkAdapter (slot);
-    bool connected = adapter.GetCableConnected();
-    if (adapter.GetEnabled())
-        adapter.SetCableConnected (!connected);
 }
 
@@ -3450 +3406 @@
     if (ind == net_light)
     {
-        if (mDevicesNetworkMenu->isEnabled())
-        {
-            /* set "this is a context menu" flag */
-            mDevicesNetworkMenu->menuAction()->setData (true);
-            mDevicesNetworkMenu->exec (e->globalPos());
-            mDevicesNetworkMenu->menuAction()->setData (false);
-        }
+        if (mDevicesNetworkDialogAction->isEnabled())
+            mDevicesNetworkDialogAction->trigger();
     }
 }
@@ -3685 +3636 @@
 }
 
-void VBoxConsoleWnd::updateNetworkAdarptersState()
+void VBoxConsoleWnd::updateNetworkAdaptersState()
 {
     updateAppearanceOf (NetworkStuff);
@@ -3934 +3885 @@
 }
 
+
+VBoxNetworkDialog::VBoxNetworkDialog (QWidget *aParent, CSession &aSession)
+    : QIWithRetranslateUI<QDialog> (aParent)
+    , mSettings (0)
+    , mSession (aSession)
+{
+    setModal (true);
+    /* Setup Dialog's options */
+    setWindowIcon (QIcon (":/nw_16px.png"));
+    setSizeGripEnabled (true);
+
+    /* Setup main dialog's layout */
+    QVBoxLayout *mainLayout = new QVBoxLayout (this);
+    VBoxGlobal::setLayoutMargin (mainLayout, 10);
+    mainLayout->setSpacing (10);
+
+    /* Setup settings layout */
+    mSettings = new VBoxVMSettingsNetworkDialogPage();
+    mSettings->setOrderAfter (this);
+    VBoxGlobal::setLayoutMargin (mSettings->layout(), 0);
+    mSettings->getFrom (aSession.GetMachine());
+    mainLayout->addWidget (mSettings);
+
+    /* Setup button's layout */
+    QIDialogButtonBox *buttonBox = new QIDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help);
+
+    connect (buttonBox, SIGNAL (helpRequested()), &vboxProblem(), SLOT (showHelpHelpDialog()));
+    connect (buttonBox, SIGNAL (accepted()), this, SLOT (accept()));
+    connect (buttonBox, SIGNAL (rejected()), this, SLOT (reject()));
+    mainLayout->addWidget (buttonBox);
+
+    retranslateUi();
+}
+
+void VBoxNetworkDialog::retranslateUi()
+{
+    setWindowTitle (tr ("Network Adapter Settings"));
+}
+
+void VBoxNetworkDialog::accept()
+{
+    mSettings->putBackTo();
+    CMachine machine = mSession.GetMachine();
+    machine.SaveSettings();
+    if (!machine.isOk())
+        vboxProblem().cannotSaveMachineSettings (machine);
+    QDialog::accept();
+}
+
+void VBoxNetworkDialog::showEvent (QShowEvent *aEvent)
+{
+    resize (450, 300);
+    VBoxGlobal::centerWidget (this, parentWidget());
+    setMinimumWidth (400);
+    QDialog::showEvent (aEvent);
+}
+
+
 #include "VBoxConsoleWnd.moc"

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -35 +35 @@
 
 /* VBoxVMSettingsNetwork Stuff */
-VBoxVMSettingsNetwork::VBoxVMSettingsNetwork (VBoxVMSettingsNetworkPage *aParent)
+VBoxVMSettingsNetwork::VBoxVMSettingsNetwork (VBoxVMSettingsNetworkPage *aParent, bool aDisableStaticControls)
     : QIWithRetranslateUI <QWidget> (0)
     , mParent (aParent)
     , mValidator (0)
     , mPolished (false)
+    , mDisableStaticControls (false)
 {
     /* Apply UI decorations */
@@ -69 +70 @@
     /* Applying language settings */
     retranslateUi();
+
+    /* If some controls should be disabled or not when the
+     * same tab widgets are shown during runtime
+     */
+    mDisableStaticControls = aDisableStaticControls;
 }
 
@@ -153 +159 @@
     mValidator = aValidator;
 
-    connect (mCbEnableAdapter, SIGNAL (toggled (bool)),
-             mValidator, SLOT (revalidate()));
+    if (!mDisableStaticControls)
+        connect (mCbEnableAdapter, SIGNAL (toggled (bool)),
+                 mValidator, SLOT (revalidate()));
     connect (mCbAttachmentType, SIGNAL (activated (const QString&)),
              this, SLOT (updateAttachmentAlternative()));
@@ -162 +169 @@
              this, SLOT (updateAlternativeName()));
 
-    mValidator->revalidate();
+    if (!mDisableStaticControls)
+        mValidator->revalidate();
 }
 
@@ -267 +275 @@
         mNetworkChildGridLayout->setColumnMinimumWidth (0, mLbAttachmentType->width());
 
-        /* Hide advanced items initially */
-        toggleAdvanced();
+        if (mDisableStaticControls)
+        {
+            /* Disable controls for dynamically displayed page */
+            mCbEnableAdapter->setEnabled (false);
+            mCbAdapterType->setEnabled (false);
+            mLeMAC->setEnabled (false);
+            mTbMAC->setEnabled (false);
+            mLbAdapterType->setEnabled (false);
+            mLbMAC->setEnabled (false);
+            mAbsAdvanced->animateClick();
+        }
+        else
+        {
+            /* Hide advanced items initially */
+            toggleAdvanced();
+        }
     }
     QWidget::showEvent (aEvent);
@@ -526 +548 @@
 
 /* VBoxVMSettingsNetworkPage Stuff */
-VBoxVMSettingsNetworkPage::VBoxVMSettingsNetworkPage()
+VBoxVMSettingsNetworkPage::VBoxVMSettingsNetworkPage(bool aDisableStaticControls)
     : mValidator (0)
+    , mDisableStaticControls (false)
 {
     /* Setup Main Layout */
@@ -536 +559 @@
     mTwAdapters = new QTabWidget (this);
     mainLayout->addWidget (mTwAdapters);
+
+    /* If some controls should be disabled or not when the
+     * same tab widgets are shown during runtime
+     */
+    mDisableStaticControls = aDisableStaticControls;
 }
 
@@ -637 +665 @@
 
         /* Creating Adapter's page */
-        VBoxVMSettingsNetwork *page = new VBoxVMSettingsNetwork (this);
+        VBoxVMSettingsNetwork *page = new VBoxVMSettingsNetwork (this, mDisableStaticControls);
 
         /* Loading Adapter's data into page */
@@ -644 +672 @@
         /* Attach Adapter's page to Tab Widget */
         mTwAdapters->addTab (page, page->pageTitle());
+
+        /* Disable tab page if adapter is being configured dynamically */
+        if (mDisableStaticControls && !adapter.GetEnabled())
+            mTwAdapters->setTabEnabled(slot, false);
 
         /* Setup validation */