diff --git a/checkin_notes b/checkin_notes index 0a302874a1..70ee472067 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13109,3 +13109,10 @@ Reinhard 6 Dec 2006 increased transparancy for glut-test: added extra tests for libXmu and libXi which are prerequisites to the glut-test ==> if glut-test fails because of one of these libs missing, give a warning. + +Rom 5 Dec 2006 + - BSG: Change the copy and copy all buttons to bitmaps. + + clientgui/ + sg_DlgMessages.cpp + SkinManager.cpp, .h diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp index 4b4b857fb4..945c6e7d20 100644 --- a/clientgui/SkinManager.cpp +++ b/clientgui/SkinManager.cpp @@ -60,6 +60,8 @@ #include "res/skins/default/graphic/cancel_clicked_button.xpm" #include "res/skins/default/graphic/close_button.xpm" #include "res/skins/default/graphic/close_clicked_button.xpm" +#include "res/skins/default/graphic/copy_all_button.xpm" +#include "res/skins/default/graphic/copy_button.xpm" #include "res/skins/default/graphic/messages_link_image.xpm" #include "res/skins/default/graphic/messages_alert_link_image.xpm" #include "res/skins/default/graphic/suspend_link_image.xpm" @@ -560,6 +562,8 @@ void CSkinSimple::Clear() { m_SaveButton.Clear(); m_CancelButton.Clear(); m_CloseButton.Clear(); + m_CopyAllButton.Clear(); + m_CopyButton.Clear(); m_DialogBackgroundImage.Clear(); @@ -644,6 +648,12 @@ int CSkinSimple::Parse(MIOFILE& in) { } else if (match_tag(buf, "")) { m_CloseButton.Parse(in); continue; + } else if (match_tag(buf, "")) { + m_CopyAllButton.Parse(in); + continue; + } else if (match_tag(buf, "")) { + m_CopyButton.Parse(in); + continue; } else if (match_tag(buf, "")) { m_MessagesLink.Parse(in); continue; diff --git a/clientgui/SkinManager.h b/clientgui/SkinManager.h index c34f73fbed..c754c5f1f8 100644 --- a/clientgui/SkinManager.h +++ b/clientgui/SkinManager.h @@ -219,6 +219,8 @@ public: CSkinSimpleButton* GetSaveButton() { return &m_SaveButton; } CSkinSimpleButton* GetCancelButton() { return &m_CancelButton; } CSkinSimpleButton* GetCloseButton() { return &m_CloseButton; } + CSkinSimpleButton* GetCopyAllButton() { return &m_CopyAllButton; } + CSkinSimpleButton* GetCopyButton() { return &m_CopyButton; } CSkinImage* GetMessagesLink() { return &m_MessagesLink; } CSkinImage* GetMessagesAlertLink() { return &m_MessagesAlertLink; } @@ -250,12 +252,14 @@ private: CSkinImage m_ProjectAreaBackgroundImage; CSkinImage m_ProjectImage; - CSkinSimpleButton m_AttachProjectButton; + CSkinSimpleButton m_AttachProjectButton; CSkinSimpleButton m_RightArrowButton; CSkinSimpleButton m_LeftArrowButton; CSkinSimpleButton m_SaveButton; CSkinSimpleButton m_CancelButton; CSkinSimpleButton m_CloseButton; + CSkinSimpleButton m_CopyAllButton; + CSkinSimpleButton m_CopyButton; CSkinImage m_MessagesLink; CSkinImage m_MessagesAlertLink; diff --git a/clientgui/res/skins/default/graphic/copy_all_button.xpm b/clientgui/res/skins/default/graphic/copy_all_button.xpm new file mode 100644 index 0000000000..03cc36ca8c --- /dev/null +++ b/clientgui/res/skins/default/graphic/copy_all_button.xpm @@ -0,0 +1,134 @@ +/* XPM */ +static char *copy_all_button_xpm[] = { +/* columns rows colors chars-per-pixel */ +"85 18 110 2", +"j c #44429C", +"l c #FCFEFC", +"Z c #7476BC", +"N c #CCCAE4", +"x c #4442A4", +"d c #545EAC", +"%. c #647ABC", +"H c #5C66AC", +"y c #2C3294", +"{ c #5C66B4", +"} c #9CB6D4", +"L c #8486C4", +"#. c #9CB6DC", +"> c #ACD2E4", +"0 c #646EB4", +"s c #A4BED4", +"7 c #343A9C", +"o c #B4DADC", +": c #A4BEDC", +"[ c #E4E2EC", +"X c #B4DAE4", +"B c #E4E2F4", +"@. c #B4DAEC", +"5 c #3C429C", +".. c #6C76BC", +"O c #ACC6DC", +"] c #3C42A4", +"p c #7C92C4", +"+. c #BCE2E4", +"^ c #9496CC", +"*. c #747EBC", +"# c #849AC4", +"m c #F4F2F4", +"Q c #94B6CC", +"J c #6C6AB4", +"$ c #849ACC", +"F c #9C9ED4", +"A c #F4F2FC", +"+ c #94B6D4", +"4 c #4C52A4", +") c #BCD6E4", +"W c #8CA2CC", +"Y c #CCC6E4", +"w c #A4C6CC", +"$. c #545AAC", +"T c #ACAED4", +"e c #A4C6D4", +"_ c #ACAEDC", +"< c #B4E2E4", +"V c #544EA4", +"o. c #DCD6EC", +"- c #7C9AC4", +" . c #544EAC", +"u c #343694", +"~ c #646AB4", +"z c #BCBEDC", +"8 c #34369C", +"c c #ECF2FC", +"h c #B4D6DC", +"@ c #84A2C4", +"1 c #B4D6E4", +"9 c #3C3E9C", +"X. c #BCDEDC", +"K c #9492C4", +"O. c #3C3EA4", +"b c #645EAC", +". c #BCDEE4", +"S c #9492CC", +"q c #BCDEEC", +"n c #747ABC", +"% c #8496C4", +"& c #8496CC", +"/ c #4C4EA4", +"( c #A4A2CC", +"C c #D4D6EC", +">. c #9CBACC", +"P c #4C4EAC", +"' c #A4A2D4", +":. c #9CBAD4", +"g c #ACD6E4", +"! c #ACAAD4", +"-. c #6472B4", +"2 c #A4C2D4", +"R c #7C76BC", +"` c #E4E6EC", +"v c #5C5EAC", +" c #B4DEE4", +"U c #E4E6F4", +"a c #ACCAD4", +"D c #5C5EB4", +"&. c #3C469C", +"f c #6C7ABC", +";. c #ACCADC", +"* c #7C96C4", +"t c #343294", +"I c #BCBADC", +"r c #34329C", +"G c #B4D2DC", +"k c #BCBAE4", +"i c #444EA4", +"= c #849EC4", +"E c #9CA2CC", +",. c #B4D2E4", +"M c #9CA2D4", +"6 c #3C3A9C", +"=. c #4C56A4", +", c #BCDAE4", +"| c #4C56AC", +"; c #8CA6CC", +"3 c #BCDAEC", +/* pixels */ +" . . . X X o O + @ # # $ # $ # % # $ & % # # $ % $ * # & # # # # % # $ = - # % - # # # # # # # - # # # & # % # # # $ # # $ # # & % # & # % $ # * ; : > , . < . . 1 2 ", +"3 o , . ; 4 5 6 7 6 6 8 6 7 7 6 6 7 7 7 7 6 7 6 7 9 7 6 7 6 7 7 7 6 6 7 6 6 7 6 7 7 6 7 7 7 6 7 6 7 6 7 7 7 6 7 7 6 7 7 6 7 6 7 7 7 7 7 7 7 7 7 6 6 9 0 O X q , , w ", +" o X . e 0 9 r r r r r t r 8 r 8 r y 8 u 8 t 8 t r u r y 8 8 r 8 r t r r r t y 8 r r 8 r 8 r r r r r r 8 t 8 8 8 r u t r u r r r r r r r r r 8 r 8 t 8 t 8 i p , < , a ", +" 3 1 s d 7 r r t 8 t r u r t r y 8 r t r t r r y r t r 8 t r r r t 8 y u r 8 8 r u r y r t r y r t 8 y t r r t r y r r r r t 8 t t r u r t t r t t 8 r 8 r r 9 f . X . g ", +" h 0 r t 8 t r r u y r t 8 u r t 8 8 j k l l z x 8 t r r u r u y 8 r r u y r r r u r 8 r t 8 u r 8 t c l v r t b l n t m M r t 8 r t r t r u 8 r r u t r u t 9 = , h ", +". $ 6 8 y r t 8 y r 8 r r r r 8 t r y N B V x C N t 8 r y 8 t r r r u r r r t r t r u y r t 8 r y r Z A l S t r D l n t c F 8 t r t 8 t r t r r 8 t r 8 y 8 r 8 i G ", +" G H r r r 8 r 8 y r y t 8 t y r t r J l K y r L l P y z l l M u r I U Y l C P T U t r L C t r t 8 t T I C U r r v l R r m E t r r 8 t r r 8 t r t r y r r t r r 7 W , ", +"3 Q 4 t 8 t 8 y t r u 8 r r r t 8 r t S l J u r r t 8 ! m P b l S t z l ~ x m N Z l J r T K r 8 r y 8 B L ^ l / t v l n t c ( r u r t r u r t 8 t r 8 r r t r u t 8 f . ) ", +" W i r t 8 r 8 r u r t r u r r t r t M l D t r t r r m _ 8 t N U r I m r r T m r ` S u c V y r 8 t J A 5 P l S 8 v l R r A F r r t 8 r t r 8 t r y r t t r r r 8 8 H < ", +", # i 8 t r t t r r t 8 r t 8 t 8 y r S l J r t r 8 5 l F t 8 I c r z A r y ' l ] ! [ ~ C r r y t u F Y r t N C y v l Z u m F 8 u r r t 8 r t r t 8 t 8 t r u y t u { , , ", +"X } | t 8 r 8 r t 8 r t r u r r r 8 8 ~ l S r y L l v A ! r 8 N [ t I c t r T A r 0 l Y K y 8 r 8 t B l l l l l .D l R 8 c ( t r t 8 r t r 8 t 8 r r t r t r y r 7 .. X.", +". g H r y y r u r t r u r r u r t r t t C B V 5 o.C r T m P ~ l S y I l L x ` I r t U l P r r r t J l P 8 r D l S v l Z r m E t 8 r t r u r t r t r 8 t r 8 r 8 r u W X X ", +" . * O.u 8 t r r u r r t 8 r t r r t r j Y l l N x t r N l l ( 8 8 k m I l C / r r _ o.u 8 8 t r S C t t r t B N v l R r c ' r t r 8 t r r u r u r t r 8 t t r u i 1 X , ", +"X h 0 8 t r 8 t r r u r t r 8 u y u r y t 8 r r y t r u r 8 r 8 y I c r r r t 8 u ! S r y u r t r r u r u 8 r t r r y u r r y u r t r 8 t r r y 8 y t r t 8 t O.= X . ", +"+.@.+.#.$.8 8 t r u r r t 8 t r r 8 y r 8 r 8 t r r 8 r r t t y r u I m r t 8 r v l C j t 8 r y 8 t r r t y r t r r 8 r r r t r r r u r t r 8 t 8 r r r t r y 9 %.. . . ", +". < X s d 6 8 r r t 8 r t r r t r 8 8 y r y 8 t r t 8 y 8 r r r r r y t 8 y r r t 8 y r t r 8 r y 8 r y 8 t r u r t 8 t 8 t r 8 t r t 8 r t r r t 8 t 8 8 &.*.. . . X , ", +"X . . X $ =.8 7 8 8 8 7 8 7 8 8 8 8 8 7 8 8 8 8 8 8 6 8 8 7 u 8 7 8 7 8 8 6 8 8 8 8 6 8 8 8 8 8 8 8 7 8 8 7 8 8 8 8 8 8 7 8 8 8 7 8 8 8 7 8 7 8 8 7 9 -.} . X X , ", +", , X . X , o , ;.+ } } :.>.:.} Q } >.:.:.:.>.} :.:.:.} :.} :.} :.} :.:.:.} :.Q } } } } } } >.} } :.} } } >.} + :.} } :.+ } >.} :.} :.:.:.} } } } } :.:.,.X X < q X.X . . " +}; diff --git a/clientgui/res/skins/default/graphic/copy_button.xpm b/clientgui/res/skins/default/graphic/copy_button.xpm new file mode 100644 index 0000000000..5d50587cdb --- /dev/null +++ b/clientgui/res/skins/default/graphic/copy_button.xpm @@ -0,0 +1,115 @@ +/* XPM */ +static char *copy_button_xpm[] = { +/* columns rows colors chars-per-pixel */ +"85 18 91 1", +"/ c #44429C", +"d c #FCFEFC", +"l c #CCCAE4", +"W c #4442A4", +"= c #8492C4", +"u c #545EAC", +"x c #5C66AC", +"Q c #9CB6D4", +"b c #8486C4", +"8 c #646EB4", +"4 c #343A9C", +"Y c #E4E2EC", +"X c #B4DAE4", +"P c #E4E2F4", +"3 c #3C429C", +"H c #6C76BC", +"~ c #3C42A4", +"t c #7C92C4", +", c #BCE2E4", +"# c #849AC4", +"G c #F4F2F4", +"D c #6C6AB4", +"& c #849ACC", +"T c #5466B4", +"U c #F4F2FC", +"C c #94B6D4", +"2 c #4C52A4", +"^ c #8CA2CC", +"} c #9CBED4", +"g c #CCC6E4", +"F c #443EA4", +"B c #ACAED4", +"_ c #ACAEDC", +"9 c #B4E2E4", +"p c #6C7EB4", +"+ c #9CB2D4", +"{ c #B4E2EC", +"j c #544EA4", +": c #ACCEDC", +") c #DCD6EC", +"* c #7C9AC4", +"e c #343694", +"c c #646AB4", +"% c #7C9ACC", +"f c #BCBEDC", +"6 c #34369C", +"Z c #ECF2FC", +"m c #BCBEE4", +"` c #B4D6E4", +"7 c #3C3E9C", +"J c #9492C4", +"i c #3C3EA4", +"> c #BCDEE4", +"v c #9492CC", +"o c #BCDEEC", +"$ c #8496C4", +"z c #4C4EA4", +"R c #A4A2CC", +"k c #D4D6EC", +"A c #4C4EAC", +"V c #8C9ECC", +"y c #9CBAD4", +"a c #ACD6DC", +"I c #ACAAD4", +"0 c #6472B4", +"1 c #B4DEDC", +"; c #A4C2DC", +"M c #E4E6EC", +"S c #5C5EAC", +". c #B4DEE4", +"[ c #6C7AB4", +"h c #E4E6F4", +"L c #5C5EB4", +"K c #6C7ABC", +"O c #ACCADC", +"w c #343294", +"s c #BCBADC", +"q c #34329C", +"N c #B4D2DC", +"( c #BCBAE4", +"r c #444EA4", +"' c #849EC4", +"n c #9CA2CC", +"@ c #849ECC", +"E c #9CA2D4", +"5 c #3C3A9C", +"] c #94BAD4", +"! c #4C56A4", +" c #BCDAE4", +"- c #8CA6CC", +"< c #BCDAEC", +/* pixels */ +" .Xo. .O+@###$%########&##$####%#&&#&##&#$&$#@##$%$&##&##$##$$#########*=-;: . >.>,", +".<>XX1-23454454545454464454455454554544544545454545545454454544444447454547738;>> >99", +"> XO07qq6qwq6qqqqqqqqqq6w6q6qwqqw6w6eq6qewqqeq66eqeq6wqqqqwqqqqqqqqqqw6qeqqw4rt...>X", +"X>Xyu6qeqwqw6w6wqw6w6w6weqqwqeqww6wqwqwqwq6wqwqwqqq6wq6eqw6wqeqw6w6w6eqeqeqw6qqipX,X ", +">Xa8qeqqeqwqwqeqeqqwqqwqqew63sddfi6qq6w6qqwqwqeqw6w6wqwqwqq6eqw6wqwqqqwqwqqwqeqe7@X>>", +"> #7qwqwqq6wqeqwq6w6e66e6wqqghj3klwqwe6qw6w6wqqeqwq6wqw6wqwwqeqqq6wqe66eq6e6qwqwqzaXo", +">axq6qw6qeqq6qqqeqqwqwqqw6wcdvqqbdzqfddnqqmMNdkrBhwqbkqwqwqqwqw6wqwqwqwqwwqwq6w6q6V ", +"XC2qw6wqeqwwqww6w6w6qwqw6wqvdc6wqeqBZASdvwsdDFGlHdcqBJ6qeq6wqeqqwqw6wqwqq6wqqeq6w6K>.", +"X@r6qw6qqwq6wqqqwqqwq6wqqeqndLwqwqqZBqwlPqsZqqIUqYveZzqwqqwq6qw6w6qwq6wqeqqw6wqqe6T>>", +"XVrweqwqq6wqqeqeq6w6qwqqeqqvdDwqwq3dRw6sZesGqwEdWBPckwqw6w6wqeqwqqw6qw6wqweqwqw6qeTX.", +">Q!qqwqeqwqeqqwqwqqwqeqeqqecdvqwbdSUIq6lYqsZwqBUwcdgJ6q6wqqqeqq6w6wqw6qq6qqw6w6w66H >", +".NTwqeqqqeqqw6qeq6w6wqqqwqwqkPz3kk6IUAcdv6sdb~Msqwhdrqwq6w6wqeqwqwq6wqeqwwqwqqqqw4^X.", +".X*7qqwqwqw6qwqqwqqwq6w6qqwq/gddlFwelddnqw(Zsd)A6q_)q6qqwqqqeqw6q6wqqeqw6qeq6qew6r:,>", +"X9`86eqeqeqqw6w6w6w6qwqwe6ew6w6qqwqqwq6q6esZeqqw6wBJqwew6w6wq6qwqwqeqqeqqw6qww6q7',> ", +">,<]u6qqqqw6qwqqwqqwq6w6qwqqqqeq6w6q6wwqwqsZww6qudk3q6q6wqwqeqw6w6qwqeqqw6wq6qw4[...>", +".X19]u46w6wqw6w6qeqeqwqqwq6weqwqwqwqw6qwqqweqqqwqqeqqwwq6w6qqeqwqqw6wqqeqw6qe6~p .. X", +" X .>X'r4666666666666464666666464664666666666646666466466666466464666466666640].{> . ", +".>.. ...OQ]y]Q]yQ]yy+y]CQCCyCyCQQCCyCyQ]yyyQ]QCQQyyyQyC]y]CyQ]Cy]Qy]CQCQ]]]}a.X>X9 9." +}; diff --git a/clientgui/res/templates/cpdnbbc.ico b/clientgui/res/templates/cpdnbbc.ico deleted file mode 100644 index bea2ddbd9f..0000000000 Binary files a/clientgui/res/templates/cpdnbbc.ico and /dev/null differ diff --git a/clientgui/res/templates/cpdnbbc16.bmp b/clientgui/res/templates/cpdnbbc16.bmp deleted file mode 100644 index add8680a97..0000000000 Binary files a/clientgui/res/templates/cpdnbbc16.bmp and /dev/null differ diff --git a/clientgui/res/templates/cpdnbbc32.bmp b/clientgui/res/templates/cpdnbbc32.bmp deleted file mode 100644 index 6adb081627..0000000000 Binary files a/clientgui/res/templates/cpdnbbc32.bmp and /dev/null differ diff --git a/clientgui/res/templates/cpdnbbcapwizard.bmp b/clientgui/res/templates/cpdnbbcapwizard.bmp deleted file mode 100644 index 3feedf61a7..0000000000 Binary files a/clientgui/res/templates/cpdnbbcapwizard.bmp and /dev/null differ diff --git a/clientgui/res/templates/skins/copy_all_button.jpg b/clientgui/res/templates/skins/copy_all_button.jpg new file mode 100644 index 0000000000..0d69ac4127 Binary files /dev/null and b/clientgui/res/templates/skins/copy_all_button.jpg differ diff --git a/clientgui/res/templates/skins/copy_button.jpg b/clientgui/res/templates/skins/copy_button.jpg new file mode 100644 index 0000000000..02452215d1 Binary files /dev/null and b/clientgui/res/templates/skins/copy_button.jpg differ diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp index d0a7fa8985..841e229705 100644 --- a/clientgui/sg_DlgMessages.cpp +++ b/clientgui/sg_DlgMessages.cpp @@ -165,8 +165,10 @@ void CPanelMessages::CreateControls() #endif #ifdef wxUSE_CLIPBOARD - wxButton* itemButton1 = new wxButton; - itemButton1->Create(this, ID_COPYAll, _("Copy all messages"), wxDefaultPosition, wxDefaultSize, 0); + wxBitmapButton* itemButton1 = new wxBitmapButton(this, ID_COPYAll, *pSkinSimple->GetCopyAllButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); + if ( pSkinSimple->GetCopyAllButton()->GetBitmapClicked() != NULL ) { + itemButton1->SetBitmapSelected(*pSkinSimple->GetCopyAllButton()->GetBitmapClicked()); + } itemButton1->SetHelpText( _("Copy all the messages to the clipboard.") ); @@ -177,8 +179,10 @@ void CPanelMessages::CreateControls() #endif itemBoxSizer4->Add(itemButton1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton2 = new wxButton; - itemButton2->Create(this, ID_COPYSELECTED, _("Copy selected messages"), wxDefaultPosition, wxDefaultSize, 0); + wxBitmapButton* itemButton2 = new wxBitmapButton(this, ID_COPYSELECTED, *pSkinSimple->GetCopyButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); + if ( pSkinSimple->GetCopyButton()->GetBitmapClicked() != NULL ) { + itemButton2->SetBitmapSelected(*pSkinSimple->GetCopyButton()->GetBitmapClicked()); + } itemButton2->SetHelpText( #ifdef __WXMAC__ _("Copy the selected messages to the clipboard. " @@ -206,7 +210,7 @@ void CPanelMessages::CreateControls() itemBoxSizer4->Add(itemButton2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); #endif - wxBitmapButton* itemBitmapButton44 = new wxBitmapButton(this, wxID_OK, *pSkinSimple->GetCloseButton()->GetBitmap(), wxPoint(472,398), wxSize(57,16), wxBU_AUTODRAW); + wxBitmapButton* itemBitmapButton44 = new wxBitmapButton(this, wxID_OK, *pSkinSimple->GetCloseButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); if ( pSkinSimple->GetCloseButton()->GetBitmapClicked() != NULL ) { itemBitmapButton44->SetBitmapSelected(*pSkinSimple->GetCloseButton()->GetBitmapClicked()); } diff --git a/win_build/boincmgr_curl_2003.vcproj b/win_build/boincmgr_curl_2003.vcproj index 83a8356dfd..3444ba45cf 100644 --- a/win_build/boincmgr_curl_2003.vcproj +++ b/win_build/boincmgr_curl_2003.vcproj @@ -455,6 +455,12 @@ + + + +