DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
4,584 Commits 6 Branches 7 Tags
cc7562b7d2dc4eae6e3ab930a2a37cd3c00aac5d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan 76eb192076 Merge pull request #3108 from Diapolo/paymentserver_style 
paymentserver: style fixes / cleanup
 2013-10-20 01:01:38 -07:00
Wladimir J. van der Laan 00f198c9a5 Merge pull request #3109 from laanwj/2013_10_remove_walletstack 
qt: merge walletstack and walletframe
 2013-10-20 00:29:38 -07:00
Wladimir J. van der Laan 163145938c qt: remove awkward way of setting GUI pages 
Selecting the button for a pages was going through bitcoingui->walletframe->walletview->bitcoingui.
Because of this, the actions for the pages had to be exposed on the BitcoinGUI object.
 2013-10-19 17:51:26 +02:00
Wladimir J. van der Laan 26702e6930 qt: merge walletstack and walletframe 
There were too many levels of indirection here, and the functionality of
walletframe and walletstack can easily be merged. This commit
merges the two which cuts a lot of lines of boilerplate code.
 2013-10-18 18:06:19 +02:00
Wladimir J. van der Laan 81cab378cc Merge pull request #3101 from Diapolo/sendcoinsentry 
add SendCoinsEntry::updateLabel() function
 2013-10-18 07:04:49 -07:00
Wladimir J. van der Laan 13b1ecf0d0 Merge pull request #3084 from Diapolo/clientmodel 
clientmodel: remove 2 hard-coded values, use CChainParams instead
 2013-10-17 04:45:37 -07:00
Wladimir J. van der Laan 0487cc4137 Merge pull request #3098 from super3/master 
Finished /Contrib Index. Standardized READMEs.
 2013-10-16 07:17:00 -07:00
Wladimir J. van der Laan a2bb571c4f Merge pull request #3069 from Diapolo/fix_addressbook 
don't touch addressbook when using secure payment-requests
 2013-10-15 23:48:47 -07:00
Wladimir J. van der Laan 62568f9a1e doc: build with qt5 is currently not possible 
Add as a separate commit so that it can be easily reverted once
Qt5 is supported again.
 2013-10-15 16:02:10 +02:00
Wladimir J. van der Laan 29a4146327 doc: remove readme-qt.md 
Now that autotools is used as a build system there is nothing
special about building the GUI anymore. Merge the salvageable
parts into build-unix.md
 2013-10-15 15:58:43 +02:00
Wladimir J. van der Laan 38d15d8b42 Merge pull request #3080 from Diapolo/sendcoins-paymentreq 
Bitcoin-Qt: misc changes for sendcoins and paymentsever
 2013-10-15 05:57:17 -07:00
Wladimir J. van der Laan f12c09a45b Merge pull request #3093 from Diapolo/printf_format 
replace %zu with %"PRIszu" macro to prevent compiler warnings
 2013-10-15 05:55:53 -07:00
Wladimir J. van der Laan f0c25cf6ec Merge pull request #2924 from sje397/TrafficGraph 
[QT] Add network traffic graph to debug window
 2013-10-15 03:48:22 -07:00
Wladimir J. van der Laan 6fb27534eb Merge pull request #3091 from Diapolo/misc 
misc spelling / space / style fixes
 2013-10-15 03:41:46 -07:00
Wladimir J. van der Laan c74b6c3d8f Merge pull request #3081 from Diapolo/silence_compiler 
prevent compiler redefinition warnings
 2013-10-11 14:20:55 -07:00
Wladimir J. van der Laan 56c0ba7a0f Merge pull request #3071 from gavinandresen/windows_h 
Remove include of windows.h from allocators.h
 2013-10-11 05:11:21 -07:00
Wladimir J. van der Laan b0091bb896 wallet: remove automatic update of default key 2013-10-10 14:59:49 +02:00
Wladimir J. van der Laan a302c21e0b Merge pull request #3066 from Diapolo/rem_global 
make fCommandLine a local variable in AppInit()
 2013-10-09 23:35:42 -07:00
Wladimir J. van der Laan 26002aa444 Merge pull request #3068 from Diapolo/qt-icon 
Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
 2013-10-08 03:48:04 -07:00
Wladimir J. van der Laan 5fc1700fb0 Merge pull request #3064 from Diapolo/style 
style-police: fixed badly readable code in ProcessMessage()
 2013-10-07 01:26:59 -07:00
Wladimir J. van der Laan 695a722003 Merge pull request #3056 from Diapolo/stuck_debug_window 
Bitcoin-Qt: prevent stuck/unusable debug window on exit
 2013-10-06 04:57:08 -07:00
Wladimir J. van der Laan b63ae2a534 Merge pull request #2991 from Diapolo/translation_fixes 
Bitcoin-Qt: translation fixes in sendcoins
 2013-10-01 08:18:48 -07:00
Wladimir J. van der Laan 95a766abc5 Merge pull request #3042 from wtogami/nowinedep 
Hardcode string in miniupnpcstring.h and remove wine from deps-win32.yml
 2013-10-01 06:04:00 -07:00
Wladimir J. van der Laan b85560a1b5 Merge pull request #3045 from Diapolo/master 
misc small spelling/indentation fixes
 2013-10-01 04:14:54 -07:00
Wladimir J. van der Laan bb3319f296 Merge pull request #3043 from wtogami/fixqtwin32 
Fix gitian qt-win32.yml build
 2013-09-30 23:08:54 -07:00
Wladimir J. van der Laan 75d31c84db Merge pull request #3039 from Diapolo/Qt_misc 
several small Qt-related fixes
 2013-09-29 02:50:56 -07:00
Wladimir J. van der Laan b41fa66ba7 Merge pull request #3034 from fanquake/corect-qt-download-link 
Update Qt 4.8.3 download link in Gitian Descriptors README
 2013-09-28 04:52:34 -07:00
Wladimir J. van der Laan e21a435dd1 Merge pull request #3035 from fanquake/remove-homebrew-patches 
Remove obselete HomeBrew patches
 2013-09-28 02:16:50 -07:00
Wladimir J. van der Laan 7de4e47d5f Merge pull request #3031 from Diapolo/miner 
internal miner: move 2 globals from main to miner
 2013-09-28 01:21:57 -07:00
Wladimir J. van der Laan 18c5910e8f Merge pull request #3027 from cozz/cozz2 
GUI: fix sendcoinsdialog/sendcoinsentry
 2013-09-28 00:46:41 -07:00
Wladimir J. van der Laan c2f4187263 Merge pull request #2995 from Diapolo/GUI_message 
Bitcoin-Qt: BitcoinGUI::message() updates/fixes
 2013-09-20 23:38:56 -07:00
Wladimir J. van der Laan 08596fc15d Merge pull request #3021 from Diapolo/fix_extract_strings_qt 
fix extract_strings_qt.py
 2013-09-19 08:01:51 -07:00
Wladimir J. van der Laan 9a4a7d3c6a qt: english translation update 2013-09-18 13:32:09 +02:00
Wladimir J. van der Laan 2bc004c658 Merge pull request #2961 from Diapolo/cosmetic 
fix some cosmetic glitches in the codebase
 2013-09-09 03:55:45 -07:00
Wladimir J. van der Laan 495242c1ad Merge pull request #2976 from laanwj/2013_09_txid_details 
qt: add vout index to transaction id in transactions details dialog
 2013-09-06 04:21:45 -07:00
Wladimir J. van der Laan 9d6b60cf50 Merge pull request #2973 from Diapolo/qDebug 
Bitcoin-Qt: Use qDebug() for printing to debug.log
 2013-09-06 03:26:02 -07:00
Wladimir J. van der Laan ed4c7fd4fd qt: add vout index to transaction id in transactions details dialog 2013-09-06 12:12:18 +02:00
Wladimir J. van der Laan 51c2fa16bb Qt 4.8.3 r2 in gitian and release process 
Also needed to add `unzip` package for the added unzip command for
OpenSSL in the Qt build.
 2013-09-05 14:38:59 +02:00
Wladimir J. van der Laan af079f0b21 Add protobuf 2.5.0 download to gitian release process 2013-09-05 14:02:04 +02:00
Wladimir J. van der Laan f4f048ee58 Merge pull request #2958 from laanwj/2013_08_txfee2 
[Qt] Display txfee in first sendCoinsDialog message box
 2013-09-02 09:48:10 -07:00
Wladimir J. van der Laan 1537d174d7 Merge pull request #2951 from laanwj/2013_08_addressbook_purpose 
[Qt] Handle address purpose in incremental updates
 2013-09-02 05:47:58 -07:00
Wladimir J. van der Laan 2534d05c63 Merge pull request #2963 from Diapolo/log-qt 
Bitcoin-Qt: allow to differentiate Qt log entries from core
 2013-09-02 04:21:19 -07:00
Wladimir J. van der Laan 1b63ea872e Merge pull request #2957 from Rav3nPL/patch-1 
fix help prompt
 2013-08-30 10:37:05 -07:00
Wladimir J. van der Laan 329de9bb64 Merge pull request #2955 from laanwj/2013_08_htmlescape 
qt: Use GUIUtil::HtmlEscape to escape HTML
 2013-08-30 05:44:52 -07:00
Wladimir J. van der Laan 9d2fee17e0 qt: Use GUIUtil::HtmlEscape to escape HTML 
This is why we created this function. Avoids some #ifdef.
 2013-08-30 14:38:09 +02:00
Wladimir J. van der Laan 5da998e887 qt: Add comment to sorting step in refreshAddressTable 2013-08-30 08:25:25 +02:00
Wladimir J. van der Laan 1a12b3e090 Merge pull request #2930 from Diapolo/displayUnit 
Bitcoin-Qt: fixes for using display unit from options
 2013-08-29 07:37:30 -07:00
Wladimir J. van der Laan dcd0b0775e qt: Handle address purpose in incremental updates 
Correctly use the purpose of addresses that are added after the start
of the client. Addresses with purpose "refund" and "change" should not
be visible in the GUI. This is now handled correctly.
 2013-08-29 16:25:51 +02:00
Wladimir J. van der Laan ff33a3470d Merge pull request #2931 from Diapolo/intro 
Bitcoin-Qt: add testnet check and icon to intro dialog
 2013-08-28 12:17:17 -07:00
Wladimir J. van der Laan e9e2ef5fbd Merge pull request #2926 from Diapolo/model_checks 
Bitcoin-Qt: extend some checks for valid model pointers
 2013-08-23 22:34:51 -07:00
Wladimir J. van der Laan b60012f2b6 Merge pull request #2872 from Diapolo/GUI_wallet 
Bitcoin-Qt: tweak Qt walletXXX.cpp/h code
 2013-08-23 01:31:25 -07:00
Wladimir J. van der Laan e4348d2179 Merge pull request #2922 from Diapolo/translations 
translations update for 0.8.4
 2013-08-21 22:41:31 -07:00
Wladimir J. van der Laan e07d9f77e9 Merge pull request #2879 from Diapolo/translations 
translations update for Transifex 2013-08-05
 2013-08-05 03:34:55 -07:00
Wladimir J. van der Laan 6d89611c3a Merge pull request #2850 from Diapolo/fix_intro 
fix possible infinite loop in intro.cpp thread
 2013-07-31 22:15:05 -07:00
Wladimir J. van der Laan 2b894bceac Merge pull request #2847 from Diapolo/fix_QApplication_include 
Bitcoin-Qt: fix QApplication includes to match our include defaults
 2013-07-25 22:42:16 -07:00
Wladimir J. van der Laan 7d3a50ddbe Merge pull request #2848 from Diapolo/translations 
update bitcoin_en.ts to current master (2013-07-23)
 2013-07-25 22:41:51 -07:00
Wladimir J. van der Laan 4eab2dcc81 Merge pull request #2670 from laanwj/2013_05_datadir 
qt: allow user to choose data directory
 2013-07-18 22:42:50 -07:00
Wladimir J. van der Laan 61186321df Merge pull request #2820 from fanquake/remove-readme-rst 
Remove readme-qt.rst and update documentation for readme-qt.md
 2013-07-10 02:34:29 -07:00
Wladimir J. van der Laan be77b637fc qt: allow user to choose data directory 
This adds an introduction screen that is shown when the client is first
started in which the user can choose a data directory.

It is also possible to force the intro screen to appear using command
line argument `-choosedatadir`.

The user is warned that the client will download and store 10Gb of data.
The intro screen shows how much space is available on the device that
contains the chosen directory and warns if this is less than the 10Gb.

To make it possible to translate the introduction dialog, the initialization
sequence is changed so that translations are
loaded before the data directory. This has the by-effect that it is
no longer possible to specify a language in bitcoin.conf inside the data
directory.
 2013-06-16 10:21:41 +02: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
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
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
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
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
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
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
Wladimir J. van der Laan d98bf10f23 Move pMiningKey init out of StartRPCThreads 
This commit decouples the pMiningKey initialization and shutdown from the RPC
threads.

`getwork` and `getblocktemplate` rely on pMiningKey, and can also be ran
from the debug window in the UI even when the RPC server is not running.

Solves issue #2706.
 2013-05-30 16:41:35 +02:00
Wladimir J. van der Laan ba35ecc003 Merge pull request #2697 from Michagogo/master 
Make release-process.md more generic
 2013-05-30 04:51:07 -07:00
Wladimir J. van der Laan 09e437ba4e Merge pull request #2696 from robbak/util_h-Add_stdarg_include 
Explicitly #include stdarg.h, for access to va_list
 2013-05-25 08:48:25 -07:00
Wladimir J. van der Laan de29c9e2c7 Merge pull request #2678 from TheBlueMatt/master 
Add a few data-driven tests for SIGHASH_ANYONECANPAY
 2013-05-21 21:02:45 -07:00
Wladimir J. van der Laan 3702f127fd Merge pull request #2666 from super3/master 
Doc Cleanup with Markdown
 2013-05-20 06:25:41 -07:00
Wladimir J. van der Laan f7f940336e Merge pull request #2650 from jonasschnelli/new_xpm_icons 
new resources for linux software package managers
 2013-05-19 11:53:47 -07:00
Wladimir J. van der Laan 911f0aa7ca Merge pull request #2623 from Diapolo/translations 
translations update 2013-05-07
 2013-05-07 01:12:27 -07:00
Wladimir J. van der Laan 9d053d170b Merge pull request #2621 from celeduc/master 
Update readme with better link syntax (for clickable links) and better readability
 2013-05-05 22:18:47 -07:00
Wladimir J. van der Laan c9b1baaa29 Merge pull request #2617 from Diapolo/translations 
translations update 2013-05-04
 2013-05-04 05:41:18 -07:00
Wladimir J. van der Laan 7226806e8d Merge pull request #2569 from sipa/win1024fd 
Allow select()ing up to 1024 file descriptors on Windows
 2013-04-29 10:27:33 -07:00
Wladimir J. van der Laan 33029bcedd Merge pull request #2586 from laanwj/2013_04_winsock_init 
move WSAStartup to init
 2013-04-28 08:00:53 -07:00
Wladimir J. van der Laan d23fa49c52 move WSAStartup to init 
WSAStartup should be called before using any other socket
functions. BindListenPort is not called if not listening.

Closes #2585.
 2013-04-28 08:54:27 +02:00
Wladimir J. van der Laan 85157ae018 Merge pull request #2584 from laanwj/2013_04_shrinkdebugfile_leak 
Prevent prevent file descriptor leak in ShrinkDebugFile()
 2013-04-27 07:03:20 -07:00
Wladimir J. van der Laan fe9e88cb06 fix !O_NONBLOCK where ~O_NONBLOCK was meant 
Using ! on a non-zero value will always return 0.

Also remove some duplicate and superfluous code in other places.
 2013-04-27 15:37:26 +02:00
Wladimir J. van der Laan 63888d43be Merge pull request #2530 from jonasschnelli/mac_win_reopen_fix 
fixes #1522: GUI Disappearing (Mac OSX)
 2013-04-27 02:15:54 -07:00
Wladimir J. van der Laan 6e40d79860 Merge pull request #2559 from maqifrnswa/manpages 
added bitcoin-qt manpage and corrected a few minus signs
 2013-04-27 02:08:43 -07:00
Wladimir J. van der Laan aa9eee7eaf Merge pull request #2564 from Diapolo/walletview 
small updates for walletview.cpp
 2013-04-27 02:08:08 -07:00
Wladimir J. van der Laan baba312be0 Merge pull request #2582 from laanwj/2013_04_options_fee_recommendation 
qt: remove fee recommendation in settings
 2013-04-27 02:07:20 -07:00
Wladimir J. van der Laan dffb535ead qt: remove fee recommendation in settings 
This value gets stale really quickly, do not hardcode it into a message.
Completely remove it for now.
Later on, a mechanism will be added to determine fees based on the mempool.

Closes #2576
 2013-04-27 11:06:43 +02:00
Wladimir J. van der Laan 3c3164da73 Merge pull request #2572 from laanwj/2013_04_wasted_space 
qt: remove extraneous padding introduced in multiwallet support patch
 2013-04-26 07:10:35 -07:00
Wladimir J. van der Laan 88a18060f3 Merge pull request #2573 from fanquake/bitcoin-qt-app-gitignore 
Add Bitcoin-Qt.app to .gitignore
 2013-04-26 05:00:06 -07:00
Wladimir J. van der Laan 1a31428ec0 qt: remove extraneous padding introduced in multiwallet support patch 
solve issue #2529
 2013-04-26 07:38:24 +02:00
Wladimir J. van der Laan af10e3f6ac Merge pull request #2526 from Diapolo/Qt_misc 
Bitcoin-Qt: misc small changes
 2013-04-23 09:27:30 -07:00
Wladimir J. van der Laan e9d769d143 Merge pull request #2556 from APerson241/master 
Some small grammar fixes
 2013-04-23 09:27:12 -07:00
Wladimir J. van der Laan 72782f3b92 Merge pull request #2525 from laanwj/2013_04_metatypebool 
qt: register metatype for bool*
 2013-04-18 08:59:49 -07:00
Wladimir J. van der Laan dc2de757a4 Merge pull request #2501 from Diapolo/progress 
rework ClientModel::getBlockSource() + BitcoinGUI::setNumBlocks()
 2013-04-18 05:54:42 -07:00