Ticket #9: tooltip.patch

BOINCTaskBar.cpp

@@ -88 +88 @@
     m_bTaskbarInitiatedShutdown = false;
 
     m_dtLastHoverDetected = wxDateTime((time_t)0);
-    m_dtLastBalloonDisplayed = wxDateTime((time_t)0);
 
     m_bMouseButtonPressed = false;
 
@@ -303 +302 @@
 
 
 void CTaskBarIcon::OnMouseMove(wxTaskBarIconEvent& WXUNUSED(event)) {
-    wxTimeSpan ts(wxDateTime::Now() - m_dtLastHoverDetected);
-    if (ts.GetSeconds() >= 10) {
-        m_dtLastHoverDetected = wxDateTime::Now();
-    }
 
     wxTimeSpan tsLastHover(wxDateTime::Now() - m_dtLastHoverDetected);
-    wxTimeSpan tsLastBalloon(wxDateTime::Now() - m_dtLastBalloonDisplayed);
-    if ((tsLastHover.GetSeconds() >= 2) && (tsLastBalloon.GetSeconds() >= 10)) {
-        m_dtLastBalloonDisplayed = wxDateTime::Now();
 
+    if (tsLastHover.GetSeconds() >= 2) {
+        m_dtLastHoverDetected = wxDateTime::Now();
+
         CMainDocument* pDoc                 = wxGetApp().GetDocument();
         CSkinAdvanced* pSkinAdvanced        = wxGetApp().GetSkinManager()->GetAdvanced();
         wxString       strTitle             = wxEmptyString;
@@ -340 +335 @@
 
         if (pDoc->IsConnected()) {
             pDoc->GetConnectedComputerName(strMachineName);
-            if (pDoc->IsComputerNameLocal(strMachineName)) {
-                strMachineName = wxT("localhost");
+            if (!pDoc->IsComputerNameLocal(strMachineName)) {
+                strTitle = strTitle + wxT(" - (") + strMachineName + wxT(")");
             }
-            strTitle = strTitle + wxT(" - (") + strMachineName + wxT(")");
 
+                        strMessage += strTitle;
+
             pDoc->GetCoreClientStatus(status);
             if (status.task_suspend_reason && !(status.task_suspend_reason & SUSPEND_REASON_CPU_USAGE_LIMIT)) {
                 // 1st %s is the previous instance of the message
                 // 2nd %s is the project name
                 //    i.e. 'BOINC', 'GridRepublic'
                 strBuffer.Printf(
-                    _("%s is currently suspended...\n"),
+                    _("\n%s is currently suspended..."),
                     pSkinAdvanced->GetProjectName().c_str()
                 );
                 iconIcon = m_iconTaskBarSnooze;
@@ -363 +359 @@
                 // 2nd %s is the project name
                 //    i.e. 'BOINC', 'GridRepublic'
                 strBuffer.Printf(
-                    _("%s networking is currently suspended...\n"),
+                    _("\n%s networking is currently suspended..."),
                     pSkinAdvanced->GetProjectName().c_str()
                 );
                 strMessage += strBuffer;
             }
 
-            if (strMessage.Length() > 0) {
-                strMessage += wxT("\n");
-            }
+            //if (strMessage.Length() > 0) {
+            //    strMessage += wxT("\n");
+            //}
 
             iResultCount = pDoc->GetWorkCount();
             for (iIndex = 0; iIndex < iResultCount; iIndex++) {
@@ -393 +389 @@
                     fProgress = floor(result->fraction_done*10000)/100;
                 }
 
-                strBuffer.Printf(wxT("%s: %.2f%%\n"), strProjectName.c_str(), fProgress );
+                strBuffer.Printf(wxT("\n%s: %.2f%%"), strProjectName.c_str(), fProgress );
                 strMessage += strBuffer;
             }
         } else if (pDoc->IsReconnecting()) {
@@ -403 +399 @@
             // 3rd %s is the project name
             //    i.e. 'BOINC', 'GridRepublic'
             strBuffer.Printf(
-                _("%s is currently reconnecting to a %s client...\n"),
+                _("\n%s is currently reconnecting to a %s client..."),
                 pSkinAdvanced->GetApplicationName().c_str(),
                 pSkinAdvanced->GetProjectName().c_str()
             );
@@ -415 +411 @@
             // 3rd %s is the project name
             //    i.e. 'BOINC', 'GridRepublic'
             strBuffer.Printf(
-                _("%s is not currently connected to a %s client...\n"),
+                _("\n%s is not currently connected to a %s client..."),
                 pSkinAdvanced->GetApplicationName().c_str(),
                 pSkinAdvanced->GetProjectName().c_str()
             );
@@ -423 +419 @@
             strMessage += strBuffer;
         }
 
-        SetBalloon(iconIcon, strTitle, strMessage);
+        SetTooltip(strMessage);
     }
 }
 
@@ -480 +476 @@
     SetIcon(m_iconTaskBarNormal, wxT(""));
 #endif
 
-    m_dtLastBalloonDisplayed = wxDateTime::Now();
 }
 
 

BOINCTaskBar.h

@@ -81 +81 @@
 
 private:
     wxDateTime m_dtLastHoverDetected;
-    wxDateTime m_dtLastBalloonDisplayed;
 
     wxTimer*   m_pRefreshTimer;
 

msw/taskbarex.cpp

@@ -186 +186 @@
     }
 }
 
+bool wxTaskBarIconEx::SetTooltip(const wxString tip)
+{
+        if (!IsOK())
+            return false;
+
+    memset(&notifyData, 0, sizeof(notifyData));
+    notifyData.cbSize           = sizeof(notifyData);
+    notifyData.hWnd             = (HWND) m_hWnd;
+    notifyData.uID              = 99;
+    notifyData.uCallbackMessage = sm_taskbarMsg;
+    notifyData.uFlags           = NIF_TIP;
+    notifyData.uVersion         = NOTIFYICON_VERSION;
+
+    lstrcpyn(notifyData.szTip, WXSTRINGCAST tip, sizeof(notifyData.szTip));
+
+    if (m_iconAdded)
+        return (Shell_NotifyIcon(NIM_MODIFY, & notifyData) != 0);
+    else
+    {
+        m_iconAdded = (Shell_NotifyIcon(NIM_ADD, & notifyData) != 0);
+        if (IsBalloonsSupported())
+            Shell_NotifyIcon(NIM_SETVERSION, &notifyData);
+        return m_iconAdded;
+    }
+}
+
+
 bool wxTaskBarIconEx::RemoveIcon(void)
 {
     if (!m_iconAdded)

msw/taskbarex.h

@@ -57 +57 @@
         unsigned int iconballoon = NIIF_INFO
     );
 
+        bool SetTooltip(const wxString tip);
+
     bool RemoveIcon();
 
     bool PopupMenu(wxMenu *menu); //, int x, int y);