Changeset 4022 in vbox for trunk

Timestamp:

Aug 3, 2007 1:40:57 PM (17 years ago)

Author:

vboxsync

Message:

Update for shared folder LED

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (6 diffs)

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

@@ -754 +754 @@
     usb_light->setStateIcon (CEnums::DeviceWriting, QPixmap::fromMimeSource ("usb_write_16px.png"));
     usb_light->setStateIcon (CEnums::InvalidActivity, QPixmap::fromMimeSource ("usb_disabled_16px.png"));
-    /// @todo add proper read/write states for shared folders when it is implemented
-    sf_state = new QIStateIndicator (0, indicatorBox, "sf_state", WNoAutoErase);
-    sf_state->setStateIcon (0, QPixmap::fromMimeSource ("shared_folder_16px.png"));
-    sf_state->setStateIcon (1, QPixmap::fromMimeSource ("shared_folder_disabled_16px.png"));
+    /** @todo missing pictures for read & write shared folder states */
+    sf_light = new QIStateIndicator (CEnums::DeviceIdle, indicatorBox, "sf_light", WNoAutoErase);
+    sf_light->setStateIcon (CEnums::DeviceIdle, QPixmap::fromMimeSource ("shared_folder_16px.png"));
+    sf_light->setStateIcon (CEnums::DeviceReading, QPixmap::fromMimeSource ("shared_folder_read_16px.png"));
+    sf_light->setStateIcon (CEnums::DeviceWriting, QPixmap::fromMimeSource ("shared_folder_write_16px.png"));
+    sf_light->setStateIcon (CEnums::InvalidActivity, QPixmap::fromMimeSource ("shared_folder_disabled_16px.png"));
 
     (new QFrame (indicatorBox))->setFrameStyle (QFrame::VLine | QFrame::Sunken);
@@ -876 +878 @@
     connect (usb_light, SIGNAL (contextMenuRequested (QIStateIndicator *, QContextMenuEvent *)),
              this, SLOT (showIndicatorContextMenu (QIStateIndicator *, QContextMenuEvent *)));
-    connect (sf_state, SIGNAL (contextMenuRequested (QIStateIndicator *, QContextMenuEvent *)),
+    connect (sf_light, SIGNAL (contextMenuRequested (QIStateIndicator *, QContextMenuEvent *)),
              this, SLOT (showIndicatorContextMenu (QIStateIndicator *, QContextMenuEvent *)));
     connect (net_light, SIGNAL (contextMenuRequested (QIStateIndicator *, QContextMenuEvent *)),
@@ -1099 +1101 @@
         devicesSFDialogAction->setVisible (false);
         devicesMenu->setItemVisible (devicesSFMenuSeparatorId, false);
-        sf_state->setHidden (true);
+        sf_light->setHidden (true);
     }
 
@@ -1800 +1802 @@
             "capture state. It can also be used in combination with other keys "
             "to quickly perform actions from the main menu." ));
-    QToolTip::add (sf_state,
+    QToolTip::add (sf_light,
 /// @todo add later, when activity is actually reported
 //        tr ("Indicates the activity of shared folders."));
@@ -2906 +2908 @@
     }
     else
-    if (ind == sf_state)
+    if (ind == sf_light)
     {
         devicesSharedFolders->exec (e->globalPos());
@@ -2949 +2951 @@
             if (usb_light->state() != st)
                 usb_light->setState (st);
+        }
+        if (sf_light->state() != CEnums::InvalidActivity) {
+            st = cconsole.GetDeviceActivity (CEnums::SharedFolderDevice);
+            if (sf_light->state() != st)
+                sf_light->setState (st);
         }
     }