Commit graph

5220 commits

Author SHA1 Message Date
Neil Booth
820f435a9a Distinguish receiving and change addrs in TxDialog
Show change in yellow, receiving in lightgreen (as now).
Numbers are more readable with whitespace.
2015-06-26 11:55:20 +09:00
ThomasV
c06f9ab034 Merge pull request #1314 from kyuupichan/tx_dialog2
Have show-before-broadcast defer password request
2015-06-25 12:38:10 +02:00
Neil Booth
56488daf04 Have show-before-broadcast defer password request
Show-before-send currently asks for the password
and creates a signed tx before showing anything.

This is a little unnerving as you can't see what
you're being asked to sign.

This patch does a few things:

- Adds a description label to the TX dialog
- You see the tx before being asked for password;
  that is only requested on pressing Sign
- in show-before-broadcast mode, the Send button
  text is instead "Show...".  Hook up this button
  text change to the prefs dialog too.
- Remove many redundant imports.  In particular
  PyQ4 is checked in main_window.py so no need
  in tx_dialog too.

Note I had to remove disabling of the Sign button,
because if the user presses "cancel" nothing will
re-enable it.
2015-06-25 15:58:40 +09:00
BTChip
3a22fe758f Only rescan the dongle when it has been disconnected 2015-06-25 08:17:45 +02:00
ThomasV
7e0a80b697 Merge pull request #1275 from kyuupichan/tx_dialog_send_tx
Have transaction_dialog use send_tx()
2015-06-24 11:15:30 +02:00
ThomasV
fdd43bd5ad fix issue in f307b18546 2015-06-24 09:35:54 +02:00
ThomasV
f307b18546 Merge pull request #1268 from kyuupichan/blockchain_nothread
Make the blockchain class not a thread
2015-06-24 09:00:52 +02:00
BTChip
2b307ce24f Use format_satoshis_plain instead of format_satoshis to avoid locale separator issues 2015-06-24 00:39:39 +02:00
ThomasV
56f8fc62f9 fix 1312 2015-06-23 16:58:21 +02:00
ThomasV
74bdc7a7fa Merge pull request #1308 from kyuupichan/issue_1304
View contact address on block explorer menu item
2015-06-23 14:23:07 +02:00
ThomasV
f894af90d7 fix deserialize_proxy. fixes #1309 2015-06-23 14:22:10 +02:00
Neil Booth
175081d9fc View contact address on block explorer menu item
Resolves issue #1304
2015-06-21 09:57:38 +09:00
ThomasV
74d26f5bdc better error message 2015-06-15 10:52:03 +02:00
ThomasV
5c59b017ae Merge branch 'master' of git://github.com/spesmilo/electrum 2015-06-14 11:39:51 +02:00
ThomasV
0682695da9 version 2.3.2 2015-06-14 11:39:41 +02:00
ThomasV
a4e9df3db9 Merge pull request #1297 from LedgerHQ/ledger-windows-fix
HW.1 fix pack
2015-06-14 11:37:01 +02:00
BTChip
eed37e82d2 Support Ledger 2FA Security Card and prepare for new encoding format 2015-06-14 11:25:26 +02:00
ThomasV
00af3b394b Merge pull request #1280 from kyuupichan/BIP-LI01
Implement BIP-LI01.
2015-06-14 08:08:55 +02:00
ThomasV
ec9cdfaf48 blockchain: restore call to set_local_height, forgotten in previous commit 2015-06-13 16:45:42 +02:00
ThomasV
d09a10e0f7 fix is_used for unmatured tx 2015-06-13 16:40:50 +02:00
ThomasV
99c50aa31f Merge pull request #1296 from romanz/master
Fix few small issues.
2015-06-13 16:38:52 +02:00
Roman Zeyde
90076b0b79 util: add print_msg() method to DaemonThread
it is used by at synchornizer.py, line 173
2015-06-13 16:58:08 +03:00
Roman Zeyde
c324d21107 transaction: added missing import
for "traceback.print_exc(file=sys.stdout)" statement at line 361
2015-06-13 16:58:08 +03:00
Roman Zeyde
cb4d3a78b4 verifier: fix typo 2015-06-13 16:58:08 +03:00
ThomasV
cf5d3e956b Merge pull request #1295 from romanz/master
travis: use pytest (due to better test discovery)
2015-06-13 14:05:09 +02:00
Roman Zeyde
d27efaad82 travis: use pytest (due to better test discovery) 2015-06-13 14:29:23 +03:00
ThomasV
12feb4cf9c Merge pull request #1294 from romanz/master
bitcoin: remove dead code
2015-06-13 13:25:28 +02:00
BTChip
db68dcbc14 Get rid of libusb dependency 2015-06-13 11:58:57 +02:00
Roman Zeyde
6bb9ee0cf7 bitcoin: remove dead code 2015-06-13 08:34:56 +03:00
ThomasV
7a3ddfc6a4 version 2.3.1 2015-06-12 20:22:02 +02:00
ThomasV
10740470cc fix requests_dir bug 2015-06-12 20:18:06 +02:00
ThomasV
d75d3fdf5b fix --pending option 2015-06-12 20:15:53 +02:00
ThomasV
bb4d175978 Merge pull request #1292 from romanz/master
travis.yml: add protobuf to requirements and exclude plugins
2015-06-12 12:25:12 +02:00
ThomasV
c46ac26d82 cosigner pool: exec_->show 2015-06-12 10:44:49 +02:00
Roman Zeyde
b5c53d2ea6 travis.yml: add protobuf to requirements and exclude plugins 2015-06-12 11:38:12 +03:00
ThomasV
42084a3610 improve docstrings 2015-06-12 10:34:45 +02:00
ThomasV
444082f90f Merge pull request #1291 from kyuupichan/server_height_zero
Show Synchronizing... when server height is zero
2015-06-12 10:32:43 +02:00
Neil Booth
304f7f273b Show Synchronizing... when server height is zero 2015-06-12 17:23:32 +09:00
ThomasV
1fbbd5d65d require network to show request status 2015-06-12 09:58:29 +02:00
ThomasV
cbcb799eec add filtering options for listrequests 2015-06-12 09:46:21 +02:00
ThomasV
21f505a62c fix #1290 2015-06-12 05:06:23 +02:00
ThomasV
f3597f865b --force option for addrequest 2015-06-11 20:44:38 +02:00
Maran
9ef1f300f3 Fix Wizard on first run 2015-06-11 15:08:15 +02:00
ThomasV
db6c69f0da Merge pull request #1289 from Kefkius/patch-1
Fix typo in param_descriptions
2015-06-11 13:47:06 +02:00
ThomasV
a103f59686 new flags for listaddresses 2015-06-11 12:49:14 +02:00
ThomasV
2b769b10da bip70 export fixes 2015-06-11 12:38:17 +02:00
ThomasV
317a9de71d check amount before calling make_payment_request 2015-06-11 12:32:52 +02:00
ThomasV
ba78093e2e getalias: no check 2015-06-11 12:08:38 +02:00
Kefkius
b6e4013a9d Fix typo in param_descriptions
heigh --> height
2015-06-11 04:55:08 -04:00
ThomasV
e5b5e8d0f4 comment our ackrequest 2015-06-11 10:50:25 +02:00