Commit graph

1504 commits

Author SHA1 Message Date
Maran H.
c486c6d55f Merge pull request #33 from bkkcoins/startup-gui-option
Startup gui option
2012-09-21 07:20:59 -07:00
bkkcoins
23b1ccaf39 Merge branch 'socks-support' into merged 2012-09-21 15:14:48 +07:00
bkkcoins
2bf2f76a2a small edit to config syntax 2012-09-21 15:14:16 +07:00
bkkcoins
43d9710cac Merge branch 'startup-gui-option' into merged 2012-09-21 15:11:24 +07:00
bkkcoins
413e5b9cc4 Merge branch 'window-position' into merged 2012-09-21 15:11:19 +07:00
bkkcoins
ad24870a03 small edit to config syntax 2012-09-21 15:10:43 +07:00
bkkcoins
38acaf0a3a small change to config syntax 2012-09-21 15:06:21 +07:00
Maran H.
631a348e5d Merge pull request #32 from bkkcoins/fix-offline-restore
fix offline restore
2012-09-21 00:13:38 -07:00
bkkcoins
0cee420c1e Merge branch 'socks-support' into merged 2012-09-21 13:22:55 +07:00
bkkcoins
0ebbbb56b7 Added socks module to setup 2012-09-21 13:20:24 +07:00
bkkcoins
4c65822f32 merged current branches 2012-09-21 13:05:37 +07:00
bkkcoins
1ca0595653 Merge branch 'startup-gui-option' into merged 2012-09-21 13:03:36 +07:00
bkkcoins
aaa56cebf2 Merge branch 'fix-offline-restore' into merged 2012-09-21 13:03:13 +07:00
bkkcoins
3007d95ceb Added code to remember window position 2012-09-21 10:53:14 +07:00
bkkcoins
fccd9921eb adjust whitespace only 2012-09-21 08:52:33 +07:00
bkkcoins
e43264538d adjust whitespace only 2012-09-21 08:51:28 +07:00
bkkcoins
01b300562e Added settings dialog option for gui startup mode 2012-09-21 08:47:56 +07:00
bkkcoins
8244768654 Changed how load_config works so it always supports new config vars 2012-09-21 04:48:03 +07:00
bkkcoins
9121654e8a Added proxy settings save to config.json 2012-09-20 18:24:36 +07:00
bkkcoins
9c4023ba58 Revert "Fix for wallet restore when offline"
This reverts commit af750d9363.
2012-09-20 17:01:47 +07:00
bkkcoins
09c90c0971 Revert "Revert "Added proxy options to network dialog""
This reverts commit 6e0b3620d2.
2012-09-20 16:55:28 +07:00
bkkcoins
6e0b3620d2 Revert "Added proxy options to network dialog"
This reverts commit 83bb644135.
2012-09-20 16:55:15 +07:00
bkkcoins
a213655cde fix offline restore 2012-09-20 16:46:11 +07:00
bkkcoins
af750d9363 Fix for wallet restore when offline 2012-09-20 15:30:08 +07:00
Maran
7969b62b55 Removed uncle-enzo from default servers since it's not syncing 2012-09-19 18:51:13 +02:00
Amir Taaki
15eb4d7cb8 reformat simple_config to comply with electrum and create config dir if it doesnt exist. 2012-09-19 16:47:39 +01:00
bkkcoins
83bb644135 Added proxy options to network dialog 2012-09-19 22:29:58 +07:00
bkkcoins
1af17baafb sockssipy support module provides SOCKS and HTTP proxy wrapper 2012-09-19 17:37:43 +07:00
bkkcoins
aa6f631f2e Added SOCKS support, with cmdline and SimpleConfig options 2012-09-19 17:37:20 +07:00
Maran H.
af3fe1722b Merge pull request #30 from samueltardieu/installation-fixes
Installation fixes
2012-09-16 10:47:31 -07:00
Samuel Tardieu
aaa496fa60 Import SimpleConfig from electrum if installed 2012-09-07 11:40:06 +02:00
Samuel Tardieu
593b2552d1 Do not qualify relative imports
This is unneeded and fails while installed.
2012-09-07 11:27:00 +02:00
Samuel Tardieu
6ef5cb909a Add missing module electrum.simple_config 2012-09-07 11:05:22 +02:00
Maran
9407dd3f2f Small fix to make sure the cursor stays where it is using the Pro GUI 2012-09-04 19:54:01 +02:00
Maran
3f499d7048 Merge branch 'fallback' 2012-09-04 17:30:19 +02:00
Amir Taaki
89a4045e3a Dump problem tx to temporary file when error happens. This allows developers to debug failed transactions from users by having access to the raw tx dump to see what is wrong.
This would useful in the pro-mode GUI. There should be implemenation for the send method between both these GUIs rather than having their own copy-pasted version. Also the fee system needs fixing.
2012-09-02 19:13:11 +02:00
Maran
a31733d065 Reworked the qt warning dialog 2012-08-30 19:57:32 +02:00
Maran
6da25727f8 Refactored user_dir to utils and replaced it in wallet and config 2012-08-30 18:00:08 +02:00
Maran
fbf854bcb8 Added a set_key setter method that can also write out the changes to file 2012-08-30 17:52:03 +02:00
Maran
0d229383aa Write out the config file to <= 4.7 QT when QT > 4.7 can't be loaded. 2012-08-30 00:11:50 +02:00
Maran
3252b5ae4e Added SimpleConfig class to deal with simple config options added for fallback to other gui when missing deps 2012-08-30 00:03:38 +02:00
Maran
23d314462f Fix merge conflict with master 2012-08-29 22:54:44 +02:00
Amir Taaki
9c122c23ea Fixed issue 19 by jimboman77: https://github.com/spesmilo/electrum/issues/19
"Right now the only check thats being done is making sure that the length isn't 0, ie something is being entered before the send button becomes clickable."

Also check that entered amount is <= btc_balance before enabling send button.
2012-08-29 21:43:34 +01:00
Amir Taaki
ca4473c620 If wallet does not exist, then it does not even attempt to read the config (read returns on IOError exception). Ergo a new wallet will not ever set the theme name and it will stay as None. We change this to a sensible default so new wallets have a themed GUI. 2012-08-29 21:27:22 +01:00
Amir Taaki
4c1bc14104 Remove assert which isn't true for the commands (only the GUI). 2012-08-29 20:54:28 +01:00
Amir Taaki
b3b910d926 WalletSynchronizer had a race condition caused by calling the callback before the Qt event loop (or other initialisation) finished. Ergo we split initialisation and the running of the thread, then use Qt SIGNALs to yield back into the Qt event loop. This ensures that the callback for the servers_list_changed is not called until the main Qt event loop is actually running. 2012-08-29 20:53:22 +01:00
Amir Taaki
e61d478a80 Tidy up of code to comply with style guide. 2012-08-29 20:53:22 +01:00
Maran
3216a86773 Merge branch '1.0' 2012-08-28 11:04:30 +02:00
Maran
4e3e4b90ea Fix port number for bytesized 2012-08-28 11:04:11 +02:00
Maran
bab09b4627 Fix tab issue for password 2012-08-27 10:38:22 +02:00