Browse Source

-- version 0.3.17 release

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@191 1a98c847-1fd6-4fd8-948a-caf3550aa51b
0.8 v0.3.17
s_nakamoto 14 years ago
parent
commit
24324d83e8
  1. 3
      build-unix.txt
  2. 4
      rpc.cpp
  3. 2
      serialize.h
  4. 6
      setup.nsi
  5. 3
      ui.cpp

3
build-unix.txt

@ -21,7 +21,8 @@ or Boost 1.37: sudo apt-get install libboost1.37-dev
If using Boost 1.37, append -mt to the boost libraries in the makefile. If using Boost 1.37, append -mt to the boost libraries in the makefile.
We're now using wxWidgets 2.9, which uses UTF-8. Don't try 2.8, it won't work. We're using wxWidgets 2.9.0, which uses UTF-8. Don't try 2.8, it won't work.
The build hasn't been updated to work with wxWidgets 2.9.1 yet.
You need to download wxWidgets from http://www.wxwidgets.org/downloads/ You need to download wxWidgets from http://www.wxwidgets.org/downloads/
and build it yourself. See the build instructions and configure parameters and build it yourself. See the build instructions and configure parameters

4
rpc.cpp

@ -648,6 +648,8 @@ Value movecmd(const Array& params, bool fHelp)
"move <fromaccount> <toaccount> <amount> [minconf=1] [comment]\n" "move <fromaccount> <toaccount> <amount> [minconf=1] [comment]\n"
"Move from one account in your wallet to another."); "Move from one account in your wallet to another.");
throw runtime_error("under construction");
string strFrom = params[0].get_str(); string strFrom = params[0].get_str();
string strTo = params[1].get_str(); string strTo = params[1].get_str();
int64 nAmount = AmountFromValue(params[2]); int64 nAmount = AmountFromValue(params[2]);
@ -709,6 +711,8 @@ Value sendfrom(const Array& params, bool fHelp)
"sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n" "sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
"<amount> is a real and is rounded to the nearest 0.01"); "<amount> is a real and is rounded to the nearest 0.01");
throw runtime_error("under construction");
string strAccount = params[0].get_str(); string strAccount = params[0].get_str();
string strAddress = params[1].get_str(); string strAddress = params[1].get_str();
int64 nAmount = AmountFromValue(params[2]); int64 nAmount = AmountFromValue(params[2]);

2
serialize.h

@ -22,7 +22,7 @@ class CDataStream;
class CAutoFile; class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000; static const unsigned int MAX_SIZE = 0x02000000;
static const int VERSION = 31602; static const int VERSION = 31700;
static const char* pszSubVer = ""; static const char* pszSubVer = "";

6
setup.nsi

@ -7,7 +7,7 @@ RequestExecutionLevel highest
# General Symbol Definitions # General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)" !define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.3.15 !define VERSION 0.3.17
!define COMPANY "Bitcoin project" !define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/ !define URL http://www.bitcoin.org/
@ -42,12 +42,12 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English !insertmacro MUI_LANGUAGE English
# Installer attributes # Installer attributes
OutFile bitcoin-0.3.15-win32-setup.exe OutFile bitcoin-0.3.17-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on CRCCheck on
XPStyle on XPStyle on
ShowInstDetails show ShowInstDetails show
VIProductVersion 0.3.15.0 VIProductVersion 0.3.17.0
VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}" VIAddVersionKey CompanyName "${COMPANY}"

3
ui.cpp

@ -1631,6 +1631,9 @@ COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent)
//m_listBox->Append(_("Test 2")); //m_listBox->Append(_("Test 2"));
m_listBox->SetSelection(0); m_listBox->SetSelection(0);
SelectPage(0); SelectPage(0);
#ifndef __WXMSW__
SetSize(1.0 * GetSize().GetWidth(), 1.2 * GetSize().GetHeight());
#endif
#if defined(__WXGTK__) || defined(__WXMAC_OSX__) #if defined(__WXGTK__) || defined(__WXMAC_OSX__)
m_checkBoxStartOnSystemStartup->SetLabel(_("&Start Bitcoin on window system startup")); m_checkBoxStartOnSystemStartup->SetLabel(_("&Start Bitcoin on window system startup"));
if (!mapArgs.count("-minimizetotray")) if (!mapArgs.count("-minimizetotray"))

Loading…
Cancel
Save