From 68b973a913fd1569d3a9a444d4233b15f7866e3e Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Mon, 21 Jun 2010 01:33:44 +0000 Subject: 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 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@86 1a98c847-1fd6-4fd8-948a-caf3550aa51b --- 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 384a7ae388..e6c860eec5 100644 Binary files a/locale/de/LC_MESSAGES/bitcoin.mo and b/locale/de/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/de/LC_MESSAGES/bitcoin.po b/locale/de/LC_MESSAGES/bitcoin.po index 3f0129e3ff..fa3b8a4c14 100644 --- a/locale/de/LC_MESSAGES/bitcoin.po +++ b/locale/de/LC_MESSAGES/bitcoin.po @@ -692,8 +692,6 @@ msgstr "Version" 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" @@ -703,9 +701,6 @@ msgid "" msgstr "" "Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "\n" -"Dies ist experimentelle Software. Verlassen Sie sich für tatsächliche\n" -"finanzielle Transaktionen nicht auf sie.\n" -"\n" "Lizensiert unter der MIT/X11 Software-Lizenz. Beachten Sie die beiliegende\n" "Datei license.txt oder http://www.opensource.org/licenses/mit-license.php.\n" "\n" diff --git a/locale/it/LC_MESSAGES/bitcoin.mo b/locale/it/LC_MESSAGES/bitcoin.mo index 38cbd3750e..b3160d1358 100644 Binary files a/locale/it/LC_MESSAGES/bitcoin.mo and b/locale/it/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/it/LC_MESSAGES/bitcoin.po b/locale/it/LC_MESSAGES/bitcoin.po index 14a517f06d..6d6e10f4c2 100644 --- a/locale/it/LC_MESSAGES/bitcoin.po +++ b/locale/it/LC_MESSAGES/bitcoin.po @@ -690,8 +690,6 @@ msgstr "versione" 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" @@ -701,13 +699,12 @@ msgid "" msgstr "" "Copyright (c) 2009-2010 Satoshi Nakamoto.\n" "\n" -"Questo è un software sperimentale. Non affidartici per gli attuali trasferimenti finanziari.\n" -"\n" -"Distribuito sotto la licenza software MIT/X11, guarda il file license.txt incluso oppure su http://www.opensource.org/licenses/mit-license.php.\n" +"Distribuito sotto la licenza software MIT/X11, guarda il file license.txt\n" +"incluso oppure su http://www.opensource.org/licenses/mit-license.php.\n" "\n" -"Questo prodoto include software sviluppato dal progetto OpenSSL per l'uso del \n" -"(http://www.openssl.org/) e il software criptografico scritto da \n" -"Eric Young (eay@cryptsoft.com)." +"Questo prodoto include software sviluppato dal progetto OpenSSL per\n" +"l'uso del (http://www.openssl.org/) e il software criptografico scritto\n" +"da 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/locale/nl/LC_MESSAGES/bitcoin.mo b/locale/nl/LC_MESSAGES/bitcoin.mo index ab3021bcaa..79f5c83ac2 100644 Binary files a/locale/nl/LC_MESSAGES/bitcoin.mo and b/locale/nl/LC_MESSAGES/bitcoin.mo differ diff --git a/locale/nl/LC_MESSAGES/bitcoin.po b/locale/nl/LC_MESSAGES/bitcoin.po index 163e70f180..643dc308dc 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 37f7742b66..0f333765c7 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 10c4eece73..b42f1d66fb 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 7539066dab..3c5c9bd3cb 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 f0e183d9c0..981bdfdd1a 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 0000000000..88cc240e2d Binary files /dev/null and b/rc/bitcoin-bc.ico differ diff --git a/rc/bitcoin.ico b/rc/bitcoin.ico index 88cc240e2d..cdec9a037b 100644 Binary files a/rc/bitcoin.ico and b/rc/bitcoin.ico differ diff --git a/rc/favicon.ico b/rc/favicon.ico new file mode 100644 index 0000000000..d249e41feb Binary files /dev/null and b/rc/favicon.ico differ diff --git a/serialize.h b/serialize.h index 39fe57c908..d5d4e1372a 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 a21cd436c4..6a1f6bafaf 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 56d52e316e..7ce4981937 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 b1e32cb8ea..67501cb954 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 779d9d4e55..f5d654e130 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 49f86d2de9..62ae3b45de 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 a1397522a5..f70fef026a 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 93b34ba70c..3cc29ac14b 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 0ac49f61a9..f538a44d2d 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 bc388bdcb7..85a7711940 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" +}; -- cgit v1.2.3