Changeset 53301 in vbox for trunk/src

Timestamp:

Nov 11, 2014 11:12:21 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7464: Change network status-bar indicator to have disconnected state icon when all of the existing network adapters have their cables disconnected.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• VirtualBox1_hidpi.qrc (modified) (2 diffs)
• VirtualBox2_hidpi.qrc (modified) (1 diff)
• images/hidpi/nw_disconnected_16px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/nw_16px.png )
• images/nw_disconnected_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/nw_16px.png )
• src/runtime/UIIndicatorsPool.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -217 +217 @@
         <file alias="nw_32px.png">images/nw_32px.png</file>
         <file alias="nw_disabled_16px.png">images/nw_disabled_16px.png</file>
+        <file alias="nw_disconnected_16px.png">images/nw_disconnected_16px.png</file>
         <file alias="nw_error_16px.png">images/nw_error_16px.png</file>
         <file alias="nw_loading_16px.png">images/nw_loading_16px.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_hidpi.qrc

@@ -211 +211 @@
         <file alias="nw_32px_hidpi.png">images/hidpi/nw_32px_hidpi.png</file>
         <file alias="nw_disabled_16px_hidpi.png">images/hidpi/nw_disabled_16px_hidpi.png</file>
+        <file alias="nw_disconnected_16px_hidpi.png">images/hidpi/nw_disconnected_16px_hidpi.png</file>
         <file alias="nw_error_16px_hidpi.png">images/hidpi/nw_error_16px_hidpi.png</file>
         <file alias="nw_loading_16px_hidpi.png">images/hidpi/nw_loading_16px_hidpi.png</file>
@@ -253 +254 @@
         <file alias="os_opensuse_64_hidpi.png">images/hidpi/os_opensuse_64_hidpi.png</file>
         <file alias="os_opensuse_hidpi.png">images/hidpi/os_opensuse_hidpi.png</file>
-        <file alias="os_oracle_64_hidpi.png">images/hidpi/os_oracle_64_hidpi.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/">
+        <file alias="os_oracle_64_hidpi.png">images/hidpi/os_oracle_64_hidpi.png</file>
         <file alias="os_oracle_hidpi.png">images/hidpi/os_oracle_hidpi.png</file>
         <file alias="os_oraclesolaris_64_hidpi.png">images/hidpi/os_oraclesolaris_64_hidpi.png</file>

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

@@ -403 +403 @@
         /* Enumerate up to uMaxCount adapters: */
         bool fAdaptersPresent = false;
+        bool fCablesDisconnected = true;
         for (ulong uSlot = 0; uSlot < uMaxCount; ++uSlot)
         {
@@ -417 +418 @@
                         strGuestIp = ipList[iIp];
                 }
+                /* Check if the adapter's cable is connected: */
+                const bool fCableConnected = adapter.GetCableConnected();
+                if (fCablesDisconnected && fCableConnected)
+                    fCablesDisconnected = false;
                 /* Append adapter data: */
                 strFullData += QApplication::translate("UIIndicatorsPool",
@@ -423 +428 @@
                     .arg(gpConverter->toString(adapter.GetAttachmentType()))
                     .arg(strGuestIp.isEmpty() ? "" : "IP " + strGuestIp + ", ")
-                    .arg(adapter.GetCableConnected() ?
+                    .arg(fCableConnected ?
                          QApplication::translate("UIIndicatorsPool", "connected", "Network adapters tooltip") :
                          QApplication::translate("UIIndicatorsPool", "disconnected", "Network adapters tooltip"));
@@ -437 +442 @@
             hide();
 
+        /* Update icon for the 'Null' state: */
+        if (fAdaptersPresent && fCablesDisconnected)
+            setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/nw_disconnected_16px.png"));
+
         /* Update tool-tip: */
         setToolTip(strToolTip.arg(strFullData));
         /* Update indicator state: */
-        setState(fAdaptersPresent ? KDeviceActivity_Idle : KDeviceActivity_Null);
+        setState(fAdaptersPresent && !fCablesDisconnected ? KDeviceActivity_Idle : KDeviceActivity_Null);
     }