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
Commit by Satoshi Nakamoto (s_nakamoto) on 21 June 2010 · SVN r86 · release v0.2.13 · 23 files, +1,046 −1,122
Open in Satoshi Mail View on GitHub
Files changed
locale/de/LC_MESSAGES/bitcoin.mo
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"locale/it/LC_MESSAGES/bitcoin.mo
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)"locale/nl/LC_MESSAGES/bitcoin.mo
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)"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());
}
}
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
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;
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
{
rc/bitcoin-bc.ico
rc/bitcoin.ico
rc/favicon.ico
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 = "";
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);
}
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 );
uibase.h
@@ -25,9 +25,9 @@
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/sizer.h>
-#include <wx/panel.h>
#include <wx/choice.h>
#include <wx/listctrl.h>
+#include <wx/panel.h>
#include <wx/notebook.h>
#include <wx/frame.h>
#include <wx/html/htmlwin.h>
@@ -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();
};
uiproject.fbp
@@ -71,7 +71,7 @@
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxMenuBar" expanded="1">
- <property name="bg">240,240,240</property>
+ <property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
@@ -583,156 +583,113 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
- <property name="flag">wxEXPAND|wxALIGN_BOTTOM|wxALL</property>
+ <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property>
- <object class="wxPanel" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="maximum_size"></property>
+ <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="name">m_panel14</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style">wxTAB_TRAVERSAL</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">bSizer66</property>
- <property name="orient">wxHORIZONTAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
- <property name="proportion">0</property>
- <object class="wxStaticText" expanded="1">
- <property name="bg"></property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Balance:</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_staticText41</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size">-1,15</property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
+ <property name="name">bSizer66</property>
+ <property name="orient">wxHORIZONTAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
+ <property name="proportion">0</property>
+ <object class="wxStaticText" expanded="1">
+ <property name="bg"></property>
+ <property name="context_help"></property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="font"></property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="label">Balance:</property>
+ <property name="maximum_size"></property>
+ <property name="minimum_size"></property>
+ <property name="name">m_staticText41</property>
+ <property name="permission">protected</property>
+ <property name="pos"></property>
+ <property name="size">-1,15</property>
+ <property name="style"></property>
+ <property name="subclass"></property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <property name="wrap">-1</property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
</object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
- <property name="proportion">0</property>
- <object class="wxStaticText" expanded="1">
- <property name="bg">255,255,255</property>
- <property name="context_help"></property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="font">,90,90,8,70,0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label"></property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">m_staticTextBalance</property>
- <property name="permission">protected</property>
- <property name="pos"></property>
- <property name="size">120,15</property>
- <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property>
- <property name="subclass"></property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+ <property name="proportion">0</property>
+ <object class="wxStaticText" expanded="1">
+ <property name="bg">255,255,255</property>
+ <property name="context_help"></property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="font">,90,90,8,70,0</property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="label"></property>
+ <property name="maximum_size"></property>
+ <property name="minimum_size"></property>
+ <property name="name">m_staticTextBalance</property>
+ <property name="permission">protected</property>
+ <property name="pos"></property>
+ <property name="size">120,15</property>
+ <property name="style">wxALIGN_RIGHT|wxST_NO_AUTORESIZE</property>
+ <property name="subclass"></property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <property name="wrap">-1</property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
</object>
</object>
</object>
@@ -1653,7 +1610,7 @@
<property name="border">5</property>
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
- <object class="wxScrolledWindow" expanded="1">
+ <object class="wxScrolledWindow" expanded="0">
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
@@ -2909,7 +2866,7 @@
<property name="minimum_size"></property>
<property name="name">CAboutDialogBase</property>
<property name="pos"></property>
- <property name="size">532,329</property>
+ <property name="size">532,315</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="title">About Bitcoin</property>
@@ -3173,7 +3130,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
- <property name="label">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).</property>
+ <property name="label">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).</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_staticTextMain</property>
@@ -3215,7 +3172,7 @@
<object class="sizeritem" expanded="1">
<property name="border">5</property>
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
}
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",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",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",xpm/bitcoin48.xpm