Changeset 28572 in vbox

Timestamp:

Apr 21, 2010 7:37:32 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: added support for the IP tooltip (r60385)

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (modified) (5 diffs)

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

@@ -22 +22 @@
  */
 
+/* Global includes */
+#include <iprt/time.h>
+#include <QTimer>
+
 /* Local includes */
 #include "UIIndicatorsPool.h"
@@ -233 +237 @@
       : QIWithRetranslateUI<QIStateIndicator>()
       , m_session(session)
+      , m_pUpdateTimer(new QTimer(this))
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/nw_16px.png"));
@@ -239 +244 @@
         setStateIcon(KDeviceActivity_Null, QPixmap(":/nw_disabled_16px.png"));
 
-        retranslateUi();
-    }
-
-    void retranslateUi()
-    {
-        updateAppearance();
-    }
-
-    void updateAppearance()
-    {
-        const CMachine &machine = m_session.GetMachine();
+        connect(m_pUpdateTimer, SIGNAL(timeout()), SLOT(sltUpdateNetworkIPs()));
+        m_pUpdateTimer->start(5000);
+
+        retranslateUi();
+    }
+
+    void retranslateUi()
+    {
+        updateAppearance();
+    }
+
+    void updateAppearance()
+    {
+        CMachine machine = m_session.GetMachine();
 
         ulong uMaxCount = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
@@ -266 +274 @@
             CNetworkAdapter adapter = machine.GetNetworkAdapter(uSlot);
             if (adapter.GetEnabled())
-                strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>", "Network adapters tooltip")
+            {
+                QString strIP;
+                ULONG64 timestamp;
+                RTTIMESPEC time;
+                uint64_t u64Now = RTTimeSpecGetNano(RTTimeNow(&time));
+                QString strFlags;
+                machine.GetGuestProperty(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(uSlot),
+                                         strIP, timestamp, strFlags);
+                strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr>", "Network adapters tooltip")
                     .arg(uSlot + 1)
                     .arg(vboxGlobal().toString(adapter.GetAttachmentType()))
+                    .arg(strIP.isEmpty() || (u64Now - timestamp > UINT64_C(20000000000)) ? "" : "IP=" + strIP + " - ")
                     .arg(adapter.GetCableConnected() ?
                           QApplication::translate("VBoxConsoleWnd", "connected", "Network adapters tooltip") :
                           QApplication::translate("VBoxConsoleWnd", "disconnected", "Network adapters tooltip"));
+            }
         }
 
@@ -279 +297 @@
         setToolTip(strToolTip.arg(strFullData));
     }
-
-protected:
-    /* For compatibility reason we do it here, later this should be moved to
-     * QIStateIndicator. */
-    CSession &m_session;
+protected slots:
+
+    void sltUpdateNetworkIPs()
+    {
+        updateAppearance();
+    }
+
+protected:
+    /* For compatibility reason we do it here, later this should be moved to
+     * QIStateIndicator. */
+    CSession &m_session;
+    QTimer *m_pUpdateTimer;
 };