Ticket #61: boincmgr_61.patch

../clientgui/DlgOptions.cpp

@@ -89 +89 @@
     m_ReminderFrequencyCtrl = NULL;
     m_DialupStaticBoxCtrl = NULL;
 #if defined(__WXMSW__)
+        m_UseBalloonsCtrl = NULL;
     m_DialupConnectionsCtrl = NULL;
     m_DialupSetDefaultCtrl = NULL;
     m_DialupClearDefaultCtrl = NULL;
@@ -148 +149 @@
     wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
     itemPanel4->SetSizer(itemBoxSizer5);
 
+#if defined (__WXMSW__)
+    wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(3, 2, 0, 0);
+#else
     wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(2, 2, 0, 0);
+#endif // __WXMSW__
     itemBoxSizer5->Add(itemFlexGridSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
     wxStaticText* itemStaticText7 = new wxStaticText;
     itemStaticText7->Create( itemPanel4, wxID_STATIC, _("Language Selection:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -177 +182 @@
         m_ReminderFrequencyCtrl->SetToolTip(_("How often, in minutes, should the manager remind you of possible connection events."));
     itemFlexGridSizer6->Add(m_ReminderFrequencyCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
+#if defined (__WXMSW__)
+        m_UseBalloonsCtrl = new wxCheckBox;
+        m_UseBalloonsCtrl->Create( itemPanel4, ID_USEBALLOONS, _("Use balloon tooltips"));
+        if (ShowToolTips())
+                m_UseBalloonsCtrl->SetToolTip(_("Uncheck this item if the BOINC Manager should not use balloon tooltips for the systray icon."));
+        itemFlexGridSizer6->Add(m_UseBalloonsCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+#endif // __WXMSW__
+
     itemNotebook3->AddPage(itemPanel4, _("General"));
 
 #if defined(__WXMSW__)

../clientgui/DlgOptions.h

@@ -54 +54 @@
 #define ID_GENERAL 10002
 #define ID_LANGUAGESELECTION 10004
 #define ID_REMINDERFREQUENCY 10018
+#define ID_USEBALLOONS 10031
 #define ID_CONNECTONS 10019
 #define ID_NETWORKAUTODETECT 10020
 #define ID_NETWORKLAN 10021
@@ -155 +156 @@
 ////@begin CDlgOptions member variables
     wxComboBox* m_LanguageSelectionCtrl;
     wxSlider* m_ReminderFrequencyCtrl;
+        wxCheckBox* m_UseBalloonsCtrl;
     wxStaticBoxSizer* m_DialupStaticBoxCtrl;
     wxListBox* m_DialupConnectionsCtrl;
     wxButton* m_DialupSetDefaultCtrl;

../clientgui/AdvancedFrame.cpp

@@ -1551 +1551 @@
     dlg.m_ReminderFrequencyCtrl->SetValue(m_iReminderFrequency);
 
 #ifdef __WXMSW__
+        dlg.m_UseBalloonsCtrl->SetValue(m_bUseBalloons);
+
     // Connection Tab
     if (m_pDialupManager) {
         m_pDialupManager->GetISPNames(astrDialupConnections);
@@ -1624 +1626 @@
         m_iReminderFrequency = dlg.m_ReminderFrequencyCtrl->GetValue();
 
 #ifdef __WXMSW__
+                m_bUseBalloons = dlg.m_UseBalloonsCtrl->GetValue();
+
         // Connection Tab
         m_strNetworkDialupConnectionName = dlg.GetDefaultDialupConnection();
 #endif

../clientgui/BOINCBaseFrame.cpp

@@ -202 +202 @@
         CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon();
         wxASSERT(pTaskbar);
 
-        if ((IsShown() && !event.m_notification_only) || (IsShown() && !pTaskbar->IsBalloonsSupported())) {
+        if ((IsShown() && !event.m_notification_only) || (IsShown() && !pTaskbar->IsBalloonsSupported()) || (IsShown() && !m_bUseBalloons)) {
             if (!event.m_notification_only) {
                 int retval = 0;
 
@@ -215 +215 @@
                     event.ProcessResponse(retval);
                 }
             }
-        } else {
+        } else if (m_bUseBalloons) {
             // If the main window is hidden or minimzed use the system tray ballon
             //   to notify the user instead.  This keeps dialogs from interfering
             //   with people typing email messages or any other activity where they
@@ -532 +532 @@
 
     pConfig->Write(wxT("Language"), m_iSelectedLanguage);
     pConfig->Write(wxT("ReminderFrequency"), m_iReminderFrequency);
+        pConfig->Write(wxT("UseBalloons"), m_bUseBalloons);
     pConfig->Write(wxT("DisplayExitWarning"), wxGetApp().GetDisplayExitWarning());
 
     pConfig->Write(wxT("NetworkDialupConnectionName"), m_strNetworkDialupConnectionName);
@@ -591 +592 @@
 
     pConfig->Read(wxT("Language"), &m_iSelectedLanguage, 0L);
     pConfig->Read(wxT("ReminderFrequency"), &m_iReminderFrequency, 60L);
+        pConfig->Read(wxT("UseBalloons"), &m_bUseBalloons, true);
     pConfig->Read(wxT("DisplayExitWarning"), &iDisplayExitWarning, 1L);
     wxGetApp().SetDisplayExitWarning(iDisplayExitWarning);
 

../clientgui/BOINCBaseFrame.h

@@ -63 +63 @@
     virtual void        OnExit( wxCommandEvent& event );
     
     int                 GetReminderFrequency() { return m_iReminderFrequency; }
+        bool                GetUseBalloons() { return m_bUseBalloons; }
     wxString            GetDialupConnectionName() { return m_strNetworkDialupConnectionName; }
 
     void                FireInitialize();
@@ -102 +103 @@
 
     int                 m_iSelectedLanguage;
     int                 m_iReminderFrequency;
+        bool                            m_bUseBalloons;
 
     wxString            m_strNetworkDialupConnectionName;
 

../clientgui/BOINCTaskBar.cpp

@@ -303 +291 @@
 
 
 void CTaskBarIcon::OnMouseMove(wxTaskBarIconEvent& WXUNUSED(event)) {
+        if (!wxGetApp().GetFrame()->GetUseBalloons())
+                return;
+
     wxTimeSpan ts(wxDateTime::Now() - m_dtLastHoverDetected);
     if (ts.GetSeconds() >= 10) {
         m_dtLastHoverDetected = wxDateTime::Now();
@@ -448 +439 @@
 
 void CTaskBarIcon::ResetTaskBar() {
 #ifdef __WXMSW___
-    SetBalloon(m_iconTaskBarNormal, wxT(""), wxT(""));
+        if (wxGetApp().GetFrame()->GetUseBalloons())
+                SetBalloon(m_iconTaskBarNormal, wxT(""), wxT(""));
+        else
+            SetIcon(m_iconTaskBarNormal, wxT(""));
 #else
     SetIcon(m_iconTaskBarNormal, wxT(""));
 #endif