Ticket #586: boincmgr_586.patch

../clientgui/AdvancedFrame.cpp

@@ -205 +205 @@
 }
 
 
-CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon) : 
+CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32x32) : 
     CBOINCBaseFrame((wxFrame *)NULL, ID_ADVANCEDFRAME, title, wxDefaultPosition, wxDefaultSize,
                     wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
@@ -221 +221 @@
         m_iDisplayViewType = VIEW_GRID;
 
     // Initialize Application
-    SetIcon(*icon);
+    wxIconBundle icons;
+    icons.AddIcon(*icon);
+    icons.AddIcon(*icon32x32);
+    SetIcons(icons);
 
     // Restore main application frame settings
     RestoreState();

../clientgui/AdvancedFrame.h

@@ -52 +52 @@
 
 public:
     CAdvancedFrame();
-    CAdvancedFrame(wxString title, wxIcon* icon);
+    CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32x32);
 
     ~CAdvancedFrame(void);
 

../clientgui/SkinManager.cpp

@@ -76 +76 @@
 #include "res/skins/default/graphic/advanced_link_image.xpm"
 #include "res/skins/default/graphic/dialog_background_image.xpm"
 #include "res/boinc.xpm"
+#include "res/boinc32x32.xpm"
 #include "res/boincdisconnect.xpm"
 #include "res/boincsnooze.xpm"
 #include "res/boinc_logo.xpm"
@@ -841 +842 @@
     m_strApplicationName = wxEmptyString;
     m_strApplicationShortName = wxEmptyString;
     m_iconApplicationIcon.Clear();
+    m_iconApplicationIcon32x32.Clear();
     m_iconApplicationDisconnectedIcon.Clear();
     m_iconApplicationSnoozeIcon.Clear();
     m_bitmapApplicationLogo = wxNullBitmap;
@@ -869 +871 @@
         } else if (match_tag(buf, "<application_icon>")) {
             m_iconApplicationIcon.Parse(in);
             continue;
+        } else if (match_tag(buf, "<application_icon32x32>")) {
+            m_iconApplicationIcon32x32.Parse(in);
+            continue;
         } else if (match_tag(buf, "<application_disconnected_icon>")) {
             m_iconApplicationDisconnectedIcon.Parse(in);
             continue;
@@ -922 +927 @@
     return m_iconApplicationIcon.GetIcon();
 }
 
+wxIcon* CSkinAdvanced::GetApplicationIcon32x32() {
+    return m_iconApplicationIcon32x32.GetIcon();
+}
 
 wxIcon* CSkinAdvanced::GetApplicationDisconnectedIcon() { 
     return m_iconApplicationDisconnectedIcon.GetIcon();
@@ -989 +997 @@
         wxASSERT(!m_strApplicationShortName.IsEmpty());
     }
     m_iconApplicationIcon.SetDefaults(wxT("application"), (const char**)boinc_xpm);
+    m_iconApplicationIcon32x32.SetDefaults(wxT("application"), (const char**)boinc32x32_xpm);
     m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), (const char**)boincdisconnect_xpm);
     m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), (const char**)boincsnooze_xpm);
     if (!m_bitmapApplicationLogo.Ok()) {

../clientgui/SkinManager.h

@@ -292 +292 @@
     wxString    GetApplicationName();
     wxString    GetApplicationShortName();
     wxIcon*     GetApplicationIcon();
+    wxIcon*     GetApplicationIcon32x32();
     wxIcon*     GetApplicationDisconnectedIcon();
     wxIcon*     GetApplicationSnoozeIcon();
     wxBitmap*   GetApplicationLogo();
@@ -308 +309 @@
     wxString    m_strApplicationName;
     wxString    m_strApplicationShortName;
     CSkinIcon   m_iconApplicationIcon;
+    CSkinIcon   m_iconApplicationIcon32x32;
     CSkinIcon   m_iconApplicationDisconnectedIcon;
     CSkinIcon   m_iconApplicationSnoozeIcon;
     wxBitmap    m_bitmapApplicationLogo;

../clientgui/sg_BoincSimpleGUI.cpp

@@ -70 +70 @@
 }
 
 
-CSimpleFrame::CSimpleFrame(wxString title, wxIcon* icon) : 
+CSimpleFrame::CSimpleFrame(wxString title, wxIcon* icon, wxIcon* icon32x32) : 
     CBOINCBaseFrame((wxFrame *)NULL, ID_SIMPLEFRAME, title, wxDefaultPosition, 
 #ifdef __WXMAC__
                     wxSize(409, 561),
@@ -84 +84 @@
     RestoreState();
 
     // Initialize Application
-    SetIcon(*icon);
+    wxIconBundle icons;
+    icons.AddIcon(*icon);
+    icons.AddIcon(*icon32x32);
+    SetIcons(icons);
     
 #ifdef __WXMAC__
     // We can't eliminate the Mac menu bar or the Help menu, so we 

../clientgui/sg_BoincSimpleGUI.h

@@ -99 +99 @@
 
 public:
     CSimpleFrame();
-    CSimpleFrame(wxString title, wxIcon* icon);
+    CSimpleFrame(wxString title, wxIcon* icon, wxIcon* icon32x32);
 
    ~CSimpleFrame();
 

../clientgui/BOINCGUIApp.cpp

@@ -653 +653 @@
                 // Initialize the simple gui window
                 pNewFrame = new CSimpleFrame(
                     m_pSkinManager->GetAdvanced()->GetApplicationName(), 
-                    m_pSkinManager->GetAdvanced()->GetApplicationIcon()
+                    m_pSkinManager->GetAdvanced()->GetApplicationIcon(),
+                    m_pSkinManager->GetAdvanced()->GetApplicationIcon32x32()
                 );
                 break;
             case BOINC_ADVANCEDGUI:
                 // Initialize the advanced gui window
                 pNewFrame = new CAdvancedFrame(
                     m_pSkinManager->GetAdvanced()->GetApplicationName(), 
-                    m_pSkinManager->GetAdvanced()->GetApplicationIcon()
+                    m_pSkinManager->GetAdvanced()->GetApplicationIcon(),
+                    m_pSkinManager->GetAdvanced()->GetApplicationIcon32x32()
                 );
                 break;
         }