Ticket #9: taskbar.patch

clientgui/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;
@@ -321 +316 @@
         wxString       strBuffer            = wxEmptyString;
         wxString       strProjectName       = wxEmptyString;
         float          fProgress            = 0;
-        bool           bIsActive            = false;
-        bool           bIsExecuting         = false;
-        bool           bIsDownloaded        = false;
-        wxInt32        iResultCount         = 0;
-        wxInt32        iIndex               = 0;
         wxIcon         iconIcon             = wxNullIcon;
         CC_STATUS      status;
 
@@ -335 +325 @@
         wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
 
 
-        // What should the title of the balloon be?
+        // What should the title of the tooltip be?
         strTitle = pSkinAdvanced->GetApplicationName();
 
         if (pDoc->IsConnected()) {
+            pDoc->GetConnectedComputerName(strMachineName);
+            if (!pDoc->IsComputerNameLocal(strMachineName)) {
+                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(
-                    _("Computation is suspended.\n")
+                    _("\nComputation is suspended.")
                 );
                 iconIcon = m_iconTaskBarSnooze;
                 strMessage += strBuffer;
@@ -357 +353 @@
                 // 2nd %s is the project name
                 //    i.e. 'BOINC', 'GridRepublic'
                 strBuffer.Printf(
-                    _("Network activity is suspended.\n")
+                    _("\nNetwork activity is suspended.")
                 );
                 strMessage += strBuffer;
             }
 
-            if (strMessage.Length() > 0) {
-                strMessage += wxT("\n");
-            }
+            std::vector<RESULT*> tasks = GetRunningTasks(pDoc);
 
-            iResultCount = pDoc->GetWorkCount();
-            for (iIndex = 0; iIndex < iResultCount; iIndex++) {
-                RESULT* result = pDoc->result(iIndex);
-                RESULT* state_result = NULL;
-                std::string project_name;
+            if (tasks.size() == 0) {
+                strMessage += _("\nNo running tasks.");
+            } else if (tasks.size() < 3) {
 
-                bIsDownloaded = (result->state == RESULT_FILES_DOWNLOADED);
-                bIsActive     = result->active_task;
-                bIsExecuting  = (result->scheduler_state == CPU_SCHED_SCHEDULED);
-                if (!(bIsActive) || !(bIsDownloaded) || !(bIsExecuting)) continue;
+                std::vector<RESULT*>::iterator i = tasks.begin();
+                while (i != tasks.end()) {
+                    RESULT* task = *i;
+                    std::string project_name;
 
-                if (result) {
-                    state_result = pDoc->state.lookup_result(result->project_url, result->name);
-                    if (state_result) {
-                        state_result->project->get_name(project_name);
-                        strProjectName = wxString(project_name.c_str());
+                    if (task) {
+                        RESULT* state_result = pDoc->state.lookup_result(task->project_url, task->name);
+                        if (state_result) {
+                            state_result->project->get_name(project_name);
+                        }
                     }
-                    fProgress = floor(result->fraction_done*10000)/100;
+                    fProgress = floor(task->fraction_done*10000)/100;
+                
+                    strBuffer.Printf(wxT("\n%s: %.2f%%"), project_name.c_str(), fProgress );
+                    strMessage += strBuffer;
+                    i++;
                 }
-
-                strBuffer.Printf(wxT("%s: %.2f%%\n"), strProjectName.c_str(), fProgress );
+            } else {
+                strBuffer.Printf(_("\n%d running tasks."), tasks.size());
                 strMessage += strBuffer;
             }
+
         } else if (pDoc->IsReconnecting()) {
             // 1st %s is the previous instance of the message
             // 2nd %s is the application name
@@ -396 +393 @@
             // 3rd %s is the project name
             //    i.e. 'BOINC', 'GridRepublic'
             strBuffer.Printf(
-                _("Reconnecting to client.\n")
+                _("\nReconnecting to client.")
             );
             strMessage += strBuffer;
         } else {
@@ -406 +403 @@
             // 3rd %s is the project name
             //    i.e. 'BOINC', 'GridRepublic'
             strBuffer.Printf(
-                _("Not connected to a client.\n")
+                _("\nNot connected to a client.")
             );
             iconIcon = m_iconTaskBarDisconnected;
             strMessage += strBuffer;
         }
 
-        SetBalloon(iconIcon, strTitle, strMessage);
+        SetTooltip(strMessage);
     }
 }
 
 
+std::vector<RESULT*> CTaskBarIcon::GetRunningTasks(CMainDocument* pDoc) {
+
+    std::vector<RESULT*> results;
+    bool bIsActive, bIsExecuting, bIsDownloaded;
+    
+    int iResultCount = pDoc->GetWorkCount();
+
+    for (int iIndex = 0; iIndex < iResultCount; iIndex++) {
+        RESULT* result = pDoc->result(iIndex);
+
+        if (result) {
+            bIsDownloaded = (result->state == RESULT_FILES_DOWNLOADED);
+            bIsActive     = result->active_task;
+            bIsExecuting  = (result->scheduler_state == CPU_SCHED_SCHEDULED);
+            if (bIsActive && bIsDownloaded && bIsExecuting) {
+                results.push_back(result);
+            }
+        }
+    }
+    return results;
+}
+
+
 void CTaskBarIcon::OnContextMenu(wxTaskBarIconExEvent& WXUNUSED(event)) {
     DisplayContextMenu();
 }
@@ -469 +489 @@
     SetIcon(m_iconTaskBarNormal, wxT(""));
 #endif
 
-    m_dtLastBalloonDisplayed = wxDateTime::Now();
 }
 
 

clientgui/BOINCTaskBar.h

@@ -24 +24 @@
 #pragma interface "BOINCTaskBar.cpp"
 #endif
 
+#include "MainDocument.h"
 
 #ifdef __WXMSW__
 #include "msw/taskbarex.h"
@@ -81 +82 @@
 
 private:
     wxDateTime m_dtLastHoverDetected;
-    wxDateTime m_dtLastBalloonDisplayed;
 
     wxTimer*   m_pRefreshTimer;
 
     bool       m_bMouseButtonPressed;
 
     void       ResetTaskBar();
-
     void       DisplayContextMenu();
+    std::vector<RESULT*> GetRunningTasks(CMainDocument* pDoc);
     
     DECLARE_EVENT_TABLE()
 
@@ -126 +126 @@
 
 #endif
 
+
+

clientgui/msw/taskbarex.cpp

@@ -94 +94 @@
 
 void wxTaskBarIconEx::OnTaskBarCreated(wxTaskBarIconExEvent& WXUNUSED(event))
 {
-    m_iconAdded = (Shell_NotifyIcon(NIM_ADD, &notifyData) != 0);
-    Shell_NotifyIcon(NIM_SETVERSION, &notifyData);
+    m_iconAdded = false;
+    RecreateIcon();
 }
 
 // Operations
@@ -124 +124 @@
         lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, 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;
-    }
+    return RecreateIcon();
 }
 
 bool wxTaskBarIconEx::SetBalloon(const wxIcon& icon, const wxString title, const wxString message, unsigned int timeout, unsigned int iconballoon)
@@ -175 +166 @@
         lstrcpyn(notifyData.szTip, WXSTRINGCAST strTip, 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;
-    }
+    return RecreateIcon();
 }
 
+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));
+
+    return RecreateIcon();
+}
+
+
 bool wxTaskBarIconEx::RemoveIcon(void)
 {
     if (!m_iconAdded)
@@ -419 +421 @@
     return lReturnValue;
 }
 
+
+bool wxTaskBarIconEx::RecreateIcon() {
+   
+    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;
+    }
+}
+
 LRESULT APIENTRY wxTaskBarIconExWindowProc( HWND hWnd, unsigned msg, UINT wParam, LONG lParam )
 {
     return wxGetApp().GetTaskBarIcon()->WindowProc((WXHWND) hWnd, msg, wParam, lParam);

clientgui/msw/taskbarex.h

@@ -26 +26 @@
 
 class wxTaskBarIconEx: public wxEvtHandler {
     DECLARE_DYNAMIC_CLASS(wxTaskBarIconEx)
+    DECLARE_EVENT_TABLE()
 public:
 
     wxTaskBarIconEx(void);
@@ -57 +58 @@
         unsigned int iconballoon = NIIF_INFO
     );
 
+        bool SetTooltip(const wxString tip);
+
     bool RemoveIcon();
 
     bool PopupMenu(wxMenu *menu); //, int x, int y);
@@ -76 +79 @@
     static unsigned int sm_taskbarMsg;
 
 private:
-    DECLARE_EVENT_TABLE()
+    bool RecreateIcon();
 
 };
 
@@ -135 +138 @@
 
 
 
+
+