Jeff Garzik
f59530ce6e
Merge pull request #2154 from CodeShark/dependencycleanup
...
Clean up code dependencies
2013-06-10 06:17:38 -07:00
Wladimir J. van der Laan
8b313c9331
Merge pull request #2749 from laanwj/2013_06_addtotalbalance
...
qt: Add total balance in overview page
2013-06-09 01:06:36 -07:00
Wladimir J. van der Laan
a743522216
Merge pull request #2754 from laanwj/2013_06_create_data_dir
...
Create parent directories if needed in GetDataDir
2013-06-09 01:06:11 -07:00
Wladimir J. van der Laan
3e9c8bab54
Create parent directories if needed in GetDataDir
...
One-line change. Fixes #2752 .
2013-06-08 10:03:23 +02:00
Wladimir J. van der Laan
cb85aeb06c
qt: Add total balance in overview page
2013-06-07 15:33:32 +02:00
Wladimir J. van der Laan
122e9f8ba4
Merge pull request #2746 from Diapolo/pro-file
...
Bitcoin-Qt: small updates to project file
2013-06-06 23:04:43 -07:00
Eric Lombrozo
6e68524e95
Removed the main.h include from net.cpp.
2013-06-06 00:04:33 -07:00
Philip Kaufmann
820bf86def
Bitcoin-Qt: small updates to project file
...
- add new bitcoind.cpp to OTHER_FILES to be able to see it in the Qt
Creator IDE
- remove a Mac-only header from the general HEADERS, as it is already in
macx:HEADERS
2013-06-06 08:31:00 +02:00
Eric Lombrozo
501da2503a
Using boost::signals2 to message main from net.cpp.
2013-06-05 23:15:20 -07:00
Eric Lombrozo
aabdf9e899
Moved UpdateTime out of CBlockHeader and moved CBlockHeader into core.
2013-06-05 23:15:20 -07:00
Eric Lombrozo
48343a0a50
Removed script.cpp's dependence on main.h
2013-06-05 23:15:20 -07:00
Eric Lombrozo
65e7bbef74
Moved CCoins, CTxOutCompressor, CTxInUndo, and CTxUndo to core.
2013-06-05 23:15:20 -07:00
Eric Lombrozo
05df3fc68d
Removed AcceptToMemoryPool method from CTransaction. This method belongs to the mempool instance.
...
Removed AreInputsStandard from CTransaction, made it a regular function in main.
Moved CTransaction::GetOutputFor to CCoinsViewCache.
Moved GetLegacySigOpCount and GetP2SHSigOpCount out of CTransaction into regular functions in main.
Moved GetValueIn and HaveInputs from CTransaction into CCoinsViewCache.
Moved AllowFree, ClientCheckInputs, CheckInputs, UpdateCoins, and CheckTransaction out of CTransaction and into main.
Moved IsStandard and IsFinal out of CTransaction and put them in main as IsStandardTx and IsFinalTx. Moved GetValueOut out of CTransaction into main. Moved CTxIn, CTxOut, and CTransaction into core.
Added minimum fee parameter to CTxOut::IsDust() temporarily until CTransaction is moved to core.h so that CTxOut needn't know about CTransaction.
2013-06-05 23:15:20 -07:00
Eric Lombrozo
788536f175
Moved CInPoint to core. Removed GetMinFee from CTransaction and made it a regular function in main.
2013-06-05 23:15:19 -07:00
Eric Lombrozo
effc2770f5
Created core.h/core.cpp, added to makefiles. Started moving core structures from main to core beginning with COutPoint.
2013-06-05 23:14:52 -07:00
Eric Lombrozo
663224c232
Removed net.cpp's dependency on init.h.
...
Added explicit include of main.h in init.cpp, changed include of init.h to include of main.h in net.cpp.
Added function registration for net.cpp in init.cpp's network initialization.
Removed protocol.cpp's dependency on main.h.
TODO: Remove main.h include in net.cpp.
2013-06-05 20:36:10 -07:00
Eric Lombrozo
4751d07efd
Moved unrelated-to-network calls in StartNode and StopNode into init.cpp
2013-06-05 20:36:10 -07:00
Eric Lombrozo
8926263dde
Moved PushGetBlocks to main.cpp to eliminate dependence of net.cpp on CBlockLocator.
2013-06-05 20:36:10 -07:00
Eric Lombrozo
336fe971e6
Get rid of db dependencies on main
2013-06-05 20:36:10 -07:00
Jeff Garzik
c94bd68547
Merge pull request #2700 from theuni/gui-split
...
autotools: Gui split
2013-06-05 10:56:24 -07:00
Wladimir J. van der Laan
fc1f360fce
Merge pull request #2731 from Diapolo/rpcconsole
...
Bitcoin-Qt: harmonize 2 setClientModel() functions
2013-06-05 09:27:23 -07:00
Wladimir J. van der Laan
83f9b58f15
Merge pull request #2741 from theuni/fix-osx-dock
...
osx: fix bitcoin-qt startup crash when clicking dock icon
2013-06-05 09:26:10 -07:00
Cory Fields
99add01e76
osx: fix bitcoin-qt startup crash when clicking dock icon
...
Crash probably introduced by 4d17a1b0
.
Inialize the window to NULL and verify it before use.
2013-06-04 23:55:35 -04:00
Cory Fields
6887bb9ad7
build: kill off the QT_GUI define
2013-06-04 03:54:14 -04:00
Cory Fields
34994ebcb0
build: cosmetics after last commit
2013-06-04 03:54:14 -04:00
Cory Fields
ee4b170c92
build: use runtime setting for wallet rather than QT_GUI define
2013-06-04 03:54:14 -04:00
Cory Fields
7f61f1ac78
build: use runtime setting for displaying the help message rather than QT_GUI define
2013-06-04 03:54:14 -04:00
Cory Fields
c98c88b3ab
build: cosmetic: split usage string for easier formatting
2013-06-04 03:54:14 -04:00
Cory Fields
13c84b3bd5
build: add global var for whether or not the gui is enabled
2013-06-04 03:54:14 -04:00
Cory Fields
c862d2ff22
build: split the non-gui startup routines into a new file
...
This will allow each to have its own main(), meaning that we can build a common
base client and simply link in the correct startup object to create the
appropriate binary.
2013-06-04 03:54:14 -04:00
Cory Fields
a9380c72be
build: prepare to move DetectShutdownThread
2013-06-04 03:53:40 -04:00
Wladimir J. van der Laan
c83d4d2170
Merge pull request #2613 from jonasschnelli/prefsFix
...
MaxOSX: settings fixes (#2371 )
2013-06-03 09:17:55 -07:00
Wladimir J. van der Laan
cd945c3bc9
Merge pull request #2727 from TheBlueMatt/master
...
One more data-driven test-case
2013-06-03 09:14:58 -07:00
Jonas Schnelli
39fe9de6b2
Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix
...
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
Conflicts:
bitcoin-qt.pro
2013-06-03 15:18:41 +02:00
Philip Kaufmann
1fc57d568b
Bitcoin-Qt: harmonize 2 setClientModel() functions
...
- harmonize BitcoinGUI::setClientModel() and RPCConsole::setClientModel()
- now RPCConsole::setClientModel() also includes a direct call to
setNumBlocks()
2013-06-03 14:10:14 +02:00
Jonas Schnelli
f679b2900a
MaxOSX: settings fixes ( #2371 )
...
- Launch-At-Startup implementation for mac
- Remove "Window" tab in settings
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
2013-06-03 12:26:56 +02:00
Matt Corallo
14c12b094b
Add new data-driven test-case.
2013-06-02 20:51:01 +02:00
Wladimir J. van der Laan
fa9e5adddd
Merge pull request #2672 from Diapolo/Qt_testnet
...
Bitcoin-Qt: setup testnet GUI directly
2013-06-02 09:23:37 -07:00
Philip Kaufmann
80fccb0eb3
Bitcoin-Qt: setup testnet GUI directly
...
- this directly sets up all GUI elements that have testnet special-casing
without first setting up main net stuff and changing afterwards (titles,
icons etc.)
- also fixes 2 wrong icons shown during testnet usage on our toolbar
2013-06-02 17:40:28 +02:00
Wladimir J. van der Laan
50b4086a4a
Merge pull request #2588 from Diapolo/GetBoolArg
...
remove GetBoolArg() fDefault parameter defaulting to false
2013-06-02 05:21:24 -07:00
Wladimir J. van der Laan
34d03f2474
Merge pull request #2721 from laanwj/2013_05_qt5
...
Qt5 compatibility
2013-06-02 05:03:16 -07:00
Philip Kaufmann
3260b4c090
remove GetBoolArg() fDefault parameter defaulting to false
...
- explicitly set the default of all GetBoolArg() calls
- rework getarg_test.cpp and util_tests.cpp to cover this change
- some indentation fixes
- move macdockiconhandler.h include in bitcoin.cpp to the "our headers"
section
2013-06-01 12:53:57 +02:00
Wladimir J. van der Laan
25c0cce7fb
Qt5 compatibility
...
This commit squashes all the changes in the Qt5 branch
relative to master.
Backward compatibility with Qt4 is retained.
Original authors:
- Philip Kaufmann <phil.kaufmann@t-online.de>
- Jonas Schnelli <jonas.schnelli@include7.ch>
2013-06-01 11:05:08 +02:00
Wladimir J. van der Laan
3d661110da
Merge pull request #2722 from trapp/master
...
Add NSHighResolutionCapable flag to Info.plist for better font rendering on Retina displays
2013-05-31 07:26:44 -07:00
Timon Rapp
1df6a90a06
Added NSHighResolutionCapable flag to Info.plist for better font rendering on Retina displays.
2013-05-31 15:39:28 +02:00
Pieter Wuille
365ab225c0
Merge pull request #2616 from vinniefalco/leveldb-as-subtree
...
Leveldb as subtree
2013-05-30 16:43:20 -07:00
Jeff Garzik
3fbd87e0dc
Merge pull request #2552 from Diapolo/win-typedef
...
remove obsolete and unused typedef for Windows
2013-05-30 09:42:47 -07:00
Wladimir J. van der Laan
a2d2e5e466
Merge pull request #2615 from jonasschnelli/mac10_8_not_center
...
osx: make use of the 10.8+ user notification center to display growl lik...
2013-05-30 09:25:54 -07:00
Jeff Garzik
6bc6d57303
Merge pull request #2716 from laanwj/2013_05_30_getwork
...
Move pMiningKey init out of StartRPCThreads
2013-05-30 09:15:16 -07:00
Jeff Garzik
87ec1929cf
Merge pull request #2705 from robbak/crash_zero_size_peers.dat
...
Don't attempt to resize vector to negative size.
2013-05-30 09:13:44 -07:00