qp.end()
+def waiting_dialog(f):
+
+ s = Timer()
+ s.start()
+ w = QDialog()
+ w.resize(200, 70)
+ w.setWindowTitle('Electrum')
+ l = QLabel('')
+ vbox = QVBoxLayout()
+ vbox.addWidget(l)
+ w.setLayout(vbox)
+ w.show()
+ def ff():
+ s = f()
+ if s: l.setText(s)
+ else: w.close()
+ w.connect(s, QtCore.SIGNAL('timersignal'), ff)
+ w.exec_()
+ w.destroy()
+
def ok_cancel_buttons(dialog):
hbox = QHBoxLayout()
QMainWindow.__init__(self)
self.wallet = wallet
self.config = config
- self.wallet.register_callback(self.update_callback)
+ self.wallet.interface.register_callback('updated', self.update_callback)
self.detailed_view = config.get('qt_detailed_view', False)
def address_label_changed(self, item, column, l, column_addr, column_label):
addr = unicode( item.text(column_addr) )
text = unicode( item.text(column_label) )
+ changed = False
+
if text:
if text not in self.wallet.aliases.keys():
- self.wallet.labels[addr] = text
+ old_addr = self.wallet.labels.get(text)
+ if old_addr != addr:
+ self.wallet.labels[addr] = text
+ changed = True
else:
print_error("Error: This is one of your aliases")
label = self.wallet.labels.get(addr,'')
item.setText(column_label, QString(label))
else:
s = self.wallet.labels.get(addr)
- if s: self.wallet.labels.pop(addr)
+ if s:
+ self.wallet.labels.pop(addr)
+ changed = True
+
+ if changed:
+ self.wallet.update_tx_labels()
+ self.update_history_tab()
+ self.update_completions()
- self.update_history_tab()
- self.update_completions()
def update_history_tab(self):
self.history_list.clear()
if tx['height']:
conf = self.wallet.blocks - tx['height'] + 1
time_str = datetime.datetime.fromtimestamp( tx['timestamp']).isoformat(' ')[:-3]
- icon = QIcon(":icons/confirmed.png")
+ if conf < 6:
+ icon = QIcon(":icons/clock%d.png"%conf)
+ else:
+ icon = QIcon(":icons/confirmed.png")
else:
conf = 0
time_str = 'pending'
self.show_message(str(e))
return
- status, msg = self.wallet.sendtx( tx )
+ h = self.wallet.send_tx(tx)
+ waiting_dialog(lambda: False if self.wallet.tx_event.isSet() else _("Please wait..."))
+ status, msg = self.wallet.receive_tx( h )
+
if status:
QMessageBox.information(self, '', _('Payment sent.')+'\n'+msg, _('OK'))
self.do_clear()
qr_button.clicked.connect(show_qr_function)
ok_button = QPushButton(_("OK"))
+ ok_button.setDefault(True)
ok_button.clicked.connect(dialog.accept)
main_layout = QGridLayout()
grid.setSpacing(8)
vbox.addLayout(grid)
+ fee_label = QLabel(_('Transaction fee'))
+ grid.addWidget(fee_label, 2, 0)
fee_e = QLineEdit()
fee_e.setText("%s"% str( Decimal( self.wallet.fee)/100000000 ) )
- grid.addWidget(QLabel(_('Transaction fee')), 2, 0)
grid.addWidget(fee_e, 2, 1)
msg = _('Fee per transaction input. Transactions involving multiple inputs tend to require a higher fee.') + ' ' \
+ _('Recommended value') + ': 0.001'
grid.addWidget(HelpButton(msg), 2, 2)
fee_e.textChanged.connect(lambda: numbify(fee_e,False))
+ if not self.config.is_modifiable('fee'):
+ for w in [fee_e, fee_label]: w.setEnabled(False)
+ nz_label = QLabel(_('Display zeros'))
+ grid.addWidget(nz_label, 3, 0)
nz_e = QLineEdit()
nz_e.setText("%d"% self.wallet.num_zeros)
- grid.addWidget(QLabel(_('Display zeros')), 3, 0)
+ grid.addWidget(nz_e, 3, 1)
msg = _('Number of zeros displayed after the decimal point. For example, if this is set to 2, "1." will be displayed as "1.00"')
grid.addWidget(HelpButton(msg), 3, 2)
- grid.addWidget(nz_e, 3, 1)
nz_e.textChanged.connect(lambda: numbify(nz_e,True))
+ if not self.config.is_modifiable('num_zeros'):
+ for w in [nz_e, nz_label]: w.setEnabled(False)
usechange_cb = QCheckBox(_('Use change addresses'))
grid.addWidget(usechange_cb, 5, 0)
usechange_cb.setChecked(self.wallet.use_change)
grid.addWidget(HelpButton(_('Using change addresses makes it more difficult for other people to track your transactions. ')), 5, 2)
+ if not self.config.is_modifiable('use_change'): usechange_cb.setEnabled(False)
+ gap_label = QLabel(_('Gap limit'))
+ grid.addWidget(gap_label, 6, 0)
+ gap_e = QLineEdit()
+ gap_e.setText("%d"% self.wallet.gap_limit)
+ grid.addWidget(gap_e, 6, 1)
msg = _('The gap limit is the maximal number of contiguous unused addresses in your sequence of receiving addresses.') + '\n' \
+ _('You may increase it if you need more receiving addresses.') + '\n\n' \
+ _('Your current gap limit is') + ': %d'%self.wallet.gap_limit + '\n' \
+ _('Warning') + ': ' \
+ _('The gap limit parameter must be provided in order to recover your wallet from seed.') + ' ' \
+ _('Do not modify it if you do not understand what you are doing, or if you expect to recover your wallet without knowing it!') + '\n\n'
- gap_e = QLineEdit()
- gap_e.setText("%d"% self.wallet.gap_limit)
- grid.addWidget(QLabel(_('Gap limit')), 6, 0)
- grid.addWidget(gap_e, 6, 1)
grid.addWidget(HelpButton(msg), 6, 2)
gap_e.textChanged.connect(lambda: numbify(nz_e,True))
+ if not self.config.is_modifiable('gap_limit'):
+ for w in [gap_e, gap_label]: w.setEnabled(False)
- gui = QComboBox()
- gui.addItems(['Lite', 'Qt', 'Gtk'])
- gui.setCurrentIndex(gui.findText(self.config.get("gui","lite").capitalize()))
- grid.addWidget(QLabel(_('Default GUI') + ':'), 7, 0)
- grid.addWidget(gui, 7, 1)
+ gui_label=QLabel(_('Default GUI') + ':')
+ grid.addWidget(gui_label , 7, 0)
+ gui_combo = QComboBox()
+ gui_combo.addItems(['Lite', 'Classic', 'Gtk', 'Text'])
+ gui_combo.setCurrentIndex(gui_combo.findText(self.config.get("gui","classic").capitalize()))
+ grid.addWidget(gui_combo, 7, 1)
grid.addWidget(HelpButton(_('Select which GUI mode to use at start up. ')), 7, 2)
-
+ if not self.config.is_modifiable('gui'):
+ for w in [gui_combo, gui_label]: w.setEnabled(False)
+
vbox.addLayout(ok_cancel_buttons(d))
d.setLayout(vbox)
if self.wallet.num_zeros != nz:
self.wallet.num_zeros = nz
+ self.config.set_key('num_zeros', nz, True)
self.update_history_tab()
self.update_receive_tab()
- self.wallet.save()
- self.wallet.use_change = usechange_cb.isChecked()
+ if self.wallet.use_change != usechange_cb.isChecked():
+ self.wallet.use_change = usechange_cb.isChecked()
+ self.config.set_key('use_change', self.wallet.use_change, True)
+
try:
n = int(gap_e.text())
except:
QMessageBox.warning(self, _('Error'), _('Invalid value'), _('OK'))
return
+
if self.wallet.gap_limit != n:
r = self.wallet.change_gap_limit(n)
if r:
self.update_receive_tab()
+ self.config.set_key('gap_limit', self.wallet.gap_limit, True)
else:
QMessageBox.warning(self, _('Error'), _('Invalid value'), _('OK'))
- self.config.set_key("gui", str(gui.currentText()).lower(), True)
+ self.config.set_key("gui", str(gui_combo.currentText()).lower(), True)
interface = wallet.interface
if parent:
if interface.is_connected:
- status = _("Connected to")+" %s:%d\n%d blocks"%(interface.host, interface.port, wallet.blocks)
+ status = _("Connected to")+" %s\n%d blocks"%(interface.host, wallet.blocks)
else:
status = _("Not connected")
- server = interface.server
else:
import random
status = _("Please choose a server.")
- server = random.choice( DEFAULT_SERVERS )
+
+ server = interface.server
if not wallet.interface.servers:
servers_list = []
plist = {}
for item in servers_list:
- host, pp = item
+ _host, pp = item
z = {}
for item2 in pp:
- protocol, port = item2
- z[protocol] = port
- plist[host] = z
+ _protocol, _port = item2
+ z[_protocol] = _port
+ plist[_host] = z
d = QDialog(parent)
d.setModal(1)
d.setMinimumSize(375, 20)
vbox = QVBoxLayout()
- vbox.setSpacing(20)
+ vbox.setSpacing(30)
hbox = QHBoxLayout()
l = QLabel()
l.setPixmap(QPixmap(":icons/network.png"))
+ hbox.addStretch(10)
hbox.addWidget(l)
hbox.addWidget(QLabel(status))
-
+ hbox.addStretch(50)
vbox.addLayout(hbox)
- hbox = QHBoxLayout()
- host_line = QLineEdit()
- host_line.setText(server)
- hbox.addWidget(QLabel(_('Connect to') + ':'))
- hbox.addWidget(host_line)
- vbox.addLayout(hbox)
- hbox = QHBoxLayout()
+ # grid layout
+ grid = QGridLayout()
+ grid.setSpacing(8)
+ vbox.addLayout(grid)
- buttonGroup = QGroupBox(_("Protocol"))
- radio1 = QRadioButton("tcp", buttonGroup)
- radio2 = QRadioButton("http", buttonGroup)
+ # server
+ server_protocol = QComboBox()
+ server_host = QLineEdit()
+ server_host.setFixedWidth(200)
+ server_port = QLineEdit()
+ server_port.setFixedWidth(60)
- def current_line():
- return unicode(host_line.text()).split(':')
-
- def set_button(protocol):
- if protocol == 't':
- radio1.setChecked(1)
- elif protocol == 'h':
- radio2.setChecked(1)
-
- def set_protocol(protocol):
- host = current_line()[0]
+ protocol_names = ['TCP', 'HTTP', 'TCP/SSL', 'HTTPS']
+ protocol_letters = 'thsg'
+ server_protocol.addItems(protocol_names)
+
+ grid.addWidget(QLabel(_('Server') + ':'), 0, 0)
+ grid.addWidget(server_protocol, 0, 1)
+ grid.addWidget(server_host, 0, 2)
+ grid.addWidget(server_port, 0, 3)
+
+ host, port, protocol = server.split(':')
+
+ def change_protocol(p):
+ protocol = protocol_letters[p]
+ host = unicode(server_host.text())
pp = plist[host]
if protocol not in pp.keys():
protocol = pp.keys()[0]
- set_button(protocol)
port = pp[protocol]
- host_line.setText( host + ':' + port + ':' + protocol)
+ server_host.setText( host )
+ server_port.setText( port )
- radio1.clicked.connect(lambda x: set_protocol('t') )
- radio2.clicked.connect(lambda x: set_protocol('h') )
+ server_protocol.connect(server_protocol, SIGNAL('currentIndexChanged(int)'), change_protocol)
+
+ label = _('Active Servers') if wallet.interface.servers else _('Default Servers')
+ servers_list_widget = QTreeWidget(parent)
+ servers_list_widget.setHeaderLabels( [ label ] )
+ servers_list_widget.setMaximumHeight(150)
+ for _host in plist.keys():
+ servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ _host ] ))
- set_button(current_line()[2])
- hbox.addWidget(QLabel(_('Protocol')+':'))
- hbox.addWidget(radio1)
- hbox.addWidget(radio2)
+ def change_server(host, protocol=None):
+ pp = plist.get(host,{})
+ if protocol:
+ port = pp.get(protocol)
+ if not port: protocol = None
+
+ if not protocol:
+ if not pp:
+ protocol = 't'
+ port = '50001'
+ elif 't' in pp.keys():
+ protocol = 't'
+ port = pp.get(protocol)
+ else:
+ protocol = pp.keys()[0]
+ port = pp.get(protocol)
- vbox.addLayout(hbox)
-
- hbox = QHBoxLayout()
+
+ server_host.setText( host )
+ server_port.setText( port )
+ server_protocol.setCurrentIndex(protocol_letters.index(protocol))
+
+ for p in protocol_letters:
+ i = protocol_letters.index(p)
+ j = server_protocol.model().index(i,0)
+ if p not in pp.keys():
+ server_protocol.model().setData(j, QtCore.QVariant(0), QtCore.Qt.UserRole-1)
+ else:
+ server_protocol.model().setData(j, QtCore.QVariant(0,False), QtCore.Qt.UserRole-1)
+
+ change_server(host,protocol)
+
+
+ servers_list_widget.connect(servers_list_widget, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), lambda x: change_server(unicode(x.text(0))))
+ grid.addWidget(servers_list_widget, 1, 1, 1, 3)
+
+ if not wallet.config.is_modifiable('server'):
+ for w in [server_host, server_port, server_protocol, servers_list_widget]: w.setEnabled(False)
+
+ # proxy setting
proxy_mode = QComboBox()
proxy_host = QLineEdit()
proxy_host.setFixedWidth(200)
proxy_port = QLineEdit()
- proxy_port.setFixedWidth(50)
+ proxy_port.setFixedWidth(60)
proxy_mode.addItems(['NONE', 'SOCKS4', 'SOCKS5', 'HTTP'])
def check_for_disable(index = False):
proxy_port.setEnabled(False)
check_for_disable()
-
proxy_mode.connect(proxy_mode, SIGNAL('currentIndexChanged(int)'), check_for_disable)
+ if not wallet.config.is_modifiable('proxy'):
+ for w in [proxy_host, proxy_port, proxy_mode]: w.setEnabled(False)
proxy_config = interface.proxy if interface.proxy else { "mode":"none", "host":"localhost", "port":"8080"}
proxy_mode.setCurrentIndex(proxy_mode.findText(str(proxy_config.get("mode").upper())))
proxy_host.setText(proxy_config.get("host"))
proxy_port.setText(proxy_config.get("port"))
- hbox.addWidget(QLabel(_('Proxy') + ':'))
- hbox.addWidget(proxy_mode)
- hbox.addWidget(proxy_host)
- hbox.addWidget(proxy_port)
- vbox.addLayout(hbox)
-
- hbox = QHBoxLayout()
-
- if wallet.interface.servers:
- label = _('Active Servers')
- else:
- label = _('Default Servers')
-
- servers_list_widget = QTreeWidget(parent)
- servers_list_widget.setHeaderLabels( [ label ] )
- servers_list_widget.setMaximumHeight(150)
- for host in plist.keys():
- servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ host ] ))
-
- def do_set_line(x):
- host = unicode(x.text(0))
- pp = plist[host]
- if 't' in pp.keys():
- protocol = 't'
- else:
- protocol = pp.keys()[0]
- port = pp[protocol]
- host_line.setText( host + ':' + port + ':' + protocol)
- set_button(protocol)
-
- servers_list_widget.connect(servers_list_widget, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), do_set_line)
- vbox.addWidget(servers_list_widget)
+ grid.addWidget(QLabel(_('Proxy') + ':'), 2, 0)
+ grid.addWidget(proxy_mode, 2, 1)
+ grid.addWidget(proxy_host, 2, 2)
+ grid.addWidget(proxy_port, 2, 3)
+ # buttons
vbox.addLayout(ok_cancel_buttons(d))
d.setLayout(vbox)
if not d.exec_(): return
- server = unicode( host_line.text() )
+ server = unicode( server_host.text() ) + ':' + unicode( server_port.text() ) + ':' + (protocol_letters[server_protocol.currentIndex()])
if proxy_mode.currentText() != 'NONE':
proxy = { u'mode':unicode(proxy_mode.currentText()).lower(), u'host':unicode(proxy_host.text()), u'port':unicode(proxy_port.text()) }
else:
def server_list_changed(self):
pass
- def waiting_dialog(self):
-
- s = Timer()
- s.start()
- w = QDialog()
- w.resize(200, 70)
- w.setWindowTitle('Electrum')
- l = QLabel('')
- vbox = QVBoxLayout()
- vbox.addWidget(l)
- w.setLayout(vbox)
- w.show()
- def f():
- if self.wallet.up_to_date:
- w.close()
- else:
- l.setText("Please wait...\nAddresses generated: %d\nKilobytes received: %.1f"\
- %(len(self.wallet.all_addresses()), self.wallet.interface.bytes_received/1024.))
-
- w.connect(s, QtCore.SIGNAL('timersignal'), f)
- self.wallet.interface.poke()
- w.exec_()
- w.destroy()
-
def restore_or_create(self):
# ask for the server.
if not ElectrumWindow.network_dialog( wallet, parent=None ): return False
+ waiting = lambda: False if wallet.up_to_date else "Please wait...\nAddresses generated: %d\nKilobytes received: %.1f"\
+ %(len(wallet.all_addresses()), wallet.interface.bytes_received/1024.)
+
if not is_recovery:
wallet.new_seed(None)
wallet.init_mpk( wallet.seed )
wallet.up_to_date_event.clear()
wallet.up_to_date = False
- self.waiting_dialog()
+ wallet.interface.poke('synchronizer')
+ waiting_dialog(waiting)
# run a dialog indicating the seed, ask the user to remember it
ElectrumWindow.show_seed_dialog(wallet)
#ask for password
wallet.init_mpk( wallet.seed )
wallet.up_to_date_event.clear()
wallet.up_to_date = False
- self.waiting_dialog()
+ wallet.interface.poke('synchronizer')
+ waiting_dialog(waiting)
if wallet.is_found():
# history and addressbook
wallet.update_tx_history()
git://git.novaco.in / electrum-nvc.git / blobdiff