Changeset 28565 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 21, 2010 2:19:22 PM (15 years ago)

Author:

vboxsync

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

60385

Message:

FE/Qt: show the IPs of the active network card in the network tooltip

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (5 diffs)
• VBoxConsoleWnd.h (modified) (2 diffs)

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

@@ -226 +226 @@
     /* LED Update Timer */
     , mIdleTimer (new QTimer (this))
+    , mNetworkTimer (new QTimer (this))
     /* LEDs */
     , mHDLed (0)
@@ -946 +947 @@
     connect (mIdleTimer, SIGNAL (timeout()), SLOT (updateDeviceLights()));
     mIdleTimer->start (50);
+    connect (mNetworkTimer, SIGNAL (timeout()), SLOT (updateNetworkIPs()));
+    mNetworkTimer->start (5000);
 
     connect (mConsole, SIGNAL (mouseStateChanged (int)), this, SLOT (updateMouseState (int)));
@@ -1482 +1485 @@
         mIdleTimer->stop();
         mIdleTimer->disconnect (SIGNAL (timeout()), this, SLOT (updateDeviceLights()));
+        /* Stop Network timer: */
+        mNetworkTimer->stop();
+        mNetworkTimer->disconnect (SIGNAL (timeout()), this, SLOT (updateNetworkIPs()));
 
         /* Hide console window: */
@@ -2529 +2535 @@
         }
     }
+}
+
+void VBoxConsoleWnd::updateNetworkIPs()
+{
+    updateAppearanceOf(NetworkStuff);
 }
 
@@ -3118 +3129 @@
         {
             CNetworkAdapter adapter = machine.GetNetworkAdapter (slot);
+            QString ip;
+            ULONG64 timestamp;
+            RTTIMESPEC time;
             if (adapter.GetEnabled())
-                info += tr ("<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>", "Network adapters tooltip")
+            {
+                uint64_t u64Now = RTTimeSpecGetNano(RTTimeNow(&time));
+                QString flags;
+                machine.GetGuestProperty(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(slot),
+                                        ip, timestamp, flags);
+                info += tr ("<br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr>", "Network adapters tooltip")
                     .arg (slot + 1)
                     .arg (vboxGlobal().toString (adapter.GetAttachmentType()))
+                    .arg (ip.isEmpty() || (u64Now - timestamp > UINT64_C(20000000000)) ? "" : "IP=" + ip + " - ")
                     .arg (adapter.GetCableConnected() ?
                           tr ("connected", "Network adapters tooltip") :
                           tr ("disconnected", "Network adapters tooltip"));
+            }
         }
 

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

@@ -166 +166 @@
 
     void updateDeviceLights();
+    void updateNetworkIPs();
     void updateMachineState (KMachineState aState);
     void updateMouseState (int aState);
@@ -322 +323 @@
     /* Timer to update LEDs */
     QTimer *mIdleTimer;
+    QTimer *mNetworkTimer;
 
     /* LEDs */