From 3ca507a6eb1cecbf40a907a52c27128efb666ec0 Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Mon, 21 Jun 2010 01:33:44 +0000 Subject: [PATCH] fixed colors on ubuntu lucid, enabled -O2 in makefile.unix, boost removed -mt from their library names in 1.40, updated bitcoin icon, hashmeter, generated and hashmeter log entries -- version 0.2.13 --- locale/de/LC_MESSAGES/bitcoin.mo | Bin 16269 -> 16025 bytes locale/de/LC_MESSAGES/bitcoin.po | 5 - locale/it/LC_MESSAGES/bitcoin.mo | Bin 15713 -> 15547 bytes locale/it/LC_MESSAGES/bitcoin.po | 13 +- locale/nl/LC_MESSAGES/bitcoin.mo | Bin 15045 -> 14859 bytes locale/nl/LC_MESSAGES/bitcoin.po | 12 +- main.cpp | 31 +- makefile.unix | 8 +- net.cpp | 2 +- net.h | 2 +- rc/bitcoin-bc.ico | Bin 0 -> 22486 bytes rc/bitcoin.ico | Bin 22486 -> 25782 bytes rc/favicon.ico | Bin 0 -> 2550 bytes serialize.h | 2 +- ui.cpp | 11 +- uibase.cpp | 20 +- uibase.h | 5 +- uiproject.fbp | 265 +++++++-------- util.cpp | 4 +- xpm/bitcoin16.xpm | 412 ++++++++++++----------- xpm/bitcoin20.xpm | 376 +++++++++------------ xpm/bitcoin32.xpm | 445 +++++++++++++------------ xpm/bitcoin48.xpm | 555 +++++++++++++++---------------- 23 files changed, 1046 insertions(+), 1122 deletions(-) create mode 100644 rc/bitcoin-bc.ico create mode 100644 rc/favicon.ico diff --git a/locale/de/LC_MESSAGES/bitcoin.mo b/locale/de/LC_MESSAGES/bitcoin.mo index 384a7ae388278a6d0857dd6125c1dd815717c2db..e6c860eec597e780de408131cc2daa60aa144217 100644 GIT binary patch delta 2276 zcmXZce@vBC9LMqRB`)9v0p$Xw1Sr1~@&YM#LDxcCD}GdFGH~Sm!^|eS09ik7J&w6b zqD{TFU~8FfHj8R4N?5tJw%TY*eylZNQ45x0KisU%SsTmVAD?Gqyq&EgukOATts%ol5^M=%)>H#90Pa= zHSRT3h9^)H4xuXY8S1@p)PggZj&rEM{`P)%{A`f+Ivo{hCaN?Ar~$R8t!O|^xDDUK zcAUf{$}@&D_&uIxgS9|UzS;eF1b5>keuEo02wHCu*=ompYurqWJ;O-y)`SY+X$;~E zsI5ARs?__aOwXg<{{czL{z7e8YJs~o6{rf;qY`LERb=-q+5Zk6w7@~^;PCXJD)A5D z-Gd25?kT?)3ECP_86H5DycacLzt=v23hZrE0wd_hG1MU*M~(X#Q&``wcpcYK6W>H- zxSSKHLsf`63nA3NEvUV3^4dF)-LQz)c2H;N2qxeF`tc-c-ZNhR2s$e1mpo{pX;dkH zMIAaTaWkkv-SY=fCEV_{ccB*QK#FBiN@yOn@O4xL6H8soO43E0^ zW!Qr%eIIJz0BYeO)E14R0=|GMkB0R_2ahjhb&A)?z&-qJv7{74P@sWz=7h zzDtKD`p$cC8k1=Mf~v@Gs0{o>tA(>s6O~{yR^bxt_4@mMP!o)z0-8isW(GN@_9yPg^a{7%K_zq?iP=Vxs@ptjeBdt5 z4*_JL0(V;0nN{;}78SrOYLDho8OMj*(q$oYST1Uh8}KFEgCk6M8E>8XDtC)UP+K;I z3ivW=+`p)b23fRC_dmo#3LX8p9tV-&YyuU~e;B~{yWI~*8tOg=QRCKP9BxE?ifg_8 zM{qCgc2wqLsClL^9cM9v_3bJT8t7wnMVO77u?k7bo%0?fo3T#AjT_u4S1`@e?=l_ZKP)c_{o5T@cMIDubb9i={2!(z0@H=13; zPx(qIqcdT%t#}TjxQJ_b|G8SXa&Ogf)962iLA;8N_AG9bdstSXBHfC*W^JfLb`UjS z5cO&O$ou^Q=Fwh2-Ty?&rt#&T_o3!#LEVl{)HRHv<~zLEVt)jF@-@c3O|J3TurKAN z&lel^rC#z6*98~S%0kuomDSFTa{tTVE|YhR@MKxa6AOQbupqcgI% d`>EKYh3~{#i*jSv3hRfTEy_t4PAq>p<9|tQ`u6|; delta 2531 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 XCGRvo;`1jv!sW@s#i7)Ja4i3S$=2!> delta 2399 zcmY+_e@s;&0pG--N28l29Dr-JcDU?8E4|J$SdYA3}Y6Z=3or- z@HxB_58)j+gwyZ>p2c5qlkP7t2~$X896 z5UN5SV+szT0yu@Ua13kk5-RhRw|j}KL5&we1-KO>|N149EAPc+!$I-?j%b1hcgPLeF8=(+uQ3>wy?L~4(n8P$Q@#n~XGNY(9x`-;# z6w=YmDKLf@Oet!Ks!>Z3K~*Gy3V0u?0tbDMpvLXT)&Pm1D!!bkDwy9qL_?+MLQT8} zwfPRB*0>*4`p;0M97a{>d(=Qbq9&g7z3!V<nRDxxw@z$df+k_d+Z^ASbKnrT1 zPE^Lv`qu}1kD>zk5YzAkD$pVS`V6WgdPqn2W# znEF3R;|e!2u$iJu!&Gs&;#Gm;0hftOK z7I)wUR7IXh-0PM48C=4Rw~>!I&A)WKhT}Me8*sdoZ#yiavnuikD$p8KN!xG+b|YQQ zi^$0|1K5dYaVH5pcAvKi6C+E#h{sR^OkyTZp(4y&=9RDztGQl-n)oFo3G*7V9n7cx z{hv?)OkgTrK~?HHYKi8uK~gXmS(1dwqoEg;;iI@3m3a?pN!~!M*?ydZM^Ggm^c}@D zTwg?0u4uVe`Ykw}>!(mZO56SG=TV!v7c+JK`~3%Bpa%XLwdOzIO#IV-o?h;4qAXNp z3Q=D?m8gI>qx#q30NQvC^H%T+ihtl`JY8YT!}!rkmW27u4H_q~<9=_T@>SkmcmU^e zzXdf>H|l#~FJ|F!)T#Lr|2g-l{#P*vgO%RtDMV$w5wkJsyBqVhOZU-GsSlzuIqG-l zuS~WC3jzU?d}YR9AQ0*c&Ds?>kUTkSZQ9mt&5^jp$L?&mW05vH>V{jbxYOkB49Dyx zmR03gQOC7nc59dAM6HNxH90XW+~9W5uPG7@M;juv+*mjo=WfJ_#*-=8=VvdgC|z1+ zm6cVlSXsK1zu?Aj+%4UvZmnV0iB(!#A>JIZYQj&4+Z@+P-f~xMdTkXm{4X54)&6fh zwRX&nIUPH#XvB6cr`>9X9S$+s4b857GbFwBZ%lT)uXb@`prEfldqv;m;+phG)M~VY eeN`pva&M+;ZMWkM%`tn2%`*)bOdcp{o&7fvolYqL diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po index 163e70f18..643dc308d 100644 --- a/locale/nl/LC_MESSAGES/bitcoin.po +++ b/locale/nl/LC_MESSAGES/bitcoin.po @@ -691,8 +691,6 @@ msgstr "versie" msgid "" "Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "\n" -"This is experimental software. Do not rely on it for actual financial transactions.\n" -"\n" "Distributed under the MIT/X11 software license, see the accompanying file \n" "license.txt or http://www.opensource.org/licenses/mit-license.php.\n" "\n" @@ -702,14 +700,12 @@ msgid "" msgstr "" "Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "\n" -"Dit is experimentele software. Vertrouw niet op het voor echte financiele transacties.\n" -"\n" "Gedistributeerd onder de MIT/X11 software licentie, see het bijbehorende bestand \n" -"license.txt of \"http://www.opensource.org/licenses/mit-license.php.\n" +"license.txt of http://www.opensource.org/licenses/mit-license.php.\n" "\n" -"Dit product komt met software ontwikkeld door het OpenSSL Project for gebruik in de\n" -"OpenSSL Toolkit (http://www.openssl.org/) and de cryptografische software geschreven door \n" -"Eric Young (eay@cryptsoft.com)." +"Dit product komt met software ontwikkeld door het OpenSSL Project for gebruik \n" +"in de OpenSSL Toolkit (http://www.openssl.org/) and de cryptografische \n" +"software geschreven door Eric Young (eay@cryptsoft.com)." #: ../../../uibase.cpp:619 msgid "Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L) or IP address (e.g. 123.45.6.7)" diff --git a/main.cpp b/main.cpp index 37f7742b6..0f333765c 100644 --- a/main.cpp +++ b/main.cpp @@ -2487,6 +2487,7 @@ void ThreadBitcoinMiner(void* parg) vnThreadsRunning[3]--; PrintException(NULL, "ThreadBitcoinMiner()"); } + UIThreadCall(bind(CalledSetStatusBar, "", 0)); printf("ThreadBitcoinMiner exiting, %d threads remaining\n", vnThreadsRunning[3]); } @@ -2677,6 +2678,8 @@ void BitcoinMiner() printf("BitcoinMiner:\n"); printf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex().c_str(), hashTarget.GetHex().c_str()); pblock->print(); + printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str()); + printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str()); SetThreadPriority(THREAD_PRIORITY_NORMAL); CRITICAL_BLOCK(cs_main) @@ -2704,8 +2707,33 @@ void BitcoinMiner() } // Update nTime every few seconds - if ((++tmp.block.nNonce & 0xffff) == 0) + const uint64 nMask = 0xffff; + if ((++tmp.block.nNonce & nMask) == 0) { + // Meter hashes/sec + static int64 nHashCounter; + static int64 nLastTick; + if (nLastTick == 0) + nLastTick = GetTimeMillis(); + else + nHashCounter += nMask + 1; + if (GetTimeMillis() - nLastTick > 4000) + { + double dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nLastTick); + nLastTick = GetTimeMillis(); + nHashCounter = 0; + string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0); + UIThreadCall(bind(CalledSetStatusBar, strStatus, 0)); + static int64 nLogTime; + if (GetTime() - nLogTime > 60 * 60) + { + nLogTime = GetTime(); + printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str()); + printf("hashmeter %3d CPUs %6.0f khash/s\n", vnThreadsRunning[3], dHashesPerSec/1000.0); + } + } + + // Check for stop or if block needs to be rebuilt if (fShutdown) return; if (!fGenerateBitcoins) @@ -2738,6 +2766,7 @@ void BitcoinMiner() } break; } + tmp.block.nTime = pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); } } diff --git a/makefile.unix b/makefile.unix index 10c4eece7..b42f1d66f 100644 --- a/makefile.unix +++ b/makefile.unix @@ -21,7 +21,7 @@ WXLIBS= \ LIBS= \ -Wl,-Bstatic \ - -l boost_system-mt -l boost_filesystem-mt \ + -l boost_system -l boost_filesystem \ -l db_cxx \ -Wl,-Bdynamic \ -l crypto \ @@ -29,7 +29,7 @@ LIBS= \ WXDEFS=-D__WXGTK__ -DNOPCH DEBUGFLAGS=-g -D__WXDEBUG__ -CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS) +CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h init.h sha.h @@ -68,6 +68,6 @@ bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha.o clean: - -rm obj/* - -rm obj/nogui/* + -rm obj/*.o + -rm obj/nogui/*.o -rm headers.h.gch diff --git a/net.cpp b/net.cpp index 7539066da..3c5c9bd3c 100644 --- a/net.cpp +++ b/net.cpp @@ -965,7 +965,7 @@ void ThreadOpenConnections2(void* parg) int64 nSinceLastTry = GetAdjustedTime() - addr.nLastTry; // Randomize the order in a deterministic way, putting the standard port first - int64 nRandomizer = (uint64)(nStart + addr.nLastTry * 9567851 + addr.ip * 7789) % (2 * 60 * 60); + int64 nRandomizer = (uint64)(nStart * 4951 + addr.nLastTry * 9567851 + addr.ip * 7789) % (2 * 60 * 60); if (addr.port != DEFAULT_PORT) nRandomizer += 2 * 60 * 60; diff --git a/net.h b/net.h index f0e183d9c..981bdfdd1 100644 --- a/net.h +++ b/net.h @@ -12,7 +12,7 @@ extern int nBestHeight; -#define DEFAULT_PORT htons(8333) +static const unsigned short DEFAULT_PORT = 0x8d20; // htons(8333) static const unsigned int PUBLISH_HOPS = 5; enum { diff --git a/rc/bitcoin-bc.ico b/rc/bitcoin-bc.ico new file mode 100644 index 0000000000000000000000000000000000000000..88cc240e2d4f77fa66730593a890a17aab86cbdc GIT binary patch literal 22486 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 IOZolyKiCZ4$N&HU literal 0 HcmV?d00001 diff --git a/rc/bitcoin.ico b/rc/bitcoin.ico index 88cc240e2d4f77fa66730593a890a17aab86cbdc..cdec9a037b1736061d63f5bf0e1563eda8f38529 100644 GIT binary patch literal 25782 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 literal 22486 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 IOZolyKiCZ4$N&HU diff --git a/rc/favicon.ico b/rc/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d249e41feb0fd2bb0d0ab942a9c84f304586164a GIT binary patch literal 2550 zcmaKu4OCQR8pr=?scEZHaoWvVF*b7Z6H|1_KvPS@RR%+Z@FTEAMU4?rKs1mKg^`hA zMqygi1%gn=BeR2?G(<#LQJ0T#MRpO$_(sd+ltK#f-)DwZThG=#=b7Q&dH>J7m;2t| z?*#^6AV!UXd=JIirvV4xzx#Gr`xKy-W8*Bxr0k?D<9=xy;Jf^0W;_b9jOiwL?%b`lRW>msC-He%;SK*p@4U50HfO#30u;j=^ zDALcvGrI&Uq!d{f;dQhOo;elpJYEi;6H>Y5n44+FyII#T|5!cVIbH`JlUb?;9~c|3 zBJZF07~J7Mlv{u=&&# zgcjD|eNz(_n;Nm?WGfW%?J1?mYsS(q+u(b;5xxbD@F{GAqM!py3%-T-R~_&K(fxzMhgcsMtr|33T6?Y=w+zkX2wIJ|ZGXhK6;9qhJYtDa*)g`yFp|k^=<@b=% z7AP;aV9TXe1Yd5))`|{nueyaW^KFD)y^DxzcMyH_G~&LhM8fHEL|te=blDBWUur@^ zc@xxsZ-VM_GgK8VNUm%_qPZQqs#c^_-$d%QThQ138*#NiAgZj-ams3|E3F8Zh4oUNt|?V+7ps zB7!g$Nf?h@IH3}=(TRnijSuJ;1S;Y{Wg4jYD`+eO&0qf{Zzp*t$uE+;pX5U&ua^Ah zk~c}dQ1TZfFXzdij_pAhNv?Vx6F_8LnUwd57
&NeSIdbJk`}Pf$5i^rN9A~rZH!;sm^il^8K)7nF$NLBL zyAP!PaYCT(S9b5}Hmq2+N&oy5fBooLTGzpU(0MKY_!IrFU)h=R+NAiPfzCQluVqX0 zifH|qiEnQU8ni$+XVxq?{RoGo?Jggv7e5oG+xW(eD7|}xev$8Lt*t%$l7Iig)VTSv z(^s!aP|2iOsM_|s;h&D$_13CwI@?gWz-b8@pLbrL?VYG~eARjb@BK-mO-|N^yky<8 zd@P(l*=b(?Uhf#0XL4UfG6y3E^w* zzp*{-{J4lioi8i3Juj_GXntYU&SUlg(QZGNT%k7(oD!8DwkYG=_wueYsrdnuTS;we zALU)8kFkQbfr%X99hyHQL~Z-iK5NqQ20471c|>?2Jfpa&?-l<@7l)|q z_?YWm6s}QNOW`qvF%-5?IK_;nZXRjtp|F|G=~Wa~GD+@HTqW1AeXU z6sJ*`N?{(wUlczv@?TvHDr@H8W!vs8J%0Iz@*Z;i;s=U9taT#6^?Zz!WUgW_HKo^7W%jM3M-DZZdhK*GJ(*T>ph=D-xyiR{?AZtkqP zL-9OiJwb60WevgP%2tY>`Qe$H6mL<}W;ypM4qqM`WyxB$2@wZJ&PdL$h>_m$H+m^f zrFfgNPLStRL-8!dO;k5MpsWcv+;>Ojf~eGi{ptQsr(NkblXn}Ai(h3PKVV{W9}{JK zfAvw^Nv9;!cXk_8o805lgb4qCn-ZBmcWS&L(=ENYVNv#l9=Fd+zI#h!Dsl+@bI|y$ h`z=ea|Jgc68s-!YGR%n_&|iRI&M(!&ah8lF`yZ|pi&Ovr literal 0 HcmV?d00001 diff --git a/serialize.h b/serialize.h index 39fe57c90..d5d4e1372 100644 --- a/serialize.h +++ b/serialize.h @@ -19,7 +19,7 @@ class CScript; class CDataStream; class CAutoFile; -static const int VERSION = 212; +static const int VERSION = 213; static const char* pszSubVer = ""; diff --git a/ui.cpp b/ui.cpp index a21cd436c..6a1f6bafa 100644 --- a/ui.cpp +++ b/ui.cpp @@ -250,7 +250,8 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent) #ifdef __WXMSW__ SetIcon(wxICON(bitcoin)); #else - SetIcon(bitcoin16_xpm); + SetIcon(bitcoin20_xpm); + SetBackgroundColour(m_toolBar->GetBackgroundColour()); wxFont fontTmp = m_staticText41->GetFont(); fontTmp.SetFamily(wxFONTFAMILY_TELETYPE); m_staticTextBalance->SetFont(fontTmp); @@ -374,13 +375,13 @@ void CMainFrame::OnIconize(wxIconizeEvent& event) // to get rid of the deprecated warning. Just ignore it. if (!event.Iconized()) fClosedToTray = false; -#ifndef __WXMSW__ - // Tray is not reliable on ubuntu 9.10 gnome - fClosedToTray = false; -#endif +#ifdef __WXMSW__ + // The tray icon sometimes disappears on ubuntu karmic + // Hiding the taskbar button doesn't work reliably on ubuntu lucid if (fMinimizeToTray && event.Iconized()) fClosedToTray = true; Show(!fClosedToTray); +#endif ptaskbaricon->Show(fMinimizeToTray || fClosedToTray); } diff --git a/uibase.cpp b/uibase.cpp index 56d52e316..7ce498193 100644 --- a/uibase.cpp +++ b/uibase.cpp @@ -20,8 +20,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString& this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_menubar = new wxMenuBar( 0 ); - m_menubar->SetBackgroundColour( wxColour( 240, 240, 240 ) ); - m_menuFile = new wxMenu(); wxMenuItem* m_menuFileExit; m_menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL ); @@ -95,25 +93,21 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString& wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); - m_panel14 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer66; bSizer66 = new wxBoxSizer( wxHORIZONTAL ); - m_staticText41 = new wxStaticText( m_panel14, wxID_ANY, _("Balance:"), wxDefaultPosition, wxSize( -1,15 ), 0 ); + m_staticText41 = new wxStaticText( this, wxID_ANY, _("Balance:"), wxDefaultPosition, wxSize( -1,15 ), 0 ); m_staticText41->Wrap( -1 ); bSizer66->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - m_staticTextBalance = new wxStaticText( m_panel14, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 120,15 ), wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); + m_staticTextBalance = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 120,15 ), wxALIGN_RIGHT|wxST_NO_AUTORESIZE ); m_staticTextBalance->Wrap( -1 ); m_staticTextBalance->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) ); m_staticTextBalance->SetBackgroundColour( wxColour( 255, 255, 255 ) ); bSizer66->Add( m_staticTextBalance, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_panel14->SetSizer( bSizer66 ); - m_panel14->Layout(); - bSizer66->Fit( m_panel14 ); - bSizer3->Add( m_panel14, 1, wxEXPAND|wxALIGN_BOTTOM|wxALL, 5 ); + bSizer3->Add( bSizer66, 1, wxEXPAND|wxALL, 5 ); bSizer3->Add( 0, 0, 0, wxEXPAND, 5 ); @@ -560,12 +554,12 @@ CAboutDialogBase::CAboutDialogBase( wxWindow* parent, wxWindowID id, const wxStr bSizer631->Add( 0, 4, 0, wxEXPAND, 5 ); - m_staticTextMain = new wxStaticText( this, wxID_ANY, _("Copyright (c) 2009-2010 Satoshi Nakamoto.\n\nThis is experimental software. Do not rely on it for actual financial transactions.\n\nDistributed under the MIT/X11 software license, see the accompanying file \nlicense.txt or http://www.opensource.org/licenses/mit-license.php.\n\nThis product includes software developed by the OpenSSL Project for use in the \nOpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \nEric Young (eay@cryptsoft.com)."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextMain = new wxStaticText( this, wxID_ANY, _("Copyright (c) 2009-2010 Satoshi Nakamoto.\n\nDistributed under the MIT/X11 software license, see the accompanying file \nlicense.txt or http://www.opensource.org/licenses/mit-license.php.\n\nThis product includes software developed by the OpenSSL Project for use in the \nOpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \nEric Young (eay@cryptsoft.com)."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextMain->Wrap( -1 ); bSizer631->Add( m_staticTextMain, 0, wxALL, 5 ); - bSizer631->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizer631->Add( 0, 0, 0, wxEXPAND, 5 ); bSizer62->Add( bSizer631, 1, wxEXPAND, 5 ); @@ -578,9 +572,9 @@ CAboutDialogBase::CAboutDialogBase( wxWindow* parent, wxWindowID id, const wxStr bSizer61->Add( 0, 0, 1, wxEXPAND, 5 ); m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); - bSizer61->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizer61->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 6 ); - bSizer60->Add( bSizer61, 0, wxALIGN_RIGHT|wxEXPAND|wxRIGHT, 5 ); + bSizer60->Add( bSizer61, 0, wxALIGN_RIGHT|wxEXPAND|wxRIGHT, 2 ); bSizer63->Add( bSizer60, 1, wxEXPAND|wxLEFT, 5 ); diff --git a/uibase.h b/uibase.h index b1e32cb8e..67501cb95 100644 --- a/uibase.h +++ b/uibase.h @@ -25,9 +25,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -82,7 +82,6 @@ class CMainFrameBase : public wxFrame wxButton* m_buttonNew; wxButton* m_buttonCopy; - wxPanel* m_panel14; wxStaticText* m_staticText41; wxStaticText* m_staticTextBalance; @@ -228,7 +227,7 @@ class CAboutDialogBase : public wxDialog public: wxStaticText* m_staticTextVersion; - CAboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 532,329 ), long style = wxDEFAULT_DIALOG_STYLE ); + CAboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 532,315 ), long style = wxDEFAULT_DIALOG_STYLE ); ~CAboutDialogBase(); }; diff --git a/uiproject.fbp b/uiproject.fbp index 779d9d4e5..f5d654e13 100644 --- a/uiproject.fbp +++ b/uiproject.fbp @@ -71,7 +71,7 @@ - 240,240,240 + 1 @@ -583,156 +583,113 @@ none 5 - wxEXPAND|wxALIGN_BOTTOM|wxALL + wxEXPAND|wxALL 1 - - - - 1 - - - 0 - wxID_ANY - + - m_panel14 - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer66 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Balance: - - - m_staticText41 - protected - - -1,15 - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - + bSizer66 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Balance: + + + m_staticText41 + protected + + -1,15 + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 255,255,255 - - 1 - - ,90,90,8,70,0 - 0 - wxID_ANY - - - - m_staticTextBalance - protected - - 120,15 - wxALIGN_RIGHT|wxST_NO_AUTORESIZE - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 255,255,255 + + 1 + + ,90,90,8,70,0 + 0 + wxID_ANY + + + + m_staticTextBalance + protected + + 120,15 + wxALIGN_RIGHT|wxST_NO_AUTORESIZE + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1653,7 +1610,7 @@ 5 wxEXPAND|wxLEFT 1 - + 1 @@ -2909,7 +2866,7 @@ CAboutDialogBase - 532,329 + 532,315 wxDEFAULT_DIALOG_STYLE About Bitcoin @@ -3173,7 +3130,7 @@ 0 wxID_ANY - Copyright (c) 2009-2010 Satoshi Nakamoto. This is experimental software. Do not rely on it for actual financial transactions. Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com). + Copyright (c) 2009-2010 Satoshi Nakamoto. Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com). m_staticTextMain @@ -3215,7 +3172,7 @@ 5 wxEXPAND - 1 + 0 0 protected @@ -3227,7 +3184,7 @@ - 5 + 2 wxALIGN_RIGHT|wxEXPAND|wxRIGHT 0 @@ -3246,7 +3203,7 @@ - 5 + 6 wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND 0 diff --git a/util.cpp b/util.cpp index 49f86d2de..62ae3b45d 100644 --- a/util.cpp +++ b/util.cpp @@ -101,10 +101,8 @@ void RandAddSeedPerfmon() hash = 0; memset(pdata, 0, nSize); - printf("%s RandAddSeed() %d bytes\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str(), nSize); + printf("%s RandAddSeed() %d bytes\n", DateTimeStrFormat("%x %H:%M", GetTime()).c_str(), nSize); } -#else - printf("%s RandAddSeed()\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); #endif } diff --git a/xpm/bitcoin16.xpm b/xpm/bitcoin16.xpm index a1397522a..f70fef026 100644 --- a/xpm/bitcoin16.xpm +++ b/xpm/bitcoin16.xpm @@ -1,203 +1,219 @@ /* XPM */ static const char * bitcoin16_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 16 181 2", -" c #775605", -". c #745507", -"X c #785806", -"o c #7D5A06", -"O c #745508", -"+ c #755508", -"@ c #755608", -"# c #775708", -"$ c #77580B", -"% c #7A5A0B", -"& c #7D5E14", -"* c #86630D", -"= c #8D6B16", -"- c #886818", -"; c #927019", -": c #91701E", -"> c #9A751E", -", c #957627", -"< c #9A7925", -"1 c #987827", -"2 c #98782B", -"3 c #9D7C2F", -"4 c #9E7E31", -"5 c #A57D22", -"6 c #A88227", -"7 c #B78D2E", -"8 c #B78F2E", -"9 c #A78430", -"0 c #A48733", -"q c #A68536", -"w c #A98937", -"e c #B98F31", -"r c #B49233", -"t c #B39337", -"y c #C09837", -"u c #C39936", -"i c #C49936", -"p c #C69C39", -"a c #C89C3A", -"s c #CCA23A", -"d c #AF9240", -"f c #B99644", -"g c #BE9C46", -"h c #BF9D4A", -"j c #BA9F58", -"k c #BEA04B", -"l c #BBA253", -"z c #BAA057", -"x c #C29E44", -"c c #C2A144", -"v c #CAA246", -"b c #CCA344", -"n c #CEA645", -"m c #C2A04A", -"M c #C7A349", -"N c #C5A34A", -"B c #C7A64D", -"V c #CFA649", -"C c #CEAA4C", -"Z c #D1A84B", -"A c #D4AC49", -"S c #D5AC49", -"D c #D7AD48", -"F c #D5AF4D", -"G c #C0A451", -"H c #CAA550", -"J c #CBAA58", -"K c #CAAD5D", -"L c #D9AD53", -"P c #DFB757", -"I c #D5B058", -"U c #D7B75D", -"Y c #DCB75A", -"T c #DFBB5E", -"R c #E1B957", -"E c #E3B759", -"W c #E6BC5B", -"Q c #E7BE5D", -"! c #E5BC5E", -"~ c #CAAE62", -"^ c #C8AF6A", -"/ c #CDB565", -"( c #CDB46D", -") c #D7B360", -"_ c #D5B862", -"` c #D1B66C", -"' c #D8BB68", -"] c #DBBA6E", -"[ c #DFBE6D", -"{ c #D0B872", -"} c #D2B974", -"| c #DABF74", -" . c #D8BF77", -".. c #D6BD79", -"X. c #D5BE7B", -"o. c #D7BF7A", -"O. c #E8BC61", -"+. c #DDC075", -"@. c #DCC279", -"#. c #DCC47E", -"$. c #EDC661", -"%. c #EEC562", -"&. c #E0C16B", -"*. c #E0C36B", -"=. c #E3C26A", -"-. c #E7C26A", -";. c #E3C569", -":. c #E3C26C", -">. c #E4C16C", -",. c #EEC969", -"<. c #F4C664", -"1. c #F0CA68", -"2. c #F7CA68", -"3. c #F6CD69", -"4. c #F7CD69", -"5. c #F7CF68", -"6. c #E6C374", -"7. c #E1C47A", -"8. c #E1C77B", -"9. c #E5C578", -"0. c #E4C579", -"q. c #E4C67A", -"w. c #E5C67C", -"e. c #E8C57B", -"r. c #E8CB7B", -"t. c #EDCC78", -"y. c #EBCB7C", -"u. c #F0CF73", -"i. c #F6CF74", -"p. c #F4D173", -"a. c #F7D072", -"s. c #F5D376", -"d. c #FAD071", -"f. c #FBD470", -"g. c #FAD572", -"h. c #FDD671", -"j. c #FDD773", -"k. c #F3DB76", -"l. c #F8D578", -"z. c #FBDB79", -"x. c #FFE57E", -"c. c #DEC681", -"v. c #DFC782", -"b. c #E0C682", -"n. c #E1C984", -"m. c #E2C985", -"M. c #E3CB87", -"N. c #E9C980", -"B. c #EBCC82", -"V. c #E3CC88", -"C. c #E4CF8D", -"Z. c #EFD187", -"A. c #EFD488", -"S. c #EFD58D", -"D. c #F6D581", -"F. c #F1D687", -"G. c #F9D680", -"H. c #F7DA8B", -"J. c #F2DE93", -"K. c #FADF93", -"L. c #F3DB98", -"P. c #F0DB9B", -"I. c #FEE081", -"U. c #FEE18C", -"Y. c #FCE38F", -"T. c #F7E98E", -"R. c #FFE88C", -"E. c #F6E491", -"W. c #FBEA91", -"Q. c #FFE897", -"!. c #FFEE9A", -"~. c #FEE99D", -"^. c #FEEC9F", -"/. c #FEF092", -"(. c #FFF29A", -"). c #FBE7A9", -"_. c #F4EDA8", -"`. c #FAEBAA", -"'. c #FEEBAD", -"]. c #FEFABD", -"[. c None", +"16 16 197 2", +" c #755507", +". c #775606", +"X c #795707", +"o c #7D5A07", +"O c #765608", +"+ c #74550A", +"@ c #75550A", +"# c #75560A", +"$ c #785708", +"% c #78580B", +"& c #7D5C0B", +"* c #78590E", +"= c #7E5F14", +"- c #8A6711", +"; c #8D6B15", +": c #8A691A", +"> c #93711C", +", c #9D7A23", +"< c #9F7B22", +"1 c #9C7B2A", +"2 c #9E7C28", +"3 c #A37F26", +"4 c #B4831B", +"5 c #A68126", +"6 c #A5852E", +"7 c #A9872E", +"8 c #AC862D", +"9 c #AC872F", +"0 c #AF8B30", +"q c #AC8932", +"w c #AF8A34", +"e c #B08E36", +"r c #B98F33", +"t c #B18E3A", +"y c #B39036", +"u c #B69237", +"i c #B3913B", +"p c #B6923C", +"a c #BD9338", +"s c #B9993F", +"d c #BA993F", +"f c #C2932D", +"g c #C09437", +"h c #C59832", +"j c #C39836", +"k c #C89835", +"l c #C59C3D", +"z c #CF9E3E", +"x c #CFA23F", +"c c #D0A13A", +"v c #D3A23A", +"b c #D4A338", +"n c #D6A33F", +"m c #B19345", +"M c #BF9940", +"N c #BF9D43", +"B c #B3954B", +"V c #BD9A48", +"C c #BC9C4B", +"Z c #BD9F51", +"A c #CAA244", +"S c #C2A14B", +"D c #C4A44B", +"F c #C1A24C", +"G c #C7A64C", +"H c #C5A64E", +"J c #C9A94F", +"K c #D1A343", +"L c #D7A644", +"P c #D5A547", +"I c #D6A547", +"U c #DCAD42", +"Y c #DDAB45", +"T c #C3A151", +"R c #C9A551", +"E c #CAAA50", +"W c #CBAD53", +"Q c #CDAC52", +"! c #CEA855", +"~ c #CEB15A", +"^ c #DEB154", +"/ c #D1B35A", +"( c #D7B35A", +") c #D8B45D", +"_ c #E3B34A", +"` c #E2B34E", +"' c #E6B54F", +"] c #E2B350", +"[ c #E3B352", +"{ c #E4B451", +"} c #E2B355", +"| c #E7B853", +" . c #E9BC51", +".. c #ECBC53", +"X. c #E7BE5A", +"o. c #E2BA5C", +"O. c #E2BC5C", +"+. c #E9BB59", +"@. c #EBBE59", +"#. c #EABD5B", +"$. c #E8BF5C", +"%. c #E9BE5E", +"&. c #C8AC63", +"*. c #D0B162", +"=. c #D5B567", +"-. c #DABC62", +";. c #D2B66B", +":. c #D0B56D", +">. c #DCBC6E", +",. c #D2B972", +"<. c #D7BE78", +"1. c #E9BE62", +"2. c #EEC05A", +"3. c #F0C25F", +"4. c #DEC26B", +"5. c #DDC27A", +"6. c #E0C167", +"7. c #E5C067", +"8. c #EBC463", +"9. c #EEC460", +"0. c #ECC364", +"q. c #E4C16B", +"w. c #E7C46B", +"e. c #E9C56C", +"r. c #E0C172", +"t. c #E5C575", +"y. c #E4C870", +"u. c #E6CA72", +"i. c #E6CA74", +"p. c #E8CB73", +"a. c #E9CE76", +"s. c #EBD07B", +"d. c #EED179", +"f. c #F5D478", +"g. c #F5D57C", +"h. c #F4D67C", +"j. c #F4D77E", +"k. c #DEC781", +"l. c #E0C883", +"z. c #E3CA89", +"x. c #E4CB8B", +"c. c #E3CD8A", +"v. c #E5CE8B", +"b. c #E3CC8E", +"n. c #E8D18D", +"m. c #F6D980", +"M. c #F7DB83", +"N. c #F3DA86", +"B. c #F7DA84", +"V. c #F6DB84", +"C. c #F7DB84", +"Z. c #F7DA86", +"A. c #F6DC85", +"S. c #F7DC85", +"D. c #F8DB85", +"F. c #FADD85", +"G. c #FBDE86", +"H. c #F5DE8B", +"J. c #FADD88", +"K. c #F9DF8B", +"L. c #E4CF93", +"P. c #E6CF92", +"I. c #E6D094", +"U. c #EAD597", +"Y. c #EBD698", +"T. c #EFDA99", +"R. c #F0DC9C", +"E. c #FCE089", +"W. c #FCE28B", +"Q. c #FDE28B", +"!. c #FCE38C", +"~. c #FCE28D", +"^. c #FCE38D", +"/. c #FDE38D", +"(. c #FEE38D", +"). c #FDE38E", +"_. c #FEE48D", +"`. c #FEE58F", +"'. c #FCE490", +"]. c #FDE490", +"[. c #FFE590", +"{. c #FFE690", +"}. c #FFE691", +"|. c #FEE791", +" X c #FFE692", +".X c #FFE792", +"XX c #FEE693", +"oX c #FFE693", +"OX c #FFE793", +"+X c #FEE897", +"@X c #F6E2A2", +"#X c #F7E3A2", +"$X c #FAE6A8", +"%X c #FBE7A9", +"&X c #FCE9AB", +"*X c #FDEAAC", +"=X c None", /* pixels */ -"[.[.[.[.[.3 f M m q [.[.[.[.[.[.", -"[.[.[.4 A 5.j.f.3.3.! 6 [.[.[.[.", -"[.[.9 %.h.%.D s n -.z.l.c % [.[.", -"[.1 1.g.S p i i C 6.7.W./.t [.[.", -"[._ U.Z e 7 7 y B | #.*.T.k.* [.", -", E.F.c.).).C.g K `.`.C.' x.r + ", -"d !.y.M.).j '.( ).L.h M I z.F + ", -"G (.t.M.'.'.C.j ).b.T Q O.d.R X ", -"k T.O.M.`.^ `.X.).V.;.! L i.E ", -"w I.6.c.'.).C.{ c.).).C.H d.v + ", -"[.,.u.~ } X.@.@.| .#.` V 2.5 ", -"[.x p.U J ] B.Z.9.) v a <.E o [.", -"[.[.Y s.-.[ 0.0.N.e.w.H.D.> + [.", -"[.[.2 &.).Y.A.S.L.`.]._.0 . [.[.", -"[.[.[.[.l r.Y.Q.~.J./ = $ [.[.[.", -"[.[.[.[.[.[.: 1 ; - & [.[.[.[.[." +"=X=X=X=X=X0 S G D i =X=X=X=X=X=X", +"=X=X=X9 6.).).).).).d.e =X=X=X=X", +"=X=Xu C.J.O.( h ( o.D.).J & =X=X", +"=X0 S.j.f 4 b.e P.K @.j.'.d % =X", +"=X4.).k a T Y.&.Y.R 2.2.F.S.- =X", +"e '.e.z ! v.&X,.k.*X:. .%.`.d # ", +"H +X^ I P =.*X9 j T.k.U ' F.-.% ", +"W '.` { } >.*X<.n.*XC b Y g.u.X ", +"W |.` { 3.t.&Xm C c.%Xa n m.u.. ", +"N '.9...@.r.&Xi A 5.*XM L W.~ . ", +"5 m.f._ *.#X&XR.#X%X:.v 0.'.7 # ", +"=XQ `.@.l t P.B I.u v { G.a.o =X", +"=X3 u.W.0.A z.V b.+.1.J.E., # =X", +"=X=X3 u.oXF.e.7.q.C.+XH.6 # =X=X", +"=X=X=X=XS s.'.'.'.C.~ ; * =X=X=X", +"=X=X=X=X=X=X1 1 > : = =X=X=X=X=X" }; diff --git a/xpm/bitcoin20.xpm b/xpm/bitcoin20.xpm index 93b34ba70..3cc29ac14 100644 --- a/xpm/bitcoin20.xpm +++ b/xpm/bitcoin20.xpm @@ -1,226 +1,160 @@ /* XPM */ static const char * bitcoin20_xpm[] = { /* columns rows colors chars-per-pixel */ -"20 20 200 2", -" c #7B5500", -". c #7B5900", -"X c #735508", -"o c #7B5908", -"O c #7B5D08", -"+ c #7B5910", -"@ c #7B6118", -"# c #845D08", -"$ c #846108", -"% c #8C6510", -"& c #8C6910", -"* c #8C6918", -"= c #946D10", -"- c #947118", -"; c #9C7518", -": c #A57918", -"> c #846929", -", c #846D29", -"< c #947121", -"1 c #8C7539", -"2 c #947939", -"3 c #8C7542", -"4 c #AD8221", -"5 c #B58E29", -"6 c #B58E31", -"7 c #B59231", -"8 c #BD9231", -"9 c #BD9631", -"0 c #C69A31", -"q c #C69A39", -"w c #C69E39", -"e c #CE9E39", -"r c #CEA239", -"t c #948652", -"y c #A58A4A", -"u c #BD9642", -"i c #BD9A42", -"p c #B5964A", -"a c #B59A4A", -"s c #BD9E4A", -"d c #A58E5A", -"f c #BD9A52", -"g c #BD9E52", -"h c #BDA252", -"j c #BDA25A", -"k c #BD9E63", -"l c #A59673", -"z c #AD9A73", -"x c #AD9E7B", -"c c #BDA263", -"v c #BDA26B", -"b c #BDA273", -"n c #BDA673", -"m c #B5A27B", -"M c #BDAA7B", -"N c #C69E42", -"B c #CE9E42", -"V c #C6A242", -"C c #CEA242", -"Z c #CEA642", -"A c #C6A24A", -"S c #C6A64A", -"D c #CEA64A", -"F c #CEAA4A", -"G c #D6A642", -"H c #DEAE4A", -"J c #DEB24A", -"K c #C6A252", -"L c #C6A652", -"P c #CEAA52", -"I c #CEAE52", -"U c #C6A65A", -"Y c #C6AA5A", -"T c #CEAA5A", -"R c #CEAE5A", -"E c #D6AE52", -"W c #DEAE52", -"Q c #D6AE5A", -"! c #D6B252", -"~ c #DEB252", -"^ c #DEB652", -"/ c #D6B65A", -"( c #DEB65A", -") c #DEBA5A", -"_ c #EFBE52", -"` c #E7BA5A", -"' c #E7BE5A", -"] c #EFBE5A", -"[ c #C6A663", -"{ c #C6AE63", -"} c #CEAE63", -"| c #D6AE63", -" . c #CEB26B", -".. c #CEB66B", -"X. c #DEB663", -"o. c #D6BE63", -"O. c #DEBA63", -"+. c #DEBE63", -"@. c #D6B66B", -"#. c #DEB66B", -"$. c #D6BA6B", -"%. c #D6BE6B", -"&. c #DEBA6B", -"*. c #DEBE6B", -"=. c #D6BA73", -"-. c #DEBE73", -";. c #EFBE63", -":. c #E7BE73", -">. c #DEC37B", -",. c #E7C363", -"<. c #EFC763", -"1. c #EFCF63", -"2. c #E7C36B", -"3. c #E7C76B", -"4. c #EFC36B", -"5. c #EFC76B", -"6. c #E7CB6B", -"7. c #EFCB6B", -"8. c #F7CB63", -"9. c #F7CB6B", -"0. c #F7CF6B", -"q. c #FFCB6B", -"w. c #F7D36B", -"e. c #FFD36B", -"r. c #E7C373", -"t. c #E7CB73", -"y. c #EFCF73", -"u. c #E7C37B", -"i. c #E7C77B", -"p. c #E7CB7B", -"a. c #EFCB7B", -"s. c #F7CF73", -"d. c #EFD373", -"f. c #EFD37B", -"g. c #F7D373", -"h. c #FFD373", -"j. c #FFD773", -"k. c #FFDB73", -"l. c #F7DB7B", -"z. c #FFDF7B", -"x. c #ADA284", -"c. c #BDAA84", -"v. c #BDAE84", -"b. c #B5A68C", -"n. c #B5AE9C", -"m. c #BDB6A5", -"M. c #C6BA9C", -"N. c #C6BAA5", -"B. c #C6BEA5", -"V. c #DEC784", -"C. c #E7CB84", -"Z. c #E7CF84", -"A. c #EFCF84", -"S. c #E7CF8C", -"D. c #EFCF8C", -"F. c #EFD384", -"G. c #E7D38C", -"H. c #EFD38C", -"J. c #EFD78C", -"K. c #F7D784", -"L. c #FFD784", -"P. c #F7DB84", -"I. c #F7DF84", -"U. c #FFDB84", -"Y. c #FFDF84", -"T. c #F7DB8C", -"R. c #EFD394", -"E. c #EFD794", -"W. c #EFDB94", -"Q. c #EFDB9C", -"!. c #F7DB9C", -"~. c #F7DF9C", -"^. c #FFE384", -"/. c #FFE784", -"(. c #FFE38C", -"). c #FFEB8C", -"_. c #EFE79C", -"`. c #FFE794", -"'. c #FFEB94", -"]. c #FFEF94", -"[. c #FFEB9C", -"{. c #FFEF9C", -"}. c #FFF394", -"|. c #FFF794", -" X c #C6C3B5", -".X c #CEC7BD", -"XX c #F7E3A5", -"oX c #FFE7A5", -"OX c #F7EBA5", -"+X c #FFEBA5", -"@X c #FFEFA5", -"#X c #FFE7AD", -"$X c #FFEBAD", -"%X c #FFEFAD", -"&X c #FFF3AD", -"*X c #FFF7B5", -"=X c #FFFBB5", -"-X c #FFFFBD", -";X c #CEC7C6", -":X c None", +"20 20 134 2", +" c #735305", +". c #785706", +"X c #7E5C07", +"o c #755509", +"O c #76580D", +"+ c #7F6015", +"@ c #85620D", +"# c #89650D", +"$ c #836215", +"% c #886510", +"& c #8E6B11", +"* c #81641F", +"= c #906D19", +"- c #977116", +"; c #96741E", +": c #9B761E", +"> c #947424", +", c #9B7722", +"< c #9D7824", +"1 c #A47F23", +"2 c #A17D2A", +"3 c #A58125", +"4 c #AA8327", +"5 c #A4832F", +"6 c #AD862B", +"7 c #B28B2E", +"8 c #A58433", +"9 c #A88637", +"0 c #AD8932", +"q c #A78639", +"w c #A8893C", +"e c #B28C34", +"r c #B88E33", +"t c #B28E3A", +"y c #B79136", +"u c #BB9235", +"i c #BB9639", +"p c #C19836", +"a c #C29539", +"s c #C59C3C", +"d c #A88B41", +"f c #AF9045", +"g c #B49342", +"h c #BE9641", +"j c #BD9B44", +"k c #B29448", +"l c #B7994B", +"z c #B8994C", +"x c #C09946", +"c c #CB9E46", +"v c #C59D4C", +"b c #CFA246", +"n c #CBAB47", +"m c #CEA74A", +"M c #D4A749", +"N c #D6A94D", +"B c #C7A754", +"V c #CEA453", +"C c #C6AA56", +"Z c #CDA955", +"A c #CBAB5B", +"S c #D2AB54", +"D c #D2AE5E", +"F c #D9AE5A", +"G c #D7B356", +"H c #DDB35F", +"J c #DFB95A", +"K c #E1B554", +"L c #E4BA56", +"P c #E6BC5A", +"I c #E9BE5E", +"U c #C7AC64", +"Y c #CBAF64", +"T c #CDB166", +"R c #D4B364", +"E c #DBB463", +"W c #DFB867", +"Q c #D5B76B", +"! c #DFBA6F", +"~ c #D5BB76", +"^ c #D7BE79", +"/ c #E3BC64", +"( c #E8BF64", +") c #E0BB68", +"_ c #DECA7A", +"` c #EBC265", +"' c #EBC36B", +"] c #EFC96B", +"[ c #F1C564", +"{ c #F3CB6A", +"} c #F9CD6C", +"| c #FAD16C", +" . c #E5C770", +".. c #EEC774", +"X. c #E6CE7E", +"o. c #EFCE7A", +"O. c #F1CB73", +"+. c #F4CE7A", +"@. c #F3D273", +"#. c #FCD574", +"$. c #FEDA76", +"%. c #F5D47D", +"&. c #FAD47B", +"*. c #F2D97D", +"=. c #FCDA7A", +"-. c #DDC784", +";. c #E1CA86", +":. c #E4CE8B", +">. c #ECD985", +",. c #E7D18E", +"<. c #F4DC84", +"1. c #FCDC81", +"2. c #F4DB8B", +"3. c #FBDF8B", +"4. c #EBD592", +"5. c #EFDA99", +"6. c #F1DD9C", +"7. c #F6E081", +"8. c #FDE484", +"9. c #FFEA87", +"0. c #F9E488", +"q. c #FEE88D", +"w. c #F9E394", +"e. c #FFEB93", +"r. c #FEE698", +"t. c #FEEA9B", +"y. c #FFF49A", +"u. c #F7E4A4", +"i. c #F9E5A5", +"p. c #FCE9AA", +"a. c #F7F0AA", +"s. c #FEF1AE", +"d. c #FEF6B3", +"f. c None", /* pixels */ -":X:X:X:X:X:XM.v f i g k c..X:X:X:X:X:X:X", -":X:X:X:XM.u H 8.j.j.e.0.^ 7 d X:X:X:X:X", -":X:X:Xn Z 0.k.j.8._ ] 9.h.h.~ ; b.:X:X:X", -":X:Xn J j.j.' C 0 0 w E a.K.^.d.- x.:X:X", -":XN.F k.w.G w q 0 0 D 2.i.a.].|.6.$ m.:X", -":Xg (.U.C 9 8 8 8 q S *.H.f.y.].).9 , :X", -"B.o.{.p.-.>.>.>.R 7 N =.G.E.Z.&./.1.# n.", -"M I.[.| R.$X..~.#Xs V.$XG.h @.T l.z.; t ", -"c {.'.X.E.$Xj G.$XU #X$Xg ) ! ( 0.k.5 > ", -"j }.`.O.E.$XE.oXC.p $X$XA ,.' ;.5.j.9 o ", -"j ).I.Q E.$X .Q.#X .$X$XP 7.` W 4.j.8 X ", -"c z.Y.P R.$X[ S.$X{ XX$X$.) P D 5.h.4 @ ", -"v.<.Y.I R.$XW.oXXX} @.XX#XE.XXK 8.8.& 3 ", -".XC j.3.s a h Y .J.A.T Y h 6 e 8.H . x ", -":Xk <.g./ P #.i.F.A.r.X.E B r 9.q.: + :X", -":X.Xi s.g.+.O.r.i.u.i.u.:.r.L.L.N l :X", -":X:XN.V U.(.T.a.i.C.D.!.%X-X=X%.# 1 :X:X", -":X:X:XN.g _.+X`.[.+X@X&X*XOXh O 1 :X:X:X", -":X:X:X:X;Xb i +.f.P.K.t.L = o z :X:X:X:X", -":X:X:X:X:X:X.Xm y < % * 2 x :X:X:X:X:X:X" +"f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.", +"f.f.f.f.f.f.f.0 y i i 0 , f.f.f.f.f.f.f.", +"f.f.f.f.3 p P | $.| } { I p ; f.f.f.f.f.", +"f.f.f.4 L | $.{ L K L ` =.#.` 3 $ f.f.f.", +"f.f.6 [ $.{ M a Q 0 Q S ' %.q.*.6 o f.f.", +"f.3 ' $.P i u r ,.< :.S +.%.0.y.*.& f.f.", +"f.C e.%.c x T Y 6.U 5.T R @.#.0.9.n . f.", +"f.>.t.W F A ^ p.u.~ -.p.i.C { { =.@.# f.", +"e e.3.E H / j p.6.0 V ~ p.Y ( ` #.$.3 o ", +"j p.2.( ( ! Z p.6.l R 6.6.t I I { #.y o ", +"j e.1.( ! +.H i.i.-.:.i.u.R N K ` #.u ", +"i 9.&.( ..1.) p.6.8 j w p.p.h N ' #.7 ", +"4 =.7.` ....Z p.6.g D T p.i.t M [ } - o ", +"f.J =.{ ` E i.p.p.i.p.p.6.k u M } K @ o ", +"f.7 @.@./ S z f 4.d ,.q 2 r a ( { 6 f.", +"f.f.m @.O.( / V 4.q :.v V V O.&.G X O f.", +"f.f.: G 1.0.+.W R D R ! 4.d.d._ # f.f.", +"f.f.f.2 C a.i.r.w.w.i.s.d.p.Y @ f.f.f.", +"f.f.f.f.f.5 Z .<.3.2.X.A > . f.f.f.f.", +"f.f.f.f.f.f.f.> > = # $ + f.f.f.f.f.f.f." }; diff --git a/xpm/bitcoin32.xpm b/xpm/bitcoin32.xpm index 0ac49f61a..f538a44d2 100644 --- a/xpm/bitcoin32.xpm +++ b/xpm/bitcoin32.xpm @@ -1,223 +1,232 @@ /* XPM */ static const char * bitcoin32_xpm[] = { /* columns rows colors chars-per-pixel */ -"32 32 185 2", -" c #715103", -". c #725203", -"X c #725204", -"o c #735304", -"O c #745404", -"+ c #765504", -"@ c #775504", -"# c #785604", -"$ c #795704", -"% c #795705", -"& c #77580A", -"* c #77580B", -"= c #77580C", -"- c #785808", -"; c #785809", -": c #78590D", -"> c #795A0D", -", c #7F5E0D", -"< c #7C5C0E", -"1 c #815F0E", -"2 c #89650F", -"3 c #8C670F", -"4 c #8D680F", -"5 c #836110", -"6 c #866410", -"7 c #8F6A11", -"8 c #926C12", -"9 c #946F14", -"0 c #967015", -"q c #987217", -"w c #997318", -"e c #9A751C", -"r c #9B761E", -"t c #9C7720", -"y c #9D7924", -"u c #9D7B28", -"i c #9E7C2C", -"p c #A07F31", -"a c #AA852D", -"s c #A9852E", -"d c #AC872D", -"f c #AE892E", -"g c #AF8A2E", -"h c #B08B2F", -"j c #A18133", -"k c #A78533", -"l c #A28235", -"z c #A48435", -"x c #A68535", -"c c #A58536", -"v c #A68536", -"b c #A88530", -"n c #B18C30", -"m c #B18D33", -"M c #B08D37", -"N c #B08F3B", -"B c #B08F3D", -"V c #BC9537", -"C c #BE9736", -"Z c #BF9737", -"A c #B6933B", -"S c #B0903F", -"D c #B2913E", -"F c #B4923D", -"G c #B99438", -"H c #C09736", -"J c #C19835", -"K c #C29836", -"L c #C39937", -"P c #C39A37", -"I c #C49B38", -"U c #C59C3A", -"Y c #C69D3B", -"T c #C79E3C", -"R c #C89F3D", -"E c #CAA03F", -"W c #C6A247", -"Q c #CAA140", -"! c #C9A242", -"~ c #C8A245", -"^ c #C2A14B", -"/ c #C3A24D", -"( c #C3A24F", -") c #C2A351", -"_ c #C1A352", -"` c #C0A355", -"' c #C1A457", -"] c #C1A458", -"[ c #C1A55A", -"{ c #C2A65C", -"} c #C3A75D", -"| c #C3A85E", -" . c #C6AA5D", -".. c #C7AA5D", -"X. c #C5A95E", -"o. c #CFAE5A", -"O. c #C8AB5E", -"+. c #D4AF56", -"@. c #D1AE58", -"#. c #D6B056", -"$. c #D8B155", -"%. c #D9B256", -"&. c #DAB357", -"*. c #DBB457", -"=. c #DDB558", -"-. c #DFB759", -";. c #E2BB5B", -":. c #E3BC5D", -">. c #E4BD5E", -",. c #C9AC61", -"<. c #C9AD62", -"1. c #CAAE62", -"2. c #CCAF62", -"3. c #DDBC69", -"4. c #DFBD68", -"5. c #DCBB6E", -"6. c #DCBC6C", -"7. c #DBBC70", -"8. c #DABD72", -"9. c #DBBE74", -"0. c #E4BD61", -"q. c #E4BE60", -"w. c #E3BE65", -"e. c #E2BF66", -"r. c #DDC177", -"t. c #DFC279", -"y. c #EFCB6F", -"u. c #F1CA6B", -"i. c #F4CB6A", -"p. c #F5CC6A", -"a. c #F7CD6B", -"s. c #F0CA6D", -"d. c #F7CF6E", -"f. c #EFCD72", -"g. c #EFCE77", -"h. c #E0C47B", -"j. c #E3C77E", -"k. c #E4C87F", -"l. c #F7D070", -"z. c #F8D171", -"x. c #F8D272", -"c. c #FAD473", -"v. c #FBD676", -"b. c #FCD574", -"n. c #FCD674", -"m. c #FCD777", -"M. c #F0D17E", -"N. c #FCD778", -"B. c #FCDA7A", -"V. c #FDDC7C", -"C. c #FDDE7E", -"Z. c #E6CA80", -"A. c #E8CC83", -"S. c #EACD84", -"D. c #ECD086", -"F. c #EFD286", -"G. c #EED287", -"H. c #F0D283", -"J. c #FDDF80", -"K. c #F6DF91", -"L. c #F5DE92", -"P. c #F4DE95", -"I. c #F4DF98", -"U. c #FDE081", -"Y. c #FCE184", -"T. c #FBE188", -"R. c #FAE18B", -"E. c #F8E08D", -"W. c #F5E19B", -"Q. c #F5E29C", -"!. c #F7E49D", -"~. c #F9E69B", -"^. c #FBE89B", -"/. c #FDEB9B", -"(. c #FDEC9B", -"). c #FEEE9B", -"_. c #FEEF9C", -"`. c #FEEEA3", -"'. c #FDEBA9", -"]. c #FDEBAC", -"[. c #FDEBAD", -"{. c #FDECAD", -"}. c #FDF0B0", -"|. c #FDF2B1", -" X c None", +"32 32 194 2", +" c #745305", +". c #785704", +"X c #7C5903", +"o c #75560B", +"O c #77590F", +"+ c #7C5C0B", +"@ c #795B12", +"# c #7F631D", +"$ c #825E07", +"% c #825F0B", +"& c #85610A", +"* c #8C660C", +"= c #8E680E", +"- c #916B0F", +"; c #856515", +": c #8B6714", +"> c #8F6A16", +", c #816218", +"< c #88691C", +"1 c #926D12", +"2 c #936F1C", +"3 c #997417", +"4 c #94721E", +"5 c #9B761C", +"6 c #9F781C", +"7 c #A17B1E", +"8 c #826622", +"9 c #916E20", +"0 c #967425", +"q c #9D7420", +"w c #9C7923", +"e c #997728", +"r c #99792C", +"t c #A37D23", +"y c #A37F2C", +"u c #A68125", +"i c #AB8225", +"p c #A5832B", +"a c #AA852C", +"s c #B28A2C", +"d c #A58233", +"f c #AC8734", +"g c #AE8C33", +"h c #AC8C3C", +"j c #B28C33", +"k c #B98E34", +"l c #B28D3D", +"z c #B59136", +"x c #BC9335", +"c c #B3913E", +"v c #BC933A", +"b c #BF9A3D", +"n c #C19235", +"m c #C2953C", +"M c #C39B3C", +"N c #CA9C3D", +"B c #B59343", +"V c #BE9642", +"C c #B69A44", +"Z c #BD9A45", +"A c #B49649", +"S c #BB9A49", +"D c #BB9F52", +"F c #BFA256", +"G c #C49C43", +"H c #CA9D41", +"J c #C59D4A", +"K c #C99E4D", +"L c #C3A144", +"P c #CDA244", +"I c #CFAA47", +"U c #C3A14D", +"Y c #CDA24A", +"T c #CCAB49", +"R c #D2A644", +"E c #D2A54B", +"W c #D6AA4C", +"Q c #DAAE4E", +"! c #DAB04F", +"~ c #C7A656", +"^ c #CDA452", +"/ c #CFAC52", +"( c #C0A65E", +") c #CEA75A", +"_ c #CCAC59", +"` c #D2AB53", +"' c #DCAF52", +"] c #D6AD5A", +"[ c #D9AE5B", +"{ c #DCB556", +"} c #DFB855", +"| c #D6B25F", +" . c #DCB35C", +".. c #DEBE5E", +"X. c #E2B656", +"o. c #E1B55A", +"O. c #E6BC5D", +"+. c #E9BD5E", +"@. c #C3AA63", +"#. c #CCAD62", +"$. c #D4AF62", +"%. c #CDB565", +"&. c #CEB46D", +"*. c #D7B164", +"=. c #DBB362", +"-. c #D6BD64", +";. c #DDBA64", +":. c #D3B66C", +">. c #DFB86B", +",. c #CEB772", +"<. c #D0B771", +"1. c #D4BA73", +"2. c #D9BE77", +"3. c #D6BE79", +"4. c #D8BF7A", +"5. c #E4BB62", +"6. c #E9BF64", +"7. c #E4BC69", +"8. c #E9BF69", +"9. c #E0BB71", +"0. c #E9C05E", +"q. c #D2C279", +"w. c #DBC27C", +"e. c #E2C667", +"r. c #EDC364", +"t. c #E3C16E", +"y. c #ECC46C", +"u. c #EDCC6C", +"i. c #F1C764", +"p. c #F5CA66", +"a. c #F9CD67", +"s. c #F5CC6A", +"d. c #F9CD6B", +"f. c #FBD36F", +"g. c #EDC572", +"h. c #E5CF77", +"j. c #ECCA74", +"k. c #E0C67E", +"l. c #EFCE78", +"z. c #F6CE72", +"x. c #FBCF71", +"c. c #F4CE79", +"v. c #F4D273", +"b. c #FCD473", +"n. c #F4DC75", +"m. c #FEDA74", +"M. c #F6D77C", +"N. c #FBD47A", +"B. c #F1DA7B", +"V. c #FDDA7C", +"C. c #FEE27D", +"Z. c #DDC683", +"A. c #DFC884", +"S. c #E4CA84", +"D. c #E3CC89", +"F. c #E7D183", +"G. c #EFD280", +"H. c #EFDC82", +"J. c #ECD48D", +"K. c #EFDA8C", +"L. c #F9D783", +"P. c #F2DF83", +"I. c #FCDB83", +"U. c #F5DC8F", +"Y. c #FADD8B", +"T. c #EBD593", +"R. c #EFDA99", +"E. c #F3DD93", +"W. c #F3DF9F", +"Q. c #FFE385", +"!. c #FEE986", +"~. c #FDE48C", +"^. c #FEEC8E", +"/. c #ECE199", +"(. c #F6E591", +"). c #FEE494", +"_. c #FEEB93", +"`. c #FEE69A", +"'. c #FFEB9B", +"]. c #FFF197", +"[. c #FFF39B", +"{. c #FEF99B", +"}. c #F6E2A2", +"|. c #F9E5A5", +" X c #F7E9A5", +".X c #FEECA4", +"XX c #FBE7A8", +"oX c #FDEAAB", +"OX c #F7F2AA", +"+X c #FEF2AC", +"@X c #FDF4B4", +"#X c #FFFABA", +"$X c #FFFEC2", +"%X c None", /* pixels */ -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X", -" X X X X X X X X X X X Xc F z z F z j X X X X X X X X X X X X X", -" X X X X X X X X Xz b V ~ %.;.u.e.-.! f e i X X X X X X X X X X", -" X X X X X X Xz d ! >.a.l.B.v.c.a.a.a.a.>.R w 6 X X X X X X X X", -" X X X X X Xb L q.a.n.c.n.n.c.a.i.i.a.a.z.z.>.m 3 5 X X X X X X", -" X X X X Xs +.a.c.n.B.c.>.#.E E ! +.>.n.J.v.z.z.~ 8 & X X X X X", -" X X X Xs %.c.n.B.l.*.E Y L L L L W +.r.Z.H.Y.Y.R.+.7 ; X X X X", -" X X Xk %.n.J.n.>.! Y Y I L L L T *.w.h.7.5.K.).).).W 6 = X X X", -" X Xj T V.B.n.;.L L L I L L L Y ~ *.s.Z.G.D.B._._._.Y.h % > X X", -" X Xm H.R.Y.0.L H H L L C V C Y ! ..8.G.E.H.M.g._._.Y.q.8 o X X", -" Xj o.)./.K.@.^ A F M N M s n C W ) { <.9.9.2.X.#./.Y.C.m % > X", -" XM D.)._.t.,.[.[.[.[.{.[.W.A G C O.I.[.[.[.[.{.5.y.Y.B.*.2 o X", -" XA /.).~.%.{ [.[.[.| D.[.[.I.b ,.[.[.[.j.) ' D.5.@.Y.V.a.w . X", -"i O.).).E.3.X.[.[.[.S X.[.[.'.i Q.[.{.D.z X.~ A ) %.B.V.n.s + = ", -"z 6._._.R.w.<.[.[.[.S <.[.[.I.F [.[.[.X.) 0.>.;.>.>.l.B.n.C % > ", -"z e._._.H.e.,.[.[.[.j.W.[.D.S { [.[.].' -.>.>.>.e.0.s.N.n.Y % & ", -"v s.)._.M.3.O.[.].].W.'.[.].{ { [.[.[.' 3.e.;.;.%.-.s.N.n.R # . ", -"z ;.T.E.g.-.{ [.].].S <.[.{.].` [.[.[.<.e.f.e.*.$.$.s.V.n.L $ O ", -"j o.Y.Y.g.+.] {.].]._ | [.[.[.F ].[.[.A.) y.e.@.W @.s.N.n.h $ = ", -" XZ J.Y.N.@.' [.[.].F 7.[.[.].z h.[.[.].7.^ ^ 5.2.U z.z.a.r X = ", -" Xs n.V.Y.+.` [.[.].].].{.{.9.2...A.{.[.[.[.].[.2.! a.u.;.3 = ", -" XF *.m.B.s.^ X.,.{ ,.<.1.] 2.G.D.O.` 2.9.7.2.^ d ;.u.a.K $ X X", -" X Xm z.c.v.o.^ ^ ^ { <.7.Z.K.K.H.Z.6.o.^ A f h E a.i.0.w X = X", -" X Xz #.l.z.f.X.O.<.5.t.Z.D.D.A.j.7.*.@.^ ! Y ! i.a.a.Y , X X X", -" X X Xd u.l.z.y.o.o.3.r.j.Z.h.r.9.5.%.%.#.+.#.c.B.z.-.8 . & X X", -" X X Xj m f.c.v.l.s.3.4.h.t.r.k.D.G.H.D.A.D./.!.E.M.y + X X X X", -" X X X Xj Z v.J.T.R.E.Z.7.t.Z.A.S.H.D.Q.|.|.|.|.!.b % . X X X X", -" X X X X Xj A D.|.`.~.~.!.E.I.I.Q.{.|.|.|.|.|.D.u % X < X X X X", -" X X X X X Xj z 9.{.`.~.~.^././.`.`.`.}.|.Q.] 9 $ X X X X X X X", -" X X X X X X X Xj s X.k.Y.R.~.~./.~.K.h.) e , . = X X X X X X X", -" X X X X X X X X X X9 w t n A C A s r 3 $ X > X X X X X X X X X", -" X X X X X X X X X X X X X5 2 1 $ ; 5 5 5 X X X X X X X X X X X" +"%X%X%X%X%X%X%X%X%X%X%X%Xp t 6 5 w t w %X%X%X%X%X%X%X%X%X%X%X%X%X", +"%X%X%X%X%X%X%X%X%Xu u x I X.0.s.u.0.W x 7 4 %X%X%X%X%X%X%X%X%X%X", +"%X%X%X%X%X%X%Xy i I i.a.f.m.m.b.f.s.a.s.i.W 7 > %X%X%X%X%X%X%X%X", +"%X%X%X%X%X%Xt M 0.a.m.m.m.m.f.d.p.p.p.f.d.f.i.b 1 < %X%X%X%X%X%X", +"%X%X%X%X%X7 ! d.f.f.m.f.+.W P R I Q 5.v.V.V.z.f.{ 5 + %X%X%X%X%X", +"%X%X%X%Xu X.f.m.m.f.' H s ~ V y _ Z J o.g.L.L.Q.!.e.5 X %X%X%X%X", +"%X%X%Xu X.b.C.m.+.N m n t }.3.> }.w.V 5.y.y.Y.[.^.^.-.1 + %X%X%X", +"%X%Xt P m.N.m.X.v v v k 6 }.1.: /.4.c 7.N.N.v.!.{.{.^.L & %X%X%X", +"%X%Xg Y.Y.V.+.m k a t t : }.1.% }.1.r | l.B.M.b.!.{.^.n.7 X %X%X", +"%Xp -._.'.Y.' Y n D.}.}.|.oXXX|.oX XT.w.F _ j.v.v._.^.C.T & @ %X", +"%Xa (.'.'.9.[ [ K S.}.oXoXoXoXXXoXoXoXoX XD / s.d.v.!.C.v.3 o %X", +"%XU '.'.Y.[ [ [ [ J f <.oXoX( 2 f S J.oXoXT.j r.s.i.C.C.C.z X %X", +"p e.'.'.F. .=.=.=.=.) 1.oXoX@.f . .F oXoX}.a +.i.i.b.C.m.I X O ", +"u w.'.[.j.5.8.7.7.7.] 2.oXoX@.y W c &.oXoXZ.k r.s.i.s.V.m.} = o ", +"u H.[.{.y.8.y.g.8.g.7.2.oXoXA.@.&.D.oXoXT.e G +.O.O.5.V.m.0.- o ", +"u !.].[.r.8.y.g.g.g.7.4.oXoXoXoXoXoXoXoXoX<.y W X.o.o.m.m.0.- o ", +"u B._._.5.5.8.y.g.c.g.w.oXoX,.h A F <..XoXoX1.k ' ' ' V.N.r.- ", +"u u.Q.~.r.6.z.N.V.I.v.k.oXoX@.B | _ c 1.oXoX}.a ' ' O.I.b.O.= o ", +"u ..Q.Q.v.i.s.c.N.L.l.Z.oXoX@.B t.=.S &.oXoXXXy Y R +.N.b.Q % o ", +"t T C.I.I.6.u.z.z.5.S 1.oXoX@.e B h D |.oXoXS.f Y Y 6.d.d.n X O ", +"%Xs m.V.Q.r.r.z.5.<.}.oXoXoXXXW.}.oXoXoXoXW.h G H R a.p.s.7 %X", +"%X7 O.V.V.v.+.r.` 4.oXoXoXoXoXoXoXoXXXR.<.h v N N o.a.p.Q = %X", +"%Xw x v.v.v.r.+. .Z l d e }.Z.r }.3.d l V G n n R a.s.a.s X O %X", +"%X%X6 { v.l.v.+.O.5.=.^ d }.4.9 }.1.f J G m m G d.d.x.Q = %X%X", +"%X%X%Xs u.v.v.v.r.6.o. .l }.4.9 W.4.l ^ ^ J ) c.N.N.y.7 X O %X%X", +"%X%X%X5 z v.v.M.I.g.;. .J 1.#.B 1.#.) 7.$.S..X'.W.Y.j $ %X%X%X", +"%X%X%X%X5 b N.Y.~.).Y.j.5.$.=.=.$.*.2.J.@X$X#X#XoXC $ %X%X%X%X", +"%X%X%X%X%X3 z U.@X+X`.`.`.(.E.E.E.|.@X@X#X#X#X/.j % %X%X%X%X%X", +"%X%X%X%X%X%Xw a q.OX|.).`._.'.'.XX.X.X+X+X X%.w X o %X%X%X%X%X%X", +"%X%X%X%X%X%X%X%Xw a _ j.~.~.).).`.`.`.F._ t & . # %X%X%X%X%X%X%X", +"%X%X%X%X%X%X%X%X%X%X4 3 t z L U Z z t 1 $ . 8 %X%X%X%X%X%X%X%X%X", +"%X%X%X%X%X%X%X%X%X%X%X%X%X< ; & + + , 8 %X%X%X%X%X%X%X%X%X%X%X%X" }; diff --git a/xpm/bitcoin48.xpm b/xpm/bitcoin48.xpm index bc388bdcb..85a771194 100644 --- a/xpm/bitcoin48.xpm +++ b/xpm/bitcoin48.xpm @@ -1,278 +1,277 @@ -/* XPM */ -static const char * bitcoin48_xpm[] = { -/* columns rows colors chars-per-pixel */ -"48 48 224 2", -" c #715103", -". c #735203", -"X c #735204", -"o c #745405", -"O c #755506", -"+ c #775606", -"@ c #785707", -"# c #7A5806", -"$ c #7C5905", -"% c #7D5A05", -"& c #7E5B05", -"* c #7F5C07", -"= c #7E5C0A", -"- c #7B5C11", -"; c #7C5D13", -": c #7D5E15", -"> c #805C05", -", c #805C06", -"< c #8B6813", -"1 c #8D6912", -"2 c #8F6A12", -"3 c #896816", -"4 c #806219", -"5 c #82631A", -"6 c #876719", -"7 c #84651B", -"8 c #906C13", -"9 c #916D15", -"0 c #936F18", -"q c #94701B", -"w c #95721B", -"e c #98731A", -"r c #99741B", -"t c #99751E", -"y c #9A761F", -"u c #9B7822", -"i c #9F7A21", -"p c #9D7922", -"a c #A27C20", -"s c #A47E21", -"d c #A67F22", -"f c #9E8038", -"g c #9E803B", -"h c #9E813C", -"j c #9F833D", -"k c #A68023", -"l c #A78124", -"z c #A98326", -"x c #AA8427", -"c c #A7832B", -"v c #A7832C", -"b c #A6832D", -"n c #A98429", -"m c #A8842B", -"M c #AD892F", -"N c #AE8A2F", -"B c #AF8A2F", -"V c #B28B2E", -"C c #B48C2E", -"Z c #B68E2F", -"A c #B78E2F", -"S c #A38232", -"D c #A08136", -"F c #AC8931", -"G c #AB8934", -"H c #AA8836", -"J c #AA8937", -"K c #A1843F", -"L c #A2853F", -"P c #AB8A39", -"I c #AB8B3A", -"U c #AD8C3C", -"Y c #AE8E3E", -"T c #B89030", -"R c #BA9131", -"E c #BC9332", -"W c #BE9533", -"Q c #C09733", -"! c #C29834", -"~ c #C39934", -"^ c #C39935", -"/ c #C39A37", -"( c #C39A38", -") c #C49A38", -"_ c #C49B38", -"` c #C59C3A", -"' c #C69E3C", -"] c #C69E3E", -"[ c #C79F3F", -"{ c #A48640", -"} c #A58741", -"| c #A68842", -" . c #A78A43", -".. c #AA8D45", -"X. c #AD9046", -"o. c #B19040", -"O. c #B59443", -"+. c #B29447", -"@. c #B79745", -"#. c #B79847", -"$. c #B89846", -"%. c #B69748", -"&. c #C8A040", -"*. c #CAA241", -"=. c #CBA343", -"-. c #C9A346", -";. c #CBA445", -":. c #C7A44D", -">. c #C5A44F", -",. c #C9A448", -"<. c #C9A44A", -"1. c #C5A551", -"2. c #C4A554", -"3. c #CBAA57", -"4. c #CDAA57", -"5. c #C3A559", -"6. c #C4A65A", -"7. c #C7A85A", -"8. c #D0AB55", -"9. c #D2AD56", -"0. c #D4AE57", -"q. c #D4AF58", -"w. c #D5B05A", -"e. c #D5B15C", -"r. c #D5B25E", -"t. c #DFB65A", -"y. c #DEB75B", -"u. c #E1B759", -"i. c #E2B95B", -"p. c #E4BA5C", -"a. c #E4BC5F", -"s. c #D4B567", -"d. c #D8B764", -"f. c #D5B769", -"g. c #D4B76A", -"h. c #D4B86B", -"j. c #E5BD61", -"k. c #E6BE62", -"l. c #E6BF63", -"z. c #E0BF6F", -"x. c #E7C063", -"c. c #EAC263", -"v. c #EDC563", -"b. c #EBC364", -"n. c #EEC565", -"m. c #EEC767", -"M. c #E1C06F", -"N. c #EBC76D", -"B. c #EEC869", -"V. c #F7CD6A", -"C. c #F6CD6B", -"Z. c #F4CE6F", -"A. c #F8CD6A", -"S. c #F9CF6E", -"D. c #FAD16F", -"F. c #E1C071", -"G. c #E4C370", -"H. c #E1C174", -"J. c #E0C276", -"K. c #E1C377", -"L. c #E8C670", -"P. c #E2C479", -"I. c #E0C47A", -"U. c #E2C57C", -"Y. c #E3C77E", -"T. c #F3D073", -"R. c #FBD270", -"E. c #FCD572", -"W. c #FCD674", -"Q. c #FDD774", -"!. c #FED876", -"~. c #FED977", -"^. c #F2D278", -"/. c #F1D37B", -"(. c #FDDA78", -"). c #FDDB7A", -"_. c #FDDB7C", -"`. c #FDDD7D", -"'. c #FDDF7F", -"]. c #E4C880", -"[. c #E6CA83", -"{. c #E7CD86", -"}. c #E9CF89", -"|. c #EBD089", -" X c #EFD289", -".X c #F2D382", -"XX c #F0D387", -"oX c #FDDF80", -"OX c #FCDF84", -"+X c #FBDF89", -"@X c #F9DE8B", -"#X c #FBE08B", -"$X c #FBE28C", -"%X c #FCE48F", -"&X c #FDE592", -"*X c #FEE692", -"=X c #FEE693", -"-X c #FEE895", -";X c #FEEA96", -":X c #FEEC97", -">X c #FEEE98", -",X c #FEEE99", -"X>X:X:X%X' 0 O # sXsXsXsXsX", -"sXsXsXsXG n m.(.!.(.(.S.;.] [ _ ` _ ^ ^ ! Q ^ _ ` 9.k.M.U.K.U.H.U./.>X>X>X>X>X#XV < . - sXsXsXsX", -"sXsXsXh n w._._.(.W.S.;._ _ _ / _ _ _ _ Q Q / ` [ 9.d.G.H.|.XX@X#X#X).:X>X>X>X>Xm.a > sXsXsXsX", -"sXsXsXG @.#X+XOX_.R.8._ _ _ _ ! ^ _ ) ! W W _ ] [ <.r.h.{.@X6X&X#X#X).).>X>X>X;X#X' 8 + + sXsXsX", -"sXsXL M H.;X=X&X#Xk.] E R T Z T A A A A R E _ ` &.<.4.F.Y.[.U.H.z.h.z.L.^.>X>X;X'.m.k > : sXsX", -"sXsXP @.,X,X1X;X+X3.%.o.G H F m m b b a s z E _ [ 1.2.2.2.7.h.h.h.h.2.$.1.^.;X#X'.).` 2 . + sXsX", -"sXsXF f.X>X/.L.d.o.6X0X0XwXwX0X0XwXwX0X9XI.u I.0XwXqXqX3XG r.B.c.i.u.u.u.u.y.p.`.!.E.E.x * X ", -" .n ^.&X;X;X.Xx.d.Y 6X0XwX0X0X5.u 3X0XwXwX9X5.h.wX0XqXqX6XP d.T.N.c.i.u.y.0.0.k.(.!.W.E.k * X ", -"L x C.'.*X&X^.j.r.P 7XqX0XwX0X6.0 I.wX0XwX0XI.@.0XqXqXqX0X+.q.T.T.N.a.y.9.8.9.l._.!.!.D.s $ - ", -"sXx k.#X#X$X.Xy.8.G 3XqXwX0XwX7.u I.0XwX0XwX}.u qXqXqXqX0Xh.$.G.T.N.p.9.-.-.8.N._.!.E.b.i # X : ", -"sXc 9.'.'.#X'.y.4.H 7XqX0XwX0X6.q ].9XwX0XwXU.u {.0XwX0XwX8X%.#.w.4.$.#.f.W -.Z.W.R.R.y.r O = ", -"sXN _ '.'.'.#Xx.3.P 7XqXwX0XwXh.+.8XwX0X0X0X7.X.#.8X0XwX0XwX6Xh.2.5.U.6X{.F *.R.R.R.S.*.1 ; ", -"sXX.x E.`.).`.T.1.G 8XwX0XwXwX0XwX0X0XwX0X}.%.h.7.5.3X0X0XwX0XwXwX0X0X0X[.z 9.A.V.V.V.n * X sX", -"sXg x y.~.).).#X4.o.3X3X3X3X3X3X3X7X3X Xh.%.h. X|.3.#.h.3X0X0X0X0X0X8X}.2.V c.A.C.V.i.e # X X sX", -"sXsXn W E.E.).`.L.$.P g u p f D d . .+.6.U. X@X@X}.f.1.U Y %.%.+.H y e l &.A.A.V.V.' 8 X ; sX", -"sXsX..x k.T.T.T.W.9.#.#.#.#.1.7.4.s.h.z.}.}.@X@X X X].z.d.3.:.@.V V V C E c.A.A.A.c.s > sXsX", -"sXsXsXb W T.T.T./.T.:.1.3.4.r.h.z.].[. X X X X X[.Y.H.z.z.d.0.;.` / Q Q u.A.A.A.D.*.9 O X # sXsX", -"sXsXsX| l y.T.T.T./.N.<.1.4.r.f.z.z.].[.{.{.[.].H.z.s.r.8.8.-.-.*.] ] u.D.E.D.D.k.a > sXsXsX", -"sXsXsXsXn F B.T.T.T.^.N.1.4.w.s.z.z.U.[.{.].J.J.H.F.h.r.w.r.w.0.8.8.k.W.W.R.D.T.Z 1 O @ sXsXsX", -"sXsXsXsXf x W T.T.T.^./.T.r.r.d.z.L.U.].U.z.z.P.Y.[.[.U.P.F.G.h.h..X@XOXOX.X.X<.9 # sXsXsXsX", -"sXsXsXsXsXL x [ W.W.W.)._.OXN.d.z.z.I.U.I.z.U. X.X X XXXXX X XXXwXyX,X1X1X=Xs.p > X ; sXsXsXsX", -"sXsXsXsXsXsX| x :._.oX_.OX$X=X+X/.G.h.z.I.].}.}.|.|. X X X3XtXpXpXpXpXpXaXP.a > X - sXsXsXsXsX", -"sXsXsXsXsXsXsX{ c <.+X@X=X;X;X&X=X&XXX[.U.P.U.].[.}.XX3XyXpXpXpXpXpXpXpXh.a > O sXsXsXsXsXsX", -"sXsXsXsXsXsXsXsXL c @.+XpXpXuX1X=X=X;X1X1X1X1XrXwXwXyXyXyXuXpXaXpXuX3X2.u > . @ sXsXsXsXsXsXsX", -"sXsXsXsXsXsXsXsXsXj n Y I.aXaX0X=X=X&X;X=X1X1X1X c #956E12", +", c #906D1D", +"< c #967013", +"1 c #997215", +"2 c #94711F", +"3 c #9C751A", +"4 c #9E781C", +"5 c #A27B1D", +"6 c #947324", +"7 c #997625", +"8 c #9D7926", +"9 c #97792B", +"0 c #9D7B28", +"q c #9C7F34", +"w c #A47E22", +"e c #A87F21", +"r c #A37E2A", +"t c #A8801F", +"y c #A58025", +"u c #AB8425", +"i c #A5812C", +"p c #AB842A", +"a c #AB892D", +"s c #B0862C", +"d c #B48C2D", +"f c #B88F2F", +"g c #B9912E", +"h c #A68432", +"j c #AB8531", +"k c #AD8A33", +"l c #A68638", +"z c #AD8B3B", +"x c #B38C32", +"c c #BA8E35", +"v c #B28D3B", +"b c #B59234", +"n c #BD9235", +"m c #B5903E", +"M c #BC943B", +"N c #BA9A3B", +"B c #C29536", +"V c #C59937", +"C c #C2953B", +"Z c #C49C3C", +"A c #CA9E3D", +"S c #AC8E43", +"D c #AD9045", +"F c #AE9248", +"G c #B49444", +"H c #B99542", +"J c #B49842", +"K c #BD9C44", +"L c #B3954A", +"P c #B7994D", +"I c #BD9A4A", +"U c #B69A52", +"Y c #BB9E54", +"T c #BEA04A", +"R c #BFA354", +"E c #BEA35A", +"W c #C19742", +"Q c #C49B43", +"! c #CA9D41", +"~ c #C39C4B", +"^ c #C99E4A", +"/ c #C7A444", +"( c #CDA244", +") c #CAA945", +"_ c #C5A44C", +"` c #CCA44B", +"' c #C6A94C", +"] c #CFAC4D", +"[ c #D2A647", +"{ c #D2A54B", +"} c #D4AA4C", +"| c #D9AC4D", +" . c #D4B04E", +".. c #DCB14D", +"X. c #C4A151", +"o. c #CAA454", +"O. c #C6AB56", +"+. c #CCA955", +"@. c #C1A45A", +"#. c #C6AA5A", +"$. c #CDAB5D", +"%. c #D1A652", +"&. c #D4AB53", +"*. c #DDAF52", +"=. c #D3AC5B", +"-. c #D9AF5C", +";. c #D5B154", +":. c #DDB253", +">. c #D5B25B", +",. c #DCB45D", +"<. c #DDBB5E", +"1. c #E1B354", +"2. c #E4B955", +"3. c #E3B65B", +"4. c #E5BA5C", +"5. c #EABE5E", +"6. c #C6AB63", +"7. c #CCAD63", +"8. c #C6AE68", +"9. c #C9AF69", +"0. c #D4AC60", +"q. c #CDB067", +"w. c #CDB36C", +"e. c #D6B162", +"r. c #DDB463", +"t. c #D7B964", +"y. c #DBB965", +"u. c #D1B66F", +"i. c #DDB66A", +"p. c #D0BC6C", +"a. c #DFBE6B", +"s. c #CEB772", +"d. c #D1B771", +"f. c #D4BC74", +"g. c #DBBD75", +"h. c #DABF78", +"j. c #E2B764", +"k. c #E4BA64", +"l. c #E9BD62", +"z. c #E2BB6A", +"x. c #E8BF69", +"c. c #EBC15F", +"v. c #F1C25E", +"b. c #DFC266", +"n. c #DBC26C", +"m. c #DCC676", +"M. c #DEC973", +"N. c #D7C07A", +"B. c #D9C27E", +"V. c #E4C162", +"C. c #EDC363", +"Z. c #E3C36F", +"A. c #EBC26C", +"S. c #E5CA6B", +"D. c #EECA6D", +"F. c #F1C565", +"G. c #F5CB66", +"H. c #F9CA66", +"J. c #F2C76A", +"K. c #F5CC6A", +"L. c #F9CD6C", +"P. c #EDD26C", +"I. c #FBD26E", +"U. c #E5C374", +"Y. c #EDC573", +"T. c #E6CB74", +"R. c #EECC73", +"E. c #EBCA78", +"W. c #F5CD74", +"Q. c #F9CE72", +"!. c #EED77F", +"~. c #F4D274", +"^. c #FDD473", +"/. c #F2D870", +"(. c #FED975", +"). c #F5D37C", +"_. c #FCD57A", +"`. c #F7D87A", +"'. c #FEDC7C", +"]. c #FFE37D", +"[. c #DCC682", +"{. c #E1C984", +"}. c #E4CD8A", +"|. c #EFD182", +" X c #E5D48D", +".X c #EAD28D", +"XX c #E8DB8D", +"oX c #F1D581", +"OX c #FDD581", +"+X c #F5DB84", +"@X c #FDDC84", +"#X c #FEDE89", +"$X c #EAD594", +"%X c #E1D894", +"&X c #ECDA94", +"*X c #EFDA99", +"=X c #F2DD9C", +"-X c #F6E284", +";X c #FEE385", +":X c #FFE883", +">X c #FEE38C", +",X c #FEEA8C", +"X@X_.`._.'.'./ 4 O aXaXaXaXaXaXaX", +"aXaXaXaXaXaXt g C.I.(.(.^.(.^.1.( ! C d p u s d d d x M &.3.3.A.).+XOX>X;X;X;X) 3 O aXaXaXaXaXaX", +"aXaXaXaXaX5 d G.I.'.].(.^.l.( C A C s H =X=XI 7 N.*X$Xk o.j.z.J.l.W.1X7X6X,X,X,XK 1 X aXaXaXaXaX", +"aXaXaXaX3 p C.(.(.'.'.^.*.C C C C B r G eXeXL - [.eX3Xr ~ r.W._.W.J.D.6X8X6X6X6X-Xd & X aXaXaXaX", +"aXaXaXaXu ;.'.'.(.^.^.| C c B B B c w z eXeXF = [.eX*X8 K r.@X#X;X`.~.D.7X8X8X6X,XS.y O aXaXaXaX", +"aXaXaXw N #X#X'.'.^.*.C c c s r e r 2 r eXeXD $ B.eX=X: z z.oX>X,X,X;X~.D.8X8X6X,X:X) < X aXaXaX", +"aXaX3 a T.1X1X>X#XA.! C B s $.6.6.@.@.w.eXeXd.U $XeX9XF z G O.n.!.-X;X'.D./.8X6X,X:X/.u # aXaXaX", +"aXaXy K 5X5X5X2X>X-.} ^ C r 0XeXeXeXeXeXeXeXeXeXeXeXeXeXeX9XN.L O.T.`.]./.F.-X6X:X].].) < . aXaX", +"aXaXa M.7X5X5X5XU.&.-.&.^ j 0XeXeXeXeXeXeXeXeXeXeXeXeXeXeXeXeX9XL X.~.'.'.K.c.6X:X].].P.t O aXaX", +"aX5 k 2X5X5X5XX`.C.L.^._._.OX@X#X#Xt.f.eXeXeXeX6 z #.o.I z 6 w.eXeXeXeX*Xr ! { %.%.,.OX_.(.^.n % ", +"4 u /.;X;X;X@XF.Q.Q._._._.@X#X#Xa.f.eXeXeXeX9 I a.Z.y.+.k F eXeXeXeX0Xr Q { { { 4.'.(.^.^.u O ", +"aXu V.;X;X;X>XF.K.Q.Q._._.OX#X@Xt.f.eXeXeXeX9 I Z.U.z.=.z 8.eXeXeXeX=X7 Q { { ( A._.^.^.F.5 O ", +"aXu ] '.'.;X>XK.J.Q.Q.^._._.~.Z.R w.eXeXeXeX6 S =.>.+.G S 9XeXeXeXeXh.r ! ( ( [ L.L.L.L.:.1 . aX", +"aX5 b '.'.'.@X`.F.K.Q.Q.~.A.e.$.P }.eXeXeXeXF L E #.9.[.eXeXeXeXeXeXS k ! ( ! *.H.K.H.L.Z % aX", +"aX1 u J.(.'.'.;XC.F.W.Q.K.&.h.eXeXeXeXeXeXeXeXeXeXeXeXeXeXeXeXeXeX@.2 c ! ! ! F.H.L.H.F.w O aX", +"aXaXw ( (.(.`.`.`.C.F.K.A.~ [.eXeXeXeXeXeXeXeXeXeXeXeXeXeXeXeX*XF 7 r C B A | H.H.H.H.| 1 X aXaX", +"aXaX3 u D.~.~.~.`.D.C.J.V.` .X=X=X3X9X9XeXeX9X=XeXeXeX$X{.9.S 2 r r B B B V 5.H.H.H.H.s + . aXaX", +"aXaXaXt / ~.W.~.`.`.5.V.C.>.M i 6 - = q eXeXS o B.eX*Xo 7 r r r B C B r B 1.H.H.L.L.*.5 X . aXaX", +"aXaXaX1 u 4.~.~.~.~.~.c.V.l.4.,.~ H i S eXeXF : [.eX=X, r W ^ W W C C W *.Q.Q.Q.Q.J.e % aXaXaX", +"aXaXaXaX5 b K.~.~.R.~.`.l.C.J.A.,.=.H P eXeXU , [.eX=X7 v ^ %.^ W ^ ^ -.^.^.W._.W.Z > . aXaXaX", +"aXaXaXaX1 5 / ~.~.~.~.~.`.F.F.<.r.,.~ R eXeXY 7 [.eX=Xq ~ 0.r.0.%.o.g.#XOXOXOXOX,.4 O aXaXaXaX", +"aXaXaXaXaX1 y } ~.`.`.`.'.#XR.,.r.,.+.X.9.7.I G 9.7.7.X.0.i.i.j.i.9XeX0X=X4X1XT.r # aXaXaXaXaX", +"aXaXaXaXaXaX1 u :.'.'.OX#X#X1X+XA.3.r.-.=.=.>.e.i.$.0.0.i.j.g.0XpXpXpXyXuXyXXXk % aXaXaXaXaXaX", +"aXaXaXaXaXaXaX1 p >.>X#X>X1X1X1X1X1X|.U.z.3.j.z.y.i.i.U..XqXpXiXpXpXpXiXiX Xh % . . aXaXaXaXaXaX", +"aXaXaXaXaXaXaXaX< y _ 3XtXuXtXwX=X4X4X4X5XX=X3X0XeXtXyXuXiXiXiXiXiXuXp.y # . . aXaXaXaXaXaXaX", +"aXaXaXaXaXaXaXaXaX* y J %XpXiXwX4X4X4X5X4X5X5XwXwXwXeXtXeXtXtXyXyXyX&XJ 3 # aXaXaXaXaXaXaXaXaX", +"aXaXaXaXaXaXaXaXaXaX* 3 k R XwX4X1X1X1X1X5X4X5X5XwX5XwXwXtXtXtX&X@.y & X aXaXaXaXaXaXaXaXaXaX", +"aXaXaXaXaXaXaXaXaXaXaXaX& 3 a J t.|.>X,X>X>X2X1X1X1X5X4X0X O o aXaXaXaXaXaXaXaXaXaXaX", +"aXaXaXaXaXaXaXaXaXaXaXaXaXaX% > w p b _ >.b.S.T.T.U.t.O.N p 4 & O . o aXaXaXaXaXaXaXaXaXaXaXaXaX", +"aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaX$ $ ; 1 4 5 5 w w 5 3 > % O . . o aXaXaXaXaXaXaXaXaXaXaXaXaXaXaX", +"aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXO X X X o X X X o aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaX" +};