diff --git a/checkin_notes b/checkin_notes index 071da4a41b..4979c62fe7 100755 --- a/checkin_notes +++ b/checkin_notes @@ -340,3 +340,14 @@ David 11 Jan 2006 client/ file_xfer.C + +Charlie 10 Jan 2006 + -Mac: Mac System Menu uses menubar icon selected by + CBrandingScheme::OnInit() . + + clientgui/ + BOINCGUIApp.cpp + mac/ + MacSysMenu.cpp + res/ + gridrepublic_mac.xpm (new) diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index da8c96a192..bf1b898824 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -33,10 +33,16 @@ ////@begin XPM images +#ifdef __APPLE__ +#include "res/boinc_mac.xpm" +#include "res/gridrepublic_mac.xpm" +#else #include "res/boinc.xpm" +#include "res/gridrepublic.xpm" +#endif + #include "res/boincsm.xpm" #include "res/attachprojectwizard.xpm" -#include "res/gridrepublic.xpm" #include "res/gridrepublicamwizard.xpm" ////@end XPM images diff --git a/clientgui/mac/MacSysMenu.cpp b/clientgui/mac/MacSysMenu.cpp index 38483dfef3..0e05a92951 100644 --- a/clientgui/mac/MacSysMenu.cpp +++ b/clientgui/mac/MacSysMenu.cpp @@ -28,12 +28,6 @@ #include "Events.h" #include "wx/mac/private.h" // for wxBitmapRefData::GetPictHandle -#ifdef __APPLE__ -#include "../res/boinc_mac.xpm" -#else -#include "../res/boinc.xpm" -#endif - pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef, EventRef inEvent, void* pData); @@ -46,8 +40,9 @@ CMacSystemMenu::CMacSystemMenu(wxString title, wxIcon* icon) : CTaskBarIcon(titl CFBundleRef SysMenuBundle = NULL; wxBitmapRefData * theBitsRefData; PicHandle thePICT; + wxBitmap theBits; - wxBitmap theBits = wxBitmap(boinc_xpm); + theBits.CopyFromIcon(*icon); theBitsRefData = theBits.GetBitmapData(); thePICT = theBitsRefData->GetPictHandle(); diff --git a/clientgui/res/gridrepublic_mac.xpm b/clientgui/res/gridrepublic_mac.xpm new file mode 100644 index 0000000000..1707ae4581 --- /dev/null +++ b/clientgui/res/gridrepublic_mac.xpm @@ -0,0 +1,109 @@ +// Berkeley Open Infrastructure for Network Computing +// http://boinc.berkeley.edu +// Copyright (C) 2005 University of California +// +// This is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; +// either version 2.1 of the License, or (at your option) any later version. +// +// This software is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// See the GNU Lesser General Public License for more details. +// +// To view the GNU Lesser General Public License visit +// http://www.gnu.org/copyleft/lesser.html +// or write to the Free Software Foundation, Inc., +// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +/* XPM */ +static const char *gridrepublic_xpm[] = { +/* width height ncolors chars_per_pixel */ +"16 16 68 2", +/* colors */ +"AA c #FFFFFFFFFFFF", +"BA c #FFFF84843131", +"CA c #FFFF84842929", +"DA c #FFFF7B7B2121", +"EA c #FFFF7B7B1818", +"FA c #FFFF6B6B1010", +"GA c #FFFF6B6B0000", +"HA c #FFFF5A5A0000", +"IA c #EFEFEFEFEFEF", +"JA c #EFEF73732121", +"KA c #EFEF5A5A0000", +"LA c #E7E784844242", +"MA c #E7E76B6B2121", +"NA c #DEDEDEDEDEDE", +"OA c #DEDE84844A4A", +"PA c #DEDE63631010", +"AB c #DEDE5A5A0000", +"BB c #D6D64A4A0808", +"CB c #CECED6D6DEDE", +"DB c #CECECECECECE", +"EB c #CECE73733131", +"FB c #CECE52520000", +"GB c #C6C663632121", +"HB c #C6C64A4A0808", +"IB c #BDBDBDBDBDBD", +"JB c #BDBD5A5A1818", +"KB c #BDBD42420000", +"LB c #B5B5BDBDC6C6", +"MB c #B5B5ADADB5B5", +"NB c #ADADADADADAD", +"OB c #ADAD52521818", +"PB c #A5A552522121", +"AC c #A5A54A4A0808", +"BC c #A5A539390000", +"CC c #9C9CA5A5ADAD", +"DC c #9C9C9C9C9C9C", +"EC c #9C9C31310808", +"FC c #949452522929", +"GC c #8C8C42421818", +"HC c #84845A5A4242", +"IC c #7B7B31310808", +"JC c #737384848C8C", +"KC c #73737B7B8484", +"LC c #737373737373", +"MC c #737329290000", +"NC c #6B6B4A4A3939", +"OC c #6B6B29290000", +"PC c #5A5A63636363", +"AD c #5A5A4A4A4242", +"BD c #525231311818", +"CD c #525229291818", +"DD c #525221210000", +"ED c #4A4A31312121", +"FD c #42424A4A5252", +"GD c #424218180000", +"HD c #393942424A4A", +"ID c #393918180808", +"JD c #313131313939", +"KD c #313121211818", +"LD c #292931313939", +"MD c #292929292929", +"ND c #292918180808", +"OD c #212118181010", +"PD c #181821212929", +"AE c #181818181818", +"BE c #181808080000", +"CE c #080808081010", +"DE c #000000000000", +/* pixels */ +"DEDEDEDEIDDDMCOCGDDEDEDEDEDEDEDE", +"MDNDOCFBHAHAKAHBKBIDDEDEDEDEDEDE", +"PCGAEAGAHAKAABJBECIDDEDEDEDEDEDE", +"PCABFAHAGAHABBMALAKBGCBCACGBLADE", +"LCKADAGAHAHBOCCDFCEBGAGAGADAOADE", +"DEGCDAGAKANCCCKCLDPDADPAHADAEBDE", +"DEPCBAGAKBCCIAIAMBADFDHCGADAGCDE", +"DELCBAFAKBHDAEDCAALBPDADHADANCDE", +"DECEPAGAPBCBDBIAAAIADCMBFBCAIDDE", +"DEDEGCEAICCCAAAAAAAAAALBOBDANDDE", +"DEDEPCEAECJCAAAAAAAACBLDEDJABEDE", +"DEDELCEAACLCIANBDBAAIBBEPDPBDEDE", +"DEDEAEBAABGCKDAENAAAIBAEAEBDDEDE", +"DEDEBEKDDEDEDEJDAAAAIAMDPDODDEDE", +"DEDEDEAEDEDEDEAEIBNANBAEODCEDEDE", +"DEDEDEDEDEDEDEDEDEDEDEDEDEDEDEDE"};