Changeset 29015 in vbox

Timestamp:

May 4, 2010 1:30:16 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: 4865: HD, CD, FD device LEDs are now synchronized with device presence.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIIndicatorsPool.cpp (modified) (8 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (4 diffs)

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

@@ -57 +57 @@
 
         QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
-                                "of the virtual hard disks:</nobr>%1</p>", "HDD tooltip");
+                                                     "of the virtual hard disks:</nobr>%1</p>", "HDD tooltip");
 
         QString strFullData;
-        bool bAttachmentsPresent = false;
+        bool fAttachmentsPresent = false;
 
         const CStorageControllerVector &controllers = machine.GetStorageControllers();
@@ -74 +74 @@
                     .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg(VBoxMedium(attachment.GetMedium(), VBoxDefs::MediumType_HardDisk).location());
-                bAttachmentsPresent = true;
+                fAttachmentsPresent = true;
             }
             if (!strAttData.isNull())
@@ -80 +80 @@
         }
 
-        if (!bAttachmentsPresent)
-            strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No hard disks attached</b></nobr>", "HDD tooltip");
+        /* For now we will hide that LED at all if there are no attachments! */
+        setHidden(!fAttachmentsPresent);
+        //if (!fAttachmentsPresent)
+        //    strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No hard disks attached</b></nobr>", "HDD tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
-        setState(bAttachmentsPresent ? KDeviceActivity_Idle : KDeviceActivity_Null);
+        setState(fAttachmentsPresent ? KDeviceActivity_Idle : KDeviceActivity_Null);
     }
 
@@ -121 +123 @@
 
         QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
-                                "of the CD/DVD devices:</nobr>%1</p>", "CD/DVD tooltip");
+                                                     "of the CD/DVD devices:</nobr>%1</p>", "CD/DVD tooltip");
 
         QString strFullData;
-        bool bAttachmentsPresent = false;
+        bool fAttachmentsPresent = false;
+        bool fAttachmentsMounted = false;
 
         const CStorageControllerVector &controllers = machine.GetStorageControllers();
@@ -139 +142 @@
                     .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
                     .arg(vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
+                fAttachmentsPresent = true;
                 if (!vboxMedium.isNull())
-                    bAttachmentsPresent = true;
+                    fAttachmentsMounted = true;
             }
             if (!strAttData.isNull())
@@ -146 +150 @@
         }
 
-        if (strFullData.isNull())
-            strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No CD/DVD devices attached</b></nobr>", "CD/DVD tooltip");
+        /* For now we will hide that LED at all if there are no attachments! */
+        setHidden(!fAttachmentsPresent);
+        //if (!fAttachmentsPresent)
+        //    strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No CD/DVD devices attached</b></nobr>", "CD/DVD tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
-        setState(bAttachmentsPresent ? KDeviceActivity_Idle : KDeviceActivity_Null);
+        setState(fAttachmentsMounted ? KDeviceActivity_Idle : KDeviceActivity_Null);
     }
 
@@ -186 +192 @@
         const CMachine &machine = m_session.GetMachine();
 
-        QString tip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
-                          "of the floppy devices:</nobr>%1</p>", "FD tooltip");
-        QString data;
-        bool attachmentsPresent = false;
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
+                                                     "of the floppy devices:</nobr>%1</p>", "FD tooltip");
+
+        QString strFullData;
+        bool fAttachmentsPresent = false;
+        bool fAttachmentsMounted = false;
 
         const CStorageControllerVector &controllers = machine.GetStorageControllers();
         foreach (const CStorageController &controller, controllers)
         {
-            QString attData;
-            const CMediumAttachmentVector &attachments = machine.GetMediumAttachmentsOfController (controller.GetName());
+            QString strAttData;
+            const CMediumAttachmentVector &attachments = machine.GetMediumAttachmentsOfController(controller.GetName());
             foreach (const CMediumAttachment &attachment, attachments)
             {
                 if (attachment.GetType() != KDeviceType_Floppy)
                     continue;
-                VBoxMedium vboxMedium (attachment.GetMedium(), VBoxDefs::MediumType_Floppy);
-                attData += QString ("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
-                    .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
-                    .arg (vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
+                VBoxMedium vboxMedium(attachment.GetMedium(), VBoxDefs::MediumType_Floppy);
+                strAttData += QString("<br>&nbsp;<nobr>%1:&nbsp;%2</nobr>")
+                    .arg(vboxGlobal().toString(StorageSlot(controller.GetBus(), attachment.GetPort(), attachment.GetDevice())))
+                    .arg(vboxMedium.isNull() || vboxMedium.isHostDrive() ? vboxMedium.name() : vboxMedium.location());
+                fAttachmentsPresent = true;
                 if (!vboxMedium.isNull())
-                    attachmentsPresent = true;
+                    fAttachmentsMounted = true;
             }
-            if (!attData.isNull())
-                data += QString ("<br><nobr><b>%1</b></nobr>").arg (controller.GetName()) + attData;
-        }
-
-        if (data.isNull())
-            data = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No floppy devices attached</b></nobr>", "FD tooltip");
-
-        setToolTip (tip.arg (data));
-        setState (attachmentsPresent ? KDeviceActivity_Idle : KDeviceActivity_Null);
+            if (!strAttData.isNull())
+                strFullData += QString("<br><nobr><b>%1</b></nobr>").arg(controller.GetName()) + strAttData;
+        }
+
+        /* For now we will hide that LED at all if there are no attachments! */
+        setHidden(!fAttachmentsPresent);
+        //if (!fAttachmentsPresent)
+        //    strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No floppy devices attached</b></nobr>", "FD tooltip");
+
+        setToolTip(strToolTip.arg(strFullData));
+        setState(fAttachmentsMounted ? KDeviceActivity_Idle : KDeviceActivity_Null);
     }
 
@@ -666 +677 @@
                 m_IndicatorsPool[index] = new UIIndicatorOpticalDisks(m_session);
                 break;
+            case UIIndicatorIndex_FloppyDisks:
+                m_IndicatorsPool[index] = new UIIndicatorFloppyDisks(m_session);
+                break;
             case UIIndicatorIndex_NetworkAdapters:
                 m_IndicatorsPool[index] = new UIIndicatorNetworkAdapters(m_session);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -176 +176 @@
             pStateIndicator->setState(state);
     }
+    pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks);
+    if (pStateIndicator->state() != KDeviceActivity_Null)
+    {
+        int state = console.GetDeviceActivity(KDeviceType_Floppy);
+        if (pStateIndicator->state() != state)
+            pStateIndicator->setState(state);
+    }
     pStateIndicator = indicatorsPool()->indicator(UIIndicatorIndex_USBDevices);
     if (pStateIndicator->state() != KDeviceActivity_Null)
@@ -205 +212 @@
         if (machineLogic()->actionsPool()->action(UIActionIndex_Menu_OpticalDevices)->isEnabled())
             machineLogic()->actionsPool()->action(UIActionIndex_Menu_OpticalDevices)->menu()->exec(pEvent->globalPos());
+    }
+    else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks))
+    {
+        if (machineLogic()->actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->isEnabled())
+            machineLogic()->actionsPool()->action(UIActionIndex_Menu_FloppyDevices)->menu()->exec(pEvent->globalPos());
     }
     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_USBDevices))
@@ -256 +268 @@
     if (iElement & UIVisualElement_CDStuff)
         indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks)->updateAppearance();
+    if (iElement & UIVisualElement_FDStuff)
+        indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks)->updateAppearance();
     if (iElement & UIVisualElement_USBStuff &&
         !indicatorsPool()->indicator(UIIndicatorIndex_USBDevices)->isHidden())
@@ -379 +393 @@
             this, SLOT(sltShowIndicatorsContextMenu(QIStateIndicator*, QContextMenuEvent*)));
 
+    /* Floppy Disks: */
+    QIStateIndicator *pLedFloppyDisks = indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks);
+    pIndicatorBoxHLayout->addWidget(pLedFloppyDisks);
+    connect(pLedFloppyDisks, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
+            this, SLOT(sltShowIndicatorsContextMenu(QIStateIndicator*, QContextMenuEvent*)));
+
     /* USB Devices: */
     QIStateIndicator *pLedUSBDevices = indicatorsPool()->indicator(UIIndicatorIndex_USBDevices);