Changeset 97770 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Dec 9, 2022 11:51:14 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154837

Message:

DnD/VBoxTray: Made the Enter desktop notification (verbose mode only) a bit better to read.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -55 +55 @@
 
 #include <VBox/err.h>
+#include <VBox/version.h>
 
 
@@ -65 +66 @@
 /** @todo Merge this with messages from VBoxTray.h. */
 #define WM_VBOXTRAY_DND_MESSAGE       WM_APP + 401
+
+/** The notification header text for hlpShowBalloonTip(). */
+#define VBOX_DND_SHOWBALLOON_HEADER   VBOX_PRODUCT " Drag'n Drop"
 
 
@@ -840 +844 @@
         return rc;
 
-    if (g_cVerbosity)
-    {
-        RTCString strMsg("Enter: Host -> Guest\n\n");
-        strMsg += RTCStringFmt("Allowed actions: %#x\n", a_fDndLstActionsAllowed);
-        strMsg += "Formats:\n";
-        for (size_t i = 0; i < this->m_lstFmtSup.size(); i++)
-        {
-            if (i > 0)
-                strMsg += "\n";
-            strMsg += this->m_lstFmtSup.at(i);
-        }
-
-        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                          strMsg.c_str(), "VirtualBox Drag'n Drop",
-                          15 * 1000 /* Time to display in msec */, NIIF_INFO);
-    }
-
     /* Save all allowed actions. */
     this->m_lstActionsAllowed = a_fDndLstActionsAllowed;
@@ -924 +911 @@
     }
 
+    if (g_cVerbosity)
+    {
+        RTCString strMsg("Enter: Host -> Guest\n");
+        strMsg += RTCStringFmt("Allowed actions: ");
+        char *pszActions = DnDActionListToStrA(a_fDndLstActionsAllowed);
+        AssertPtrReturn(pszActions, VERR_NO_STR_MEMORY);
+        strMsg += pszActions;
+        RTStrFree(pszActions);
+        strMsg += "\nFormats: ";
+        for (size_t i = 0; i < this->m_lstFmtActive.size(); i++)
+        {
+            if (i > 0)
+                strMsg += ", ";
+            strMsg += this->m_lstFmtActive[i];
+        }
+
+        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                          strMsg.c_str(), VBOX_DND_SHOWBALLOON_HEADER,
+                          15 * 1000 /* Time to display in msec */, NIIF_INFO);
+    }
+
     /*
      * Warn in the log if this guest does not accept anything.
@@ -1045 +1053 @@
     if (g_cVerbosity)
         hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                          "Leave: Host -> Guest", "VirtualBox Drag'n Drop",
+                          "Leave: Host -> Guest", VBOX_DND_SHOWBALLOON_HEADER,
                           15 * 1000 /* Time to display in msec */, NIIF_INFO);
 
@@ -1072 +1080 @@
         if (g_cVerbosity)
             hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                              "Drop: Host -> Guest", "VirtualBox Drag'n Drop",
+                              "Drop: Host -> Guest", VBOX_DND_SHOWBALLOON_HEADER,
                               15 * 1000 /* Time to display in msec */, NIIF_INFO);
 
@@ -1374 +1382 @@
 
             hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
-                              strMsg.c_str(), "VirtualBox Drag'n Drop",
+                              strMsg.c_str(), VBOX_DND_SHOWBALLOON_HEADER,
                               15 * 1000 /* Time to display in msec */, NIIF_INFO);
         }
@@ -1912 +1920 @@
         hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
                           RTCStringFmt("Running (worker client ID %RU32)", pCtx->cmdCtx.uClientID).c_str(),
-                          "VirtualBox Drag'n Drop",
+                          VBOX_DND_SHOWBALLOON_HEADER,
                           15 * 1000 /* Time to display in msec */, NIIF_INFO);