Changeset 35761 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 28, 2011 1:19:26 PM (14 years ago)

Author:

vboxsync

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

69723

Message:

Main, frontends: proper description for maximal number of NICs per VM

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxVMInformationDlg.cpp (modified) (3 diffs)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• selector/UIVMDesktop.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (4 diffs)

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

@@ -274 +274 @@
 
     /* Network statistics: */
-    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
+    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
     for (ulong i = 0; i < count; ++ i)
     {
@@ -587 +587 @@
 
         /* Network Adapters list */
-        ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
+        ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
         for (ulong slot = 0; slot < count; ++ slot)
         {
@@ -690 +690 @@
     return result;
 }
-

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

@@ -1814 +1814 @@
         QString item;
 
-        ulong count = mVBox.GetSystemProperties().GetNetworkAdapterCount();
+        ulong count = mVBox.GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
         int rows = 2; /* including section header and footer */
         for (ulong slot = 0; slot < count; slot ++)

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

@@ -270 +270 @@
         QString strFullData;
 
-        ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
+        ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
 
         QString strToolTip = QApplication::translate("UIIndicatorsPool",

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

@@ -980 +980 @@
     {
         bool fAtLeastOneAdapterActive = false;
-        ULONG uSlots = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
+        ULONG uSlots = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
         for (ULONG uSlot = 0; uSlot < uSlots; ++uSlot)
         {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -726 +726 @@
             QString item;
 
-            ulong count = m_vbox.GetSystemProperties().GetNetworkAdapterCount();
+            ulong count = m_vbox.GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
             for (ulong slot = 0; slot < count; slot ++)
             {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -626 +626 @@
 
     /* How many adapters to display */
-    ulong uCount = qMin((ULONG)4, vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount());
+    ulong uCount = qMin((ULONG)4, vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3));
     /* Add the tab pages to parent tab widget. Needed for space calculations. */
     for (ulong iSlot = 0; iSlot < uCount; ++iSlot)
@@ -681 +681 @@
         mIntList.clear();
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        ulong count = qMin ((ULONG) 4, vbox.GetSystemProperties().GetNetworkAdapterCount());
+        ulong count = qMin ((ULONG) 4, vbox.GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3));
         CMachineVector vec = vbox.GetMachines();
         for (CMachineVector::ConstIterator m = vec.begin(); m != vec.end(); ++ m)
@@ -750 +750 @@
 
     /* Load adapters data: */
-    ulong uCount = qMin((ULONG)4, vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount());
+    ulong uCount = qMin((ULONG)4, vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3));
     for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
     {
@@ -984 +984 @@
     }
 }
-