Merge branch 'master' of gitorious.org:electrum/electrum
This commit is contained in:
commit
8b252a7971
|
@ -29,6 +29,7 @@ In order to use the gtk gui, you need pygtk and tk.
|
||||||
* apt-get install python-gtk2
|
* apt-get install python-gtk2
|
||||||
* apt-get install python-tk
|
* apt-get install python-tk
|
||||||
|
|
||||||
|
|
||||||
RUN
|
RUN
|
||||||
|
|
||||||
To start the Qt gui, type:
|
To start the Qt gui, type:
|
||||||
|
@ -43,6 +44,12 @@ Examples:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
HELP
|
||||||
|
|
||||||
|
the most up-to-date information is on the wiki:
|
||||||
|
https://en.bitcoin.it/wiki/Electrum
|
||||||
|
|
||||||
|
|
||||||
BROWSER CONFIGURATION
|
BROWSER CONFIGURATION
|
||||||
|
|
||||||
see http://ecdsa.org/bitcoin_URIs.html
|
see http://ecdsa.org/bitcoin_URIs.html
|
||||||
|
|
|
@ -163,7 +163,7 @@ if __name__ == '__main__':
|
||||||
cmd = 'help'
|
cmd = 'help'
|
||||||
|
|
||||||
# open session
|
# open session
|
||||||
if cmd not in ['password', 'mktx', 'history', 'label', 'contacts', 'help', 'validateaddress', 'signmessage', 'verifymessage', 'eval', 'create', 'addresses']:
|
if cmd not in ['password', 'mktx', 'history', 'label', 'contacts', 'help', 'validateaddress', 'signmessage', 'verifymessage', 'eval', 'create', 'addresses', 'import']:
|
||||||
interface.start_session(wallet)
|
interface.start_session(wallet)
|
||||||
interface.update_wallet(wallet)
|
interface.update_wallet(wallet)
|
||||||
wallet.save()
|
wallet.save()
|
||||||
|
|
|
@ -841,7 +841,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
import random
|
import random
|
||||||
status = "Please choose a server."
|
status = "Please choose a server."
|
||||||
host = random.choice( interface.servers )
|
host = random.choice( interface.servers )
|
||||||
port = wallet.default_port
|
port = wallet.port
|
||||||
|
|
||||||
d = QDialog(parent)
|
d = QDialog(parent)
|
||||||
d.setModal(1)
|
d.setModal(1)
|
||||||
|
@ -870,7 +870,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
servers_list.setMaximumHeight(150)
|
servers_list.setMaximumHeight(150)
|
||||||
for item in wallet.interface.servers:
|
for item in wallet.interface.servers:
|
||||||
servers_list.addTopLevelItem(QTreeWidgetItem( [ item ] ))
|
servers_list.addTopLevelItem(QTreeWidgetItem( [ item ] ))
|
||||||
servers_list.connect(servers_list, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), lambda x:host_line.setText( x.text(0) + ':%d'%wallet.default_port ))
|
servers_list.connect(servers_list, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), lambda x:host_line.setText( x.text(0) + ':%d'%wallet.port ))
|
||||||
vbox.addWidget(servers_list)
|
vbox.addWidget(servers_list)
|
||||||
|
|
||||||
vbox.addLayout(ok_cancel_buttons(d))
|
vbox.addLayout(ok_cancel_buttons(d))
|
||||||
|
@ -885,7 +885,7 @@ class ElectrumWindow(QMainWindow):
|
||||||
port = int(port)
|
port = int(port)
|
||||||
else:
|
else:
|
||||||
host = hh
|
host = hh
|
||||||
port = wallet.default_port
|
port = wallet.port
|
||||||
except:
|
except:
|
||||||
show_message("error")
|
show_message("error")
|
||||||
if parent == None:
|
if parent == None:
|
||||||
|
|
|
@ -231,6 +231,7 @@ def format_satoshis(x, is_diff=False):
|
||||||
|
|
||||||
from version import ELECTRUM_VERSION, SEED_VERSION
|
from version import ELECTRUM_VERSION, SEED_VERSION
|
||||||
|
|
||||||
|
DEFAULT_PORT = 50000
|
||||||
|
|
||||||
|
|
||||||
class Wallet:
|
class Wallet:
|
||||||
|
@ -263,7 +264,6 @@ class Wallet:
|
||||||
|
|
||||||
self.imported_keys = {}
|
self.imported_keys = {}
|
||||||
self.remote_url = None
|
self.remote_url = None
|
||||||
self.default_port = 50001
|
|
||||||
|
|
||||||
|
|
||||||
def set_server(self, host, port):
|
def set_server(self, host, port):
|
||||||
|
@ -560,7 +560,7 @@ class Wallet:
|
||||||
f.close()
|
f.close()
|
||||||
except:
|
except:
|
||||||
self.host = ''
|
self.host = ''
|
||||||
self.port = self.default_port
|
self.port = DEFAULT_PORT
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
d = ast.literal_eval( data )
|
d = ast.literal_eval( data )
|
||||||
|
|
Loading…
Reference in New Issue