Changeset 4201 in vbox

Timestamp:

Aug 17, 2007 9:52:37 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Refined indicator tooltips in the console window (+ more useful info for the shared folders indicator).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• include/VBoxConsoleWnd.h (modified) (2 diffs)
• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (15 diffs)
• src/VBoxGlobal.cpp (modified) (4 diffs)

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

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

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

@@ -112 +112 @@
         USBStuff                    = 0x80,
         VRDPStuff                   = 0x100,
-        AllStuff                    = 0xFF,
+        SharedFolderStuff           = 0x200,
+        AllStuff                    = 0xFFFF,
     };
 
@@ -167 +168 @@
     void updateDeviceLights();
     void updateMachineState (CEnums::MachineState state);
-
     void updateMouseState (int state);
-
     void updateAdditionsState (const QString&, bool, bool);
-
     void updateMediaState (VBoxDefs::DiskType aType);
+    void updateSharedFoldersState();
 
     void tryClose();

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

@@ -135 +135 @@
         SnapshotEventType,
         USBDeviceStateChangeEventType,
+        SharedFolderChangeEventType,
         RuntimeErrorEventType,
         ModifierKeyChangeEventType,

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

@@ -385 +385 @@
 
     /* public static stuff */
+
+    static bool isDOSType (const QString &aOSTypeId);
 
     static void adoptLabelPixmap (QLabel *);

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

@@ -468 +468 @@
     STDMETHOD(OnSharedFolderChange) (Scope_T aScope)
     {
+        QApplication::postEvent (mView,
+                                 new QEvent ((QEvent::Type)
+                                             VBoxDefs::SharedFolderChangeEventType));
         return S_OK;
     }
@@ -1150 +1153 @@
                 /// @todo update menu entries
 
+                return true;
+            }
+
+            case VBoxDefs::SharedFolderChangeEventType:
+            {
+                emit sharedFoldersChanged();
                 return true;
             }

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

@@ -73 +73 @@
     void maybeTip (const QPoint &/* aPoint */)
     {
-        QString toolTip = VBoxConsoleWnd::tr (
-            "<qt>Indicates&nbsp;the&nbsp;activity&nbsp;of&nbsp;"
-            "attached&nbsp;USB&nbsp;devices<br>"
+        QString ttip = VBoxConsoleWnd::tr (
+            "<qt><nobr>Indicates the activity of "
+            "attached USB devices:</nobr>"
             "%1</qt>",
             "USB device indicator");
 
-        QString devices;
+        QString info;
 
         if (mUSBEnabled)
@@ -87 +87 @@
             {
                 CUSBDevice usb = en.GetNext();
-                devices += QString ("[<b><nobr>%1</nobr></b>]<br>")
+                info += QString ("<br><b><nobr>%1</nobr></b>")
                                     .arg (vboxGlobal().details (usb));
             }
-            if (devices.isNull())
-                devices = VBoxConsoleWnd::tr ("<nobr>[<b>not attached</b>]</nobr>",
-                                              "USB device indicator");
+            if (info.isNull())
+                info = VBoxConsoleWnd::tr ("<br><nobr><b>No USB devices attached</b></nobr>",
+                                           "USB device indicator");
         }
         else
-            devices = VBoxConsoleWnd::tr ("<nobr>[<b>USB Controller is disabled</b>]</nobr>",
-                                          "USB device indicator");
-
-        tip (parentWidget()->rect(), toolTip.arg (devices));
+            info = VBoxConsoleWnd::tr ("<br><nobr><b>USB Controller is disabled</b></nobr>",
+                                       "USB device indicator");
+
+        tip (parentWidget()->rect(), ttip.arg (info));
     }
 
@@ -125 +125 @@
     void maybeTip (const QPoint &/* aPoint */)
     {
-        QString toolTip = VBoxConsoleWnd::tr (
-            "<qt>Indicates&nbsp;the&nbsp;activity&nbsp;of&nbsp;the&nbsp;network&nbsp;interfaces",
-            "Network adapters indicator"
-        );
-
-        QString devices;
+        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();
@@ -137 +137 @@
             CNetworkAdapter adapter = mMachine.GetNetworkAdapter (slot);
             if (adapter.GetEnabled())
-                devices += VBoxConsoleWnd::tr ("<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>",
-                                               "Network adapters indicator")
+                info += VBoxConsoleWnd::tr ("<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>",
+                                            "Network adapters indicator")
                     .arg (slot)
                     .arg (vboxGlobal().toString (adapter.GetAttachmentType()))
@@ -146 +146 @@
         }
 
-        if (devices.isNull())
-            devices = VBoxConsoleWnd::tr ("<br><nobr><b>All network adapters are disabled</b></nobr>",
-                                          "Network adapters indicator");
-
-        tip (parentWidget()->rect(), toolTip + devices);
+        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));
     }
 
@@ -858 +858 @@
     connect (console, SIGNAL (mediaChanged (VBoxDefs::DiskType)),
              this, SLOT (updateMediaState (VBoxDefs::DiskType)));
+    connect (console, SIGNAL (sharedFoldersChanged()),
+             this, SLOT (updateSharedFoldersState()));
 
 #ifdef Q_WS_MAC
@@ -1543 +1545 @@
     QToolTip::add (hostkey_state,
         tr ("Indicates whether the keyboard is captured by the guest OS "
-            "(<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)"));
+            "(<img src=hostkey_captured_16px.png/>) or not (<img src=hostkey_16px.png/>)."));
     QToolTip::add (hostkey_name,
         tr ("Shows the currently assigned Host key.<br>"
             "This key, when pressed alone, toggles the the keyboard and mouse "
             "capture state. It can also be used in combination with other keys "
-            "to quickly perform actions from the main menu." ));
-    QToolTip::add (sf_light,
-/// @todo add later, when activity is actually reported
-//        tr ("Indicates the activity of shared folders."));
-        tr ("Provides quick access to shared folders (by a right mouse button click).<br>"
-            "Note that the shared folders feature requires Guest Additions to be installed in the guest OS."));
+            "to quickly perform actions from the main menu."));
 
     updateAppearanceOf (AllStuff);
@@ -1586 +1583 @@
         devicesUnmountFloppyAction->setEnabled (machine_state == CEnums::Running && mounted);
         fd_light->setState (mounted ? CEnums::DeviceIdle : CEnums::InvalidActivity);
-        QString tip = tr (
-            "<qt>Indicates&nbsp;the&nbsp;activity&nbsp;of&nbsp;the&nbsp;floppy&nbsp;media"
-            "<br>[<b>%1</b>]</qt>"
-        );
+        QString tip = tr ("<qt><nobr>Indicates the activity of the floppy media:</nobr>"
+                          "%1</qt>",
+                          "Floppy tooltip");
         QString name;
         switch (state)
@@ -1600 +1596 @@
                 QString fullName = description.isEmpty() ?
                     drvName :
-                    QString ("<nobr>%1 (%2)</nobr>").arg (description, drvName);
-                name = tr ("Host&nbsp;Drive&nbsp;", "Floppy tooltip") +
-                    fullName;
+                    QString ("%1 (%2)").arg (description, drvName);
+                name = tr ("<br><nobr><b>Host Drive</b>: %1</nobr>",
+                           "Floppy tooltip").arg (fullName);
                 break;
             }
             case CEnums::ImageMounted:
-                name = floppy.GetImage().GetFilePath();
+            {
+                name = tr ("<br><nobr><b>Image</b>: %1</nobr>",
+                           "Floppy tooltip")
+                    .arg (QDir::convertSeparators (floppy.GetImage().GetFilePath()));
                 break;
+            }
             case CEnums::NotMounted:
-                name = tr ("not&nbsp;mounted", "Floppy tooltip");
+            {
+                name = tr ("<br><nobr><b>No media mounted</b></nobr>",
+                           "Floppy tooltip");
                 break;
+            }
             default:
                 AssertMsgFailed (("Invalid floppy drive state: %d\n", state));
@@ -1624 +1627 @@
         devicesUnmountDVDAction->setEnabled (machine_state == CEnums::Running && mounted);
         cd_light->setState (mounted ? CEnums::DeviceIdle : CEnums::InvalidActivity);
-        QString tip = tr (
-            "<qt>Indicates&nbsp;the&nbsp;activity&nbsp;of&nbsp;the&nbsp;CD/DVD-ROM&nbsp;media"
-            "<br>[<b>%1</b>]</qt>"
-        );
+        QString tip = tr ("<qt><nobr>Indicates the activity of the CD/DVD-ROM media:</nobr>"
+                          "%1</qt>",
+                          "DVD-ROM tooltip");
         QString name;
         switch (state)
@@ -1638 +1640 @@
                 QString fullName = description.isEmpty() ?
                     drvName :
-                    QString ("<nobr>%1 (%2)</nobr>").arg (description, drvName);
-                name = tr ("Host&nbsp;Drive&nbsp;", "DVD-ROM tooltip") +
-                    fullName;
+                    QString ("%1 (%2)").arg (description, drvName);
+                name = tr ("<br><nobr><b>Host Drive</b>: %1</nobr>",
+                           "DVD-ROM tooltip").arg (fullName);
                 break;
             }
             case CEnums::ImageMounted:
             {
-                name = dvd.GetImage().GetFilePath();
+                name = tr ("<br><nobr><b>Image</b>: %1</nobr>",
+                           "DVD-ROM tooltip")
+                    .arg (QDir::convertSeparators (dvd.GetImage().GetFilePath()));
                 break;
             }
             case CEnums::NotMounted:
             {
-                name = tr ("not&nbsp;mounted", "DVD-ROM tooltip");
+                name = tr ("<br><nobr><b>No media mounted</b></nobr>",
+                           "DVD-ROM tooltip");
                 break;
             }
             default:
-                AssertMsgFailed (("Invalid dvd drive state: %d\n", state));
+                AssertMsgFailed (("Invalid DVD drive state: %d\n", state));
         }
         QToolTip::add (cd_light, tip.arg (name));
@@ -1660 +1665 @@
     if (element & HardDiskStuff)
     {
-        QString info =
-            tr ("<qt>Indicates&nbsp;the&nbsp;activity&nbsp;of&nbsp;virtual&nbsp;hard&nbsp;disks");
-        const char *ctlNames[] = { "IDE0", "IDE1", "Controller%1" };
-        const char *devNames[] = { "Master", "Slave", "Device%1" };
+        QString tip = tr ("<qt><nobr>Indicates the activity of virtual hard disks:</nobr>"
+                          "%1</qt>",
+                          "HDD tooltip");
+        QString data;
         bool hasDisks = false;
         CHardDiskAttachmentEnumerator aen = cmachine.GetHardDiskAttachments().Enumerate();
-        while (aen.HasMore()) {
+        while (aen.HasMore())
+        {
             CHardDiskAttachment hda = aen.GetNext();
-            QString ctl, dev;
-            switch (hda.GetController()) {
-                case CEnums::IDE0Controller:
-                    ctl = ctlNames[0];
-                    break;
-                case CEnums::IDE1Controller:
-                    ctl = ctlNames[1];
-                    break;
-                default:
-                    break;
-            }
-            if (!ctl.isNull()) {
-                dev = devNames[hda.GetDeviceNumber()];
-            } else {
-                ctl = QString (ctlNames[2]).arg (hda.GetController());
-                dev = QString (devNames[2]).arg (hda.GetDeviceNumber());
-            }
             CHardDisk hd = hda.GetHardDisk();
-            info += QString ("<br>[%1&nbsp;%2:&nbsp;<b>%3</b>]")
-                .arg (ctl).arg (dev)
-                .arg (hd.GetLocation().replace (' ', "&nbsp;"));
+            data += QString ("<br><nobr><b>%1 %2</b>: %3</nobr>")
+                .arg (vboxGlobal().toString (hda.GetController()))
+                .arg (vboxGlobal().toString (hda.GetController(),
+                                hda.GetDeviceNumber()))
+                .arg (QDir::convertSeparators (hd.GetLocation()));
             hasDisks = true;
         }
         if (!hasDisks)
-            info += tr ("<br>[<b>not attached</b>]", "HDD tooltip");
-        info += "</qt>";
-        QToolTip::add (hd_light, info);
+            data += tr ("<br><nobr><b>No hard disks attached</b></nobr>",
+                        "HDD tooltip");
+        QToolTip::add (hd_light, tip.arg (data));
         hd_light->setState (hasDisks ? CEnums::DeviceIdle : CEnums::InvalidActivity);
     }
@@ -1730 +1721 @@
         QString tip = tr ("Indicates whether the Remote Display (VRDP Server) "
                           "is enabled (<img src=vrdp_16px.png/>) or not "
-                          "(<img src=vrdp_disabled_16px.png/>)"
+                          "(<img src=vrdp_disabled_16px.png/>)."
         );
         if (vrdpsrv.GetEnabled())
@@ -1736 +1727 @@
         QToolTip::add (vrdp_state, tip);
 #endif
+    }
+    if (element & SharedFolderStuff)
+    {
+        QString tip = tr ("<qt><nobr>Indicates the activity of shared folders:</nobr>"
+                          "%1</qt>",
+                          "Shared folders tooltip");
+
+        QString data;
+        QMap <QString, QString> sfs;
+
+        /// @todo later: add global folders
+
+        /* permanent folders */
+        CSharedFolderEnumerator en = cmachine.GetSharedFolders().Enumerate();
+        while (en.HasMore())
+        {
+            CSharedFolder sf = en.GetNext();
+            sfs.insert (sf.GetName(), sf.GetHostPath());
+        }
+        /* transient folders */
+        en = cconsole.GetSharedFolders().Enumerate();
+        while (en.HasMore())
+        {
+            CSharedFolder sf = en.GetNext();
+            sfs.insert (sf.GetName(), sf.GetHostPath());
+        }
+
+        for (QMap <QString, QString>::ConstIterator it = sfs.begin();
+             it != sfs.end(); ++ it)
+        {
+            /* select slashes depending on the OS type */
+            if (VBoxGlobal::isDOSType (cconsole.GetGuest().GetOSTypeId()))
+                data += QString ("<tr><td><nobr><b>\\\\vboxsvr\\%1</b></nobr></td>"
+                                 "<td><nobr>%2</nobr></td>")
+                    .arg (it.key(), it.data());
+            else
+                data += QString ("<tr><td><nobr><b>%1</b></nobr></td>"
+                                 "<td><nobr>%2</nobr></td></tr>")
+                    .arg (it.key(), it.data());
+        }
+
+        if (sfs.count() == 0)
+            data = tr ("<br><nobr><b>No shared folders</b></nobr>",
+                       "Shared folders tooltip");
+        else
+            data = QString ("<br><table border=0 cellspacing=0 cellpadding=0 "
+                            "width=100%>%1</table>").arg (data);
+
+        QToolTip::add (sf_light, tip.arg (data));
     }
     if (element & PauseAction)
@@ -2897 +2937 @@
 }
 
+void VBoxConsoleWnd::updateSharedFoldersState()
+{
+    updateAppearanceOf (SharedFolderStuff);
+}
+
 /**
  *  Helper to safely close the main console window.

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

@@ -912 +912 @@
 {
     QString details;
-    QString m = aDevice.GetManufacturer();
-    QString p = aDevice.GetProduct();
+    QString m = aDevice.GetManufacturer().stripWhiteSpace();
+    QString p = aDevice.GetProduct().stripWhiteSpace();
     if (m.isEmpty() && p.isEmpty())
+    {
         details =
             tr ("Unknown device %1:%2", "USB device details")
             .arg (QString().sprintf ("%04hX", aDevice.GetVendorId()))
             .arg (QString().sprintf ("%04hX", aDevice.GetProductId()));
+    }
     else
-        details = m + " " + p;
+    {
+        if (p.upper().startsWith (m.upper()))
+            details = p;
+        else
+            details = m + " " + p;
+    }
     ushort r = aDevice.GetRevision();
     if (r != 0)
@@ -1338 +1345 @@
 
                 if (srv.GetEnabled())
-                {
                     item = QString (sSectionItemTpl)
                         .arg (tr ("VRDP Server Port", "details report (VRDP)"),
                               tr ("%1", "details report (VRDP)")
                                   .arg (srv.GetPort()));
-                }
                 else
                     item = QString (sSectionItemTpl)
@@ -1355 +1360 @@
                           item); /* items */
             }
+        }
+        /* Shared folders */
+        {
+            ulong count = m.GetSharedFolders().GetCount();
+            if (count > 0)
+            {
+                item = QString (sSectionItemTpl)
+                    .arg (tr ("Shared Folders", "details report (shared folders)"),
+                          tr ("%1", "details report (shadef folders)")
+                              .arg (count));
+            }
+            else
+                item = QString (sSectionItemTpl)
+                    .arg (tr ("None", "details report (shared folders)"), "");
+
+            detailsReport += sectionTpl
+                .arg (2 + 1) /* rows */
+                .arg ("shared_folder_16px.png", /* icon */
+                      "#sfolders", /* link */
+                      tr ("Shared Folders", "details report"), /* title */
+                      item); /* items */
         }
     }
@@ -1903 +1929 @@
 ////////////////////////////////////////////////////////////////////////////////
 
+/* static */
+bool VBoxGlobal::isDOSType (const QString &aOSTypeId)
+{
+    if (aOSTypeId.left (3) == "dos" ||
+        aOSTypeId.left (3) == "win" ||
+        aOSTypeId.left (3) == "os2")
+        return true;
+
+    return false;
+}
+
 /**
  *  Sets the QLabel background and frame colors according tho the pixmap