Changeset 4202 in vbox

Timestamp:

Aug 17, 2007 11:34:46 AM (17 years ago)

Author:

vboxsync

Message:

Network & USB ToolTip classes were removed from ConsoleWnd.
Call-back notifications are used for tool-tip updates reason now.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• include/VBoxConsoleWnd.h (modified) (3 diffs)
• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (8 diffs)
• src/VBoxConsoleWnd.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -98 +98 @@
     void additionsStateChanged (const QString &, bool, bool);
     void mediaChanged (VBoxDefs::DiskType aType);
+    void networkStateChange();
+    void usbStateChange();
     void sharedFoldersChanged();
 

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

@@ -48 +48 @@
 class VBoxUSBMenu;
 class VBoxSwitchMenu;
-class VBoxUSBLedTip;
-class VBoxNetworkLedTip;
 
 class VBoxConsoleWnd : public QMainWindow
@@ -170 +168 @@
     void updateMouseState (int state);
     void updateAdditionsState (const QString&, bool, bool);
+    void updateNetworkAdarptersState();
+    void updateUsbState();
     void updateMediaState (VBoxDefs::DiskType aType);
     void updateSharedFoldersState();
@@ -272 +272 @@
     QHBox *hostkey_hbox;
     QLabel *hostkey_name;
-
-    VBoxUSBLedTip *mUsbLedTip;
-    VBoxNetworkLedTip *mNetworkLedTip;
 
     QTimer *idle_timer;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -134 +134 @@
         SessionStateChangeEventType,
         SnapshotEventType,
+        NetworkAdapterChangeEventType,
+        USBCtlStateChangeEventType,
         USBDeviceStateChangeEventType,
         SharedFolderChangeEventType,

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

@@ -250 +250 @@
         : QEvent ((QEvent::Type) VBoxDefs::MediaChangeEventType)
         , mType (aType) {}
-    VBoxDefs::DiskType type() const { return mType; }
+    VBoxDefs::DiskType diskType() const { return mType; }
 private:
     VBoxDefs::DiskType mType;
@@ -300 +300 @@
 };
 
+/** Network adapter change event */
+class NetworkAdapterChangeEvent : public QEvent
+{
+public:
+    NetworkAdapterChangeEvent (INetworkAdapter *aAdapter) :
+        QEvent ((QEvent::Type) VBoxDefs::NetworkAdapterChangeEventType),
+        mAdapter (aAdapter) {}
+    INetworkAdapter* networkAdapter() { return mAdapter; }
+private:
+    INetworkAdapter *mAdapter;
+};
+
+/** USB controller state change event */
+class USBControllerStateChangeEvent : public QEvent
+{
+public:
+    USBControllerStateChangeEvent()
+        : QEvent ((QEvent::Type) VBoxDefs::USBCtlStateChangeEventType) {}
+};
+
 /** USB device state change event */
 class USBDeviceStateChangeEvent : public QEvent
@@ -432 +452 @@
     STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
     {
+        QApplication::postEvent (mView,
+            new NetworkAdapterChangeEvent (aNetworkAdapter));
         return S_OK;
     }
@@ -452 +474 @@
     STDMETHOD(OnUSBControllerChange)()
     {
+        QApplication::postEvent (mView,
+                                 new USBControllerStateChangeEvent());
         return S_OK;
     }
@@ -1000 +1024 @@
 
                 /* report to the VM thread that we finished resizing */
-                cconsole.GetDisplay().ResizeCompleted(0);
+                cconsole.GetDisplay().ResizeCompleted (0);
 
                 mIgnoreMainwndResize = oldIgnoreMainwndResize;
@@ -1109 +1133 @@
                 LogFlowFunc (("MediaChangeEvent\n"));
 
-                emit mediaChanged (mce->type());
+                emit mediaChanged (mce->diskType());
                 return true;
             }
@@ -1133 +1157 @@
             }
 
+            case VBoxDefs::NetworkAdapterChangeEventType:
+            {
+                /* no specific adapter information stored in this
+                 * event is currently used */
+                emit networkStateChange();
+                return true;
+            }
+
+            case VBoxDefs::USBCtlStateChangeEventType:
+            {
+                emit usbStateChange();
+                return true;
+            }
+
             case VBoxDefs::USBDeviceStateChangeEventType:
             {
@@ -1151 +1189 @@
                 }
 
+                emit usbStateChange();
                 /// @todo update menu entries
 

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

@@ -52 +52 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
-
-/** class VBoxUSBLedTip
- *
- *  The VBoxUSBLedTip class is an auxiliary ToolTip class
- *  for the USB LED indicator.
- */
-class VBoxUSBLedTip : public QToolTip
-{
-public:
-
-    VBoxUSBLedTip (QWidget *aWidget, const CConsole &aConsole, bool aUSBEnabled) :
-        QToolTip (aWidget), mConsole (aConsole), mUSBEnabled (aUSBEnabled) {}
-
-    ~VBoxUSBLedTip() { remove (parentWidget()); }
-
-    bool isUSBEnabled() const { return mUSBEnabled; }
-
-protected:
-
-    void maybeTip (const QPoint &/* aPoint */)
-    {
-        QString ttip = VBoxConsoleWnd::tr (
-            "<qt><nobr>Indicates the activity of "
-            "attached USB devices:</nobr>"
-            "%1</qt>",
-            "USB device indicator");
-
-        QString info;
-
-        if (mUSBEnabled)
-        {
-            CUSBDeviceEnumerator en = mConsole.GetUSBDevices().Enumerate();
-            while (en.HasMore())
-            {
-                CUSBDevice usb = en.GetNext();
-                info += QString ("<br><b><nobr>%1</nobr></b>")
-                                    .arg (vboxGlobal().details (usb));
-            }
-            if (info.isNull())
-                info = VBoxConsoleWnd::tr ("<br><nobr><b>No USB devices attached</b></nobr>",
-                                           "USB device indicator");
-        }
-        else
-            info = VBoxConsoleWnd::tr ("<br><nobr><b>USB Controller is disabled</b></nobr>",
-                                       "USB device indicator");
-
-        tip (parentWidget()->rect(), ttip.arg (info));
-    }
-
-private:
-
-    CConsole mConsole;
-    bool mUSBEnabled;
-};
-
-/** class VBoxNetworkLedTip
- *
- *  The VBoxNetworkLedTip class is an auxiliary ToolTip class
- *  for the Network LED indicator.
- */
-class VBoxNetworkLedTip : public QToolTip
-{
-public:
-
-    VBoxNetworkLedTip (QWidget *aWidget, const CMachine &aMachine) :
-        QToolTip (aWidget), mMachine (aMachine) {}
-
-    ~VBoxNetworkLedTip() { remove (parentWidget()); }
-
-protected:
-
-    void maybeTip (const QPoint &/* aPoint */)
-    {
-        QString ttip = VBoxConsoleWnd::tr (
-            "<qt><nobr>Indicates the activity of the network interfaces:</nobr>"
-            "%1</qt>",
-            "Network adapters indicator");
-
-        QString info;
-
-        ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
-        for (ulong slot = 0; slot < count; ++ slot)
-        {
-            CNetworkAdapter adapter = mMachine.GetNetworkAdapter (slot);
-            if (adapter.GetEnabled())
-                info += VBoxConsoleWnd::tr ("<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>",
-                                            "Network adapters indicator")
-                    .arg (slot)
-                    .arg (vboxGlobal().toString (adapter.GetAttachmentType()))
-                    .arg (adapter.GetCableConnected() ?
-                          VBoxConsoleWnd::tr ("connected", "Network adapters indicator") :
-                          VBoxConsoleWnd::tr ("disconnected", "Network adapters indicator"));
-        }
-
-        if (info.isNull())
-            info = VBoxConsoleWnd::tr ("<br><nobr><b>All network adapters are disabled</b></nobr>",
-                                       "Network adapters indicator");
-
-        tip (parentWidget()->rect(), ttip.arg (info));
-    }
-
-private:
-
-    CMachine mMachine;
-};
 
 /** class StatusTipEvent
@@ -209 +104 @@
 #endif
     , console (0)
-    , mUsbLedTip (0)
-    , mNetworkLedTip (0)
     , machine_state (CEnums::InvalidMachineState)
     , no_auto_close (false)
@@ -660 +553 @@
 VBoxConsoleWnd::~VBoxConsoleWnd()
 {
-    if (mUsbLedTip)
-        delete mUsbLedTip;
-    if (mNetworkLedTip)
-        delete mNetworkLedTip;
 #ifdef Q_WS_MAC
     /* release the dock images */
@@ -816 +705 @@
         usb_light->setState (isUSBEnabled ? CEnums::DeviceIdle
                                           : CEnums::InvalidActivity);
-        mUsbLedTip = new VBoxUSBLedTip (usb_light, cconsole, isUSBEnabled);
-    }
-
-    /* initialize network stuff */
-    mNetworkLedTip = new VBoxNetworkLedTip (net_light, cmachine);
+    }
 
     /* initialize vrdp stuff */
@@ -858 +743 @@
     connect (console, SIGNAL (mediaChanged (VBoxDefs::DiskType)),
              this, SLOT (updateMediaState (VBoxDefs::DiskType)));
+    connect (console, SIGNAL (usbStateChange()),
+             this, SLOT (updateUsbState()));
+    connect (console, SIGNAL (networkStateChange()),
+             this, SLOT (updateNetworkAdarptersState()));
     connect (console, SIGNAL (sharedFoldersChanged()),
              this, SLOT (updateSharedFoldersState()));
@@ -1698 +1587 @@
         net_light->setState (count > 0 ? CEnums::DeviceIdle
                                          : CEnums::InvalidActivity);
+
+        /* update tooltip */
+        QString ttip = VBoxConsoleWnd::tr (
+            "<qt><nobr>Indicates the activity of the network interfaces:</nobr>"
+            "%1</qt>",
+            "Network adapters indicator");
+        QString info;
+
+        for (ulong slot = 0; slot < maxCount; ++ slot)
+        {
+            CNetworkAdapter adapter = cmachine.GetNetworkAdapter (slot);
+            if (adapter.GetEnabled())
+                info += VBoxConsoleWnd::tr ("<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>",
+                                            "Network adapters indicator")
+                    .arg (slot)
+                    .arg (vboxGlobal().toString (adapter.GetAttachmentType()))
+                    .arg (adapter.GetCableConnected() ?
+                          VBoxConsoleWnd::tr ("connected", "Network adapters indicator") :
+                          VBoxConsoleWnd::tr ("disconnected", "Network adapters indicator"));
+        }
+
+        if (info.isNull())
+            info = VBoxConsoleWnd::tr ("<br><nobr><b>All network adapters are disabled</b></nobr>",
+                                       "Network adapters indicator");
+
+        QToolTip::add (net_light, ttip.arg (info));
     }
     if (element & USBStuff)
@@ -1703 +1618 @@
         /// @todo (r=dmik) do we really need to disable the control while
         //  in Pause? Check the same for CD/DVD above.
-        if (mUsbLedTip && mUsbLedTip->isUSBEnabled())
+        if (!usb_light->isHidden())
+        {
             devicesUSBMenu->setEnabled (machine_state == CEnums::Running);
+
+            /* update tooltip */
+            QString ttip = VBoxConsoleWnd::tr (
+                "<qt><nobr>Indicates the activity of "
+                "attached USB devices:</nobr>"
+                "%1</qt>",
+                "USB device indicator");
+            QString info;
+
+            if (cmachine.GetUSBController().GetEnabled())
+            {
+                CUSBDeviceEnumerator en = cconsole.GetUSBDevices().Enumerate();
+                while (en.HasMore())
+                {
+                    CUSBDevice usb = en.GetNext();
+                    info += QString ("<br><b><nobr>%1</nobr></b>")
+                                     .arg (vboxGlobal().details (usb));
+                }
+                if (info.isNull())
+                    info = VBoxConsoleWnd::tr ("<br><nobr><b>No USB devices attached</b></nobr>",
+                                               "USB device indicator");
+            }
+            else
+                info = VBoxConsoleWnd::tr ("<br><nobr><b>USB Controller is disabled</b></nobr>",
+                                           "USB device indicator");
+
+            QToolTip::add (usb_light, ttip.arg (info));
+        }
     }
     if (element & VRDPStuff)
@@ -2942 +2886 @@
 }
 
+void VBoxConsoleWnd::updateUsbState()
+{
+    updateAppearanceOf (USBStuff);
+}
+
+void VBoxConsoleWnd::updateNetworkAdarptersState()
+{
+    updateAppearanceOf (NetworkStuff);
+}
+
 /**
  *  Helper to safely close the main console window.