Ticket #586: boincmgr_586.patch
File boincmgr_586.patch, 6.6 KB (added by , 16 years ago) |
---|
-
../clientgui/AdvancedFrame.cpp
205 205 } 206 206 207 207 208 CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon ) :208 CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32x32) : 209 209 CBOINCBaseFrame((wxFrame *)NULL, ID_ADVANCEDFRAME, title, wxDefaultPosition, wxDefaultSize, 210 210 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) 211 211 { … … 221 221 m_iDisplayViewType = VIEW_GRID; 222 222 223 223 // Initialize Application 224 SetIcon(*icon); 224 wxIconBundle icons; 225 icons.AddIcon(*icon); 226 icons.AddIcon(*icon32x32); 227 SetIcons(icons); 225 228 226 229 // Restore main application frame settings 227 230 RestoreState(); -
../clientgui/AdvancedFrame.h
52 52 53 53 public: 54 54 CAdvancedFrame(); 55 CAdvancedFrame(wxString title, wxIcon* icon );55 CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32x32); 56 56 57 57 ~CAdvancedFrame(void); 58 58 -
../clientgui/SkinManager.cpp
76 76 #include "res/skins/default/graphic/advanced_link_image.xpm" 77 77 #include "res/skins/default/graphic/dialog_background_image.xpm" 78 78 #include "res/boinc.xpm" 79 #include "res/boinc32x32.xpm" 79 80 #include "res/boincdisconnect.xpm" 80 81 #include "res/boincsnooze.xpm" 81 82 #include "res/boinc_logo.xpm" … … 841 842 m_strApplicationName = wxEmptyString; 842 843 m_strApplicationShortName = wxEmptyString; 843 844 m_iconApplicationIcon.Clear(); 845 m_iconApplicationIcon32x32.Clear(); 844 846 m_iconApplicationDisconnectedIcon.Clear(); 845 847 m_iconApplicationSnoozeIcon.Clear(); 846 848 m_bitmapApplicationLogo = wxNullBitmap; … … 869 871 } else if (match_tag(buf, "<application_icon>")) { 870 872 m_iconApplicationIcon.Parse(in); 871 873 continue; 874 } else if (match_tag(buf, "<application_icon32x32>")) { 875 m_iconApplicationIcon32x32.Parse(in); 876 continue; 872 877 } else if (match_tag(buf, "<application_disconnected_icon>")) { 873 878 m_iconApplicationDisconnectedIcon.Parse(in); 874 879 continue; … … 922 927 return m_iconApplicationIcon.GetIcon(); 923 928 } 924 929 930 wxIcon* CSkinAdvanced::GetApplicationIcon32x32() { 931 return m_iconApplicationIcon32x32.GetIcon(); 932 } 925 933 926 934 wxIcon* CSkinAdvanced::GetApplicationDisconnectedIcon() { 927 935 return m_iconApplicationDisconnectedIcon.GetIcon(); … … 989 997 wxASSERT(!m_strApplicationShortName.IsEmpty()); 990 998 } 991 999 m_iconApplicationIcon.SetDefaults(wxT("application"), (const char**)boinc_xpm); 1000 m_iconApplicationIcon32x32.SetDefaults(wxT("application"), (const char**)boinc32x32_xpm); 992 1001 m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), (const char**)boincdisconnect_xpm); 993 1002 m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), (const char**)boincsnooze_xpm); 994 1003 if (!m_bitmapApplicationLogo.Ok()) { -
../clientgui/SkinManager.h
292 292 wxString GetApplicationName(); 293 293 wxString GetApplicationShortName(); 294 294 wxIcon* GetApplicationIcon(); 295 wxIcon* GetApplicationIcon32x32(); 295 296 wxIcon* GetApplicationDisconnectedIcon(); 296 297 wxIcon* GetApplicationSnoozeIcon(); 297 298 wxBitmap* GetApplicationLogo(); … … 308 309 wxString m_strApplicationName; 309 310 wxString m_strApplicationShortName; 310 311 CSkinIcon m_iconApplicationIcon; 312 CSkinIcon m_iconApplicationIcon32x32; 311 313 CSkinIcon m_iconApplicationDisconnectedIcon; 312 314 CSkinIcon m_iconApplicationSnoozeIcon; 313 315 wxBitmap m_bitmapApplicationLogo; -
../clientgui/sg_BoincSimpleGUI.cpp
70 70 } 71 71 72 72 73 CSimpleFrame::CSimpleFrame(wxString title, wxIcon* icon ) :73 CSimpleFrame::CSimpleFrame(wxString title, wxIcon* icon, wxIcon* icon32x32) : 74 74 CBOINCBaseFrame((wxFrame *)NULL, ID_SIMPLEFRAME, title, wxDefaultPosition, 75 75 #ifdef __WXMAC__ 76 76 wxSize(409, 561), … … 84 84 RestoreState(); 85 85 86 86 // Initialize Application 87 SetIcon(*icon); 87 wxIconBundle icons; 88 icons.AddIcon(*icon); 89 icons.AddIcon(*icon32x32); 90 SetIcons(icons); 88 91 89 92 #ifdef __WXMAC__ 90 93 // We can't eliminate the Mac menu bar or the Help menu, so we -
../clientgui/sg_BoincSimpleGUI.h
99 99 100 100 public: 101 101 CSimpleFrame(); 102 CSimpleFrame(wxString title, wxIcon* icon );102 CSimpleFrame(wxString title, wxIcon* icon, wxIcon* icon32x32); 103 103 104 104 ~CSimpleFrame(); 105 105 -
../clientgui/BOINCGUIApp.cpp
653 653 // Initialize the simple gui window 654 654 pNewFrame = new CSimpleFrame( 655 655 m_pSkinManager->GetAdvanced()->GetApplicationName(), 656 m_pSkinManager->GetAdvanced()->GetApplicationIcon() 656 m_pSkinManager->GetAdvanced()->GetApplicationIcon(), 657 m_pSkinManager->GetAdvanced()->GetApplicationIcon32x32() 657 658 ); 658 659 break; 659 660 case BOINC_ADVANCEDGUI: 660 661 // Initialize the advanced gui window 661 662 pNewFrame = new CAdvancedFrame( 662 663 m_pSkinManager->GetAdvanced()->GetApplicationName(), 663 m_pSkinManager->GetAdvanced()->GetApplicationIcon() 664 m_pSkinManager->GetAdvanced()->GetApplicationIcon(), 665 m_pSkinManager->GetAdvanced()->GetApplicationIcon32x32() 664 666 ); 665 667 break; 666 668 }