Gavin Andresen
7596a030c6
Merge branch 'master' of https://github.com/fanquake/bitcoin
2012-06-18 14:29:32 -04:00
Gavin Andresen
550c73f4c8
Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
...
Resolved minor conflict in main.cpp
2012-06-18 10:48:40 -04:00
fanquake
baf814f3da
OS X not OSX
2012-06-18 22:09:19 +08:00
fanquake
8b7b3be765
Further updates to build instructions
2012-06-18 21:58:20 +08:00
Gavin Andresen
5204ca87e2
Merge pull request #1480 from fanquake/master
...
Update OSX build instructions
2012-06-18 06:44:51 -07:00
Fordy
2bbfcd2d02
Update OSX build instructions
2012-06-18 14:57:28 +08:00
Pieter Wuille
432d28d3bb
Merge pull request #1477 from gmaxwell/master
...
Fix inverted logic for !Discover/!UPNP when !Listen.
2012-06-17 17:07:08 -07:00
Wladimir J. van der Laan
a54d2118be
Merge pull request #1434 from Diapolo/GUI_fix_displayunit
...
GUI: init with correct display unit and update it, when user changes it via options dialog
2012-06-17 12:29:26 -07:00
Wladimir J. van der Laan
8ce04527f9
Merge pull request #1451 from Diapolo/sendcoins
...
GUI: set cursor for balance field to IBeamCursor (to show the user it IS selectable)
2012-06-17 12:26:20 -07:00
Wladimir J. van der Laan
6062de265a
Merge pull request #1461 from laanwj/2012_06_helpmessage
...
Show command line options as dialog when opened from debug window
2012-06-17 12:24:35 -07:00
Gregory Maxwell
3bbb49de55
Fix inverted logic for !Discover/!UPNP when !Listen.
2012-06-17 12:13:34 -04:00
Philip Kaufmann
e0873dafc5
add the slot updateDisplayUnit() to overviewpage, sendcoinsdialog, sendcoinsentry and connect it to displayUnitChanged() - this ensures all fields in the GUI, who use a display unit are imediately updated, when the user changes this setting in the optionsdialog / ensure used fields init with the current set display unit
2012-06-17 15:20:42 +02:00
Gavin Andresen
fab7858a35
Document how to build/run unit tests
2012-06-14 20:44:04 -04:00
Gregory Maxwell
194ea3186a
Merge pull request #1463 from sipa/fix_1455
...
Use a 64-bit nonce in ping
2012-06-14 09:48:10 -07:00
Pieter Wuille
c971112dfa
Use a 64-bit nonce in ping
...
Former code sent '0' as nonce, which was serialized as 32-bit.
2012-06-14 18:31:08 +02:00
Wladimir J. van der Laan
7d72a8c36a
Show command line options as dialog when opened from debug window
...
On Linux/Mac the command-line options were printed to stderr when the button
was pressed in the debug window, resulting in confusion. This is fixed
in this commit by adding a separate method.
2012-06-14 15:14:01 +02:00
Wladimir J. van der Laan
d59bce21e5
Merge pull request #1459 from laanwj/2012_06_trayiconmenu
...
Reorganize tray icon menu into more logical order
2012-06-14 05:52:33 -07:00
Wladimir J. van der Laan
641cfb1456
Fix build of testcases after commit 0f10b21719
2012-06-14 09:41:11 +02:00
Wladimir J. van der Laan
64d46e7c6a
Merge pull request #1002 from Diapolo/URL-handling_2
...
URI-handling code update: added safety checks and notifications
2012-06-13 23:17:06 -07:00
Wladimir J. van der Laan
0f10b21719
Merge pull request #1439 from Diapolo/ClientShutdown
...
re-work Shutdown() function
2012-06-13 23:12:22 -07:00
Wladimir J. van der Laan
f5f2d7410d
Reorganize tray icon menu into more logical order
...
The current order of menu options in the tray menu doesn't really match expected usage patterns, this commit changes it to more logical order.
- Toggle show/hide first (unchanged)
- Then, send/receive coins actions, which are the critical functionality of bitcoin
- Then, sign/verify message
- Then finally the options, and closing with the debug window
2012-06-14 08:01:41 +02:00
Philip Kaufmann
93b7af3099
URI-handling code update: added safety checks and tray-notifications
2012-06-14 07:59:27 +02:00
Wladimir J. van der Laan
7a98f19fb6
Merge pull request #1420 from Diapolo/extend_showNormalIfMinimized
...
GUI: merge toggleHidden() code into showNormalIfMinimized()
2012-06-13 22:49:38 -07:00
Gavin Andresen
d518e444f8
Merge branch 'refactor_coinselect' of https://github.com/luke-jr/bitcoin
2012-06-13 21:36:35 -04:00
Philip Kaufmann
b5782531ad
set cursor for balance field to IBeamCursor (to show the user it IS selectable) and set autoDefault to false for the buttons that do not need this
2012-06-13 18:34:29 +02:00
Wladimir J. van der Laan
7d1490576d
Merge pull request #1448 from Diapolo/2012-06-13_translation_updates
...
update translation files (fetched from Transifex - 2012-06-13)
2012-06-13 09:24:39 -07:00
Wladimir J. van der Laan
1bdc992a59
Merge pull request #1449 from laanwj/2012_06_bitcoinstrings
...
Update bitcoinstrings.cpp and English source translation file
2012-06-13 09:23:10 -07:00
Wladimir J. van der Laan
15094f7654
Update bitcoinstrings from core and English source translation file
...
This is necessary as any strings have changed since last time.
Also the python script used to extract bitcoinstrings.cpp, extract_strings_qt.py
now sorts the strings before generating the output file. This results in more
deterministic output and thus smaller diffs.
2012-06-13 18:19:16 +02:00
Philip Kaufmann
66654ab02e
update translation files (fetched from Transifex) and remove translation for fr_FR, which was removed / renamed on TX
2012-06-13 18:04:27 +02:00
Wladimir J. van der Laan
44c89996c8
Merge pull request #1433 from Diapolo/tabbed_optionsdialog
...
GUI: re-work current options dialog to a tabbed layout and use an UI-file
2012-06-13 07:37:24 -07:00
Philip Kaufmann
c4443c2be1
re-work optionsdialog to a tabbed UI based on an ui-file
...
- extend network options with a SOCKS version selection
- changing "Unit to show amounts in:" now also updates the unit used in the transaction fee box
- string updates
- link Apply button and OK button when enabling or disabling them
- use LookupNumeric() from netbase to verify proxy address (via an EventFilter)
- change proxy address field to QValidatedLineEdit and add visual feedback
- add a status label used for displaying a message for invalid proxy addresses
- allow usage of IPv6 address as proxy address
- added warning message when enabling / disabling SOCKS proxy
2012-06-13 16:24:25 +02:00
Wladimir J. van der Laan
c4879a0c2f
Merge pull request #1444 from laanwj/2012_06_opendebuglog
...
Cross-platform “Open debug logfile”
2012-06-12 23:56:14 -07:00
Wladimir J. van der Laan
609046df6a
Merge pull request #1445 from Diapolo/RPCCon_Button_noAutoDefault
...
GUI: make buttons in debug window non autoDefault
2012-06-12 23:08:31 -07:00
Gavin Andresen
c17e60e270
Merge pull request #1446 from TheBlueMatt/changelog
...
Update wiki changelog at doc/release-process.txt
2012-06-12 17:08:34 -07:00
Matt Corallo
992a2e2e79
Update wiki changelog at doc/release-process.txt
2012-06-13 01:06:40 +02:00
Philip Kaufmann
d2e6dd6c99
merge toggleHidden() code into showNormalIfMinimized() to extend the functionality, but keep a simpler toggleHidden() for use in SLOT() macro
2012-06-12 22:15:35 +02:00
Philip Kaufmann
d4b2f3c45b
make buttons in debug window non autoDefault
2012-06-12 17:17:51 +02:00
Wladimir J. van der Laan
9b1732baae
Cross-platform "Open debug logfile"
...
The option to open the debug logfile from the debug window was implemented only for
windows. By using `QDesktopServices::openUrl` it now works on any platform.
2012-06-12 16:35:19 +02:00
Wladimir J. van der Laan
12718ce767
Merge pull request #1440 from Diapolo/overviewpage_InitialBalance
...
change initial Balance on overviewpage from "123.456 BTC" to "0 BTC" to ...
2012-06-12 04:19:49 -07:00
Pieter Wuille
de29f9b444
Merge pull request #1441 from TheBlueMatt/gitian-downloader
...
Fix broken config files
2012-06-12 03:43:06 -07:00
Wladimir J. van der Laan
e5ad8de2d9
Merge pull request #1443 from laanwj/2012_06_addressbook_noautoselect
...
Do not select first address automatically in the address book
2012-06-12 01:49:32 -07:00
Wladimir J. van der Laan
2842fe4aa3
Do not select first address automatically in the address book
...
This contributed to an accidental send (#1384 ), and has no clear advantage, better to disable it.
2012-06-12 10:48:42 +02:00
Wladimir J. van der Laan
b6ef8d5a40
Merge pull request #1412 from Diapolo/string_wait_mature
...
GUI: update info strings for generated blocks
2012-06-11 22:30:21 -07:00
Philip Kaufmann
9247134eab
introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
2012-06-12 07:21:03 +02:00
Matt Corallo
993928cfcc
Fix broken config files
2012-06-12 01:52:34 +02:00
Philip Kaufmann
59e0f445ce
change initial Balance on overviewpage from "123.456 BTC" to "0 BTC" to not confuse users, which could see it before we init with the real wallet balance
2012-06-11 22:40:06 +02:00
Jeff Garzik
883a310904
Merge pull request #1435 from TheBlueMatt/mingwbuild
...
Fix Mingw64 build (missing headers according to M$ documentation)
2012-06-09 12:40:15 -07:00
Matt Corallo
b065976007
Fix Mingw64 build (missing headers according to M$ documentation)
2012-06-09 17:14:41 +02:00
Philip Kaufmann
40d23dafb7
update info string in GUI for generated blocks and change "must wait" into "must mature" to take the new immature label into consideration
2012-06-09 00:34:10 +02:00
Pieter Wuille
11f73c728a
Merge pull request #1421 from Diapolo/netbase_fix_sign_warnings
...
fix two signed/unsigned comparison warnings in netbase.cpp
2012-06-08 07:29:34 -07:00