儲存庫 vbox 的更動 50165

時間撮記:

2014-1-22 下午05:46:16 (11 年 以前)

作者:

vboxsync

訊息:

FE/Qt: 7036: Runtime UI: Devices menu: Network sub-menu: Stuff to connect/disconnect network adapter cable.

位置:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

檔案:

• UIActionPoolRuntime.cpp (修改) (1 筆差異)
• UIMachineLogic.cpp (修改) (3 筆差異)
• UIMachineLogic.h (修改) (1 筆差異)
• UIMachineMenuBar.cpp (修改) (1 筆差異)
• UISession.cpp (修改) (1 筆差異)
• normal/UIMachineLogicNormal.cpp (修改) (2 筆差異)
• normal/UIMachineLogicNormal.h (修改) (1 筆差異)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -798 +798 @@
 
     UIActionMenuNetworkAdapters(UIActionPool *pParent)
-        : UIActionMenu(pParent)
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi() {}
+        : UIActionMenu(pParent, ":/nw_16px.png", ":/nw_disabled_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "Network"));
+    }
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -74 +74 @@
 #include "CHostVideoInputDevice.h"
 #include "CEmulatedUSB.h"
+#include "CNetworkAdapter.h"
 #ifdef Q_WS_MAC
 # include "CGuest.h"
@@ -882 +883 @@
     connect(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->menu(), SIGNAL(aboutToShow()),
             this, SLOT(sltPrepareDragAndDropMenu()));
+    connect(gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu(), SIGNAL(aboutToShow()),
+            this, SLOT(sltPrepareNetworkMenu()));
     connect(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings), SIGNAL(triggered()),
             this, SLOT(sltOpenNetworkAdaptersDialog()));
@@ -2050 +2053 @@
 }
 
+/** Prepares menu content when user hovers <b>Network</b> submenu of the <b>Devices</b> menu. */
+void UIMachineLogic::sltPrepareNetworkMenu()
+{
+    /* Get and check 'the sender' menu object: */
+    QMenu *pMenu = qobject_cast<QMenu*>(sender());
+    QMenu *pNetworkMenu = gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu();
+    AssertReturnVoid(pMenu == pNetworkMenu);
+    Q_UNUSED(pNetworkMenu);
+
+    /* Get and check current machine: */
+    const CMachine &machine = session().GetMachine();
+    AssertReturnVoid(!machine.isNull());
+
+    /* Determine how many adapters we should display: */
+    KChipsetType chipsetType = machine.GetChipsetType();
+    ULONG uCount = qMin((ULONG)4, vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(chipsetType));
+
+    /* Enumerate existing network adapters: */
+    QMap<int, bool> adapterData;
+    for (ULONG uSlot = 0; uSlot < uCount; ++uSlot)
+    {
+        /* Get and check iterated adapter: */
+        const CNetworkAdapter &adapter = machine.GetNetworkAdapter(uSlot);
+        AssertReturnVoid(machine.isOk());
+        Assert(!adapter.isNull());
+        if (adapter.isNull())
+            continue;
+
+        /* Remember adapter data if it is enabled: */
+        if (adapter.GetEnabled())
+            adapterData.insert((int)uSlot, (bool)adapter.GetCableConnected());
+    }
+    AssertReturnVoid(!adapterData.isEmpty());
+
+    /* Delete all "temporary" actions: */
+    QList<QAction*> actions = pMenu->actions();
+    foreach (QAction *pAction, actions)
+        if (pAction->property("temporary").toBool())
+            delete pAction;
+
+    /* Add new "temporary" actions: */
+    foreach (int iSlot, adapterData.keys())
+    {
+        QAction *pAction = pMenu->addAction(QIcon(adapterData[iSlot] ? ":/connect_16px.png": ":/disconnect_16px.png"),
+                                            adapterData.size() == 1 ? tr("Connect Network Adapter") : tr("Connect Network Adapter %1").arg(iSlot + 1),
+                                            this, SLOT(sltToggleNetworkAdapterConnection()));
+        pAction->setProperty("temporary", true);
+        pAction->setProperty("slot", iSlot);
+        pAction->setCheckable(true);
+        pAction->setChecked(adapterData[iSlot]);
+    }
+}
+
+/** Toggles network adapter's <i>Cable Connected</i> state. */
+void UIMachineLogic::sltToggleNetworkAdapterConnection()
+{
+    /* Get and check 'the sender' action object: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertReturnVoid(pAction);
+
+    /* Get and check current machine: */
+    CMachine machine = session().GetMachine();
+    AssertReturnVoid(!machine.isNull());
+
+    /* Get operation target: */
+    CNetworkAdapter adapter = machine.GetNetworkAdapter((ULONG)pAction->property("slot").toInt());
+    AssertReturnVoid(machine.isOk() && !adapter.isNull());
+
+    /* Connect/disconnect cable to/from target: */
+    adapter.SetCableConnected(!adapter.GetCableConnected());
+    machine.SaveSettings();
+    if (!machine.isOk())
+        msgCenter().cannotSaveMachineSettings(machine);
+}
+
 void UIMachineLogic::sltChangeDragAndDropType(QAction *pAction)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -209 +209 @@
     void sltChangeSharedClipboardType(QAction *pAction);
     void sltPrepareDragAndDropMenu();
+    void sltPrepareNetworkMenu();
+    void sltToggleNetworkAdapterConnection();
     void sltChangeDragAndDropType(QAction *pAction);
     void sltToggleVRDE(bool fEnabled);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -444 +444 @@
     else
         gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->setEnabled(false);
-    /* Network Settings action: */
+    /* Network submenu: */
     if (m_pSession->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_NetworkSettings)
     {
-        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
-        fSeparator1 = true;
-    }
-    else
+        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_Network));
+        gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu()->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
+        fSeparator1 = true;
+    }
+    else
+    {
+        gActionPool->action(UIActionIndexRuntime_Menu_Network)->setEnabled(false);
         gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setEnabled(false);
+    }
     /* Shared Folders Settings action: */
     if (m_pSession->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_SharedFoldersSettings)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1539 +1539 @@
         }
 
-        /* Show/Hide Network Adapters action depending on overall adapters activity status: */
-        gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setVisible(fAtLeastOneAdapterActive);
+        /* Show/Hide Network sub-menu depending on overall adapters activity status: */
+        gActionPool->action(UIActionIndexRuntime_Menu_Network)->setVisible(fAtLeastOneAdapterActive);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -67 +67 @@
 }
 
-void UIMachineLogicNormal::sltPrepareNetworkAdaptersMenu()
-{
-    QMenu *menu = qobject_cast<QMenu*>(sender());
-    AssertMsg(menu, ("This slot should be called only on Network Adapters menu show!\n"));
-    menu->clear();
-    menu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
-}
-
 void UIMachineLogicNormal::sltPrepareSharedFoldersMenu()
 {
@@ -114 +106 @@
 
     /* "Device" actions connections: */
-    connect(gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu(), SIGNAL(aboutToShow()),
-            this, SLOT(sltPrepareNetworkAdaptersMenu()));
     connect(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)->menu(), SIGNAL(aboutToShow()),
             this, SLOT(sltPrepareSharedFoldersMenu()));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h

@@ -40 +40 @@
 
     /* Windowed mode functionality: */
-    void sltPrepareNetworkAdaptersMenu();
     void sltPrepareSharedFoldersMenu();
     void sltPrepareVideoCaptureMenu();