# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# use this because this file is named gtk.py
+from __future__ import absolute_import
+
import datetime
import thread, time, ast, sys, re
import socket, traceback
show_message("No seed")
return
try:
- seed = wallet.decode_seed(password)
+ seed = wallet.get_seed(password)
except:
show_message("Incorrect password")
return
-def run_settings_dialog(wallet, parent):
+def run_settings_dialog(self):
message = "Here are the settings of your wallet. For more explanations, click on the question mark buttons next to each input field."
dialog = gtk.MessageDialog(
- parent = parent,
+ parent = self.window,
flags = gtk.DIALOG_MODAL,
buttons = gtk.BUTTONS_OK_CANCEL,
message_format = message)
fee_label.set_size_request(150,10)
fee_label.show()
fee.pack_start(fee_label,False, False, 10)
- fee_entry.set_text( str( Decimal(wallet.fee) /100000000 ) )
+ fee_entry.set_text( str( Decimal(self.wallet.fee) /100000000 ) )
fee_entry.connect('changed', numbify, False)
fee_entry.show()
fee.pack_start(fee_entry,False,False, 10)
nz_label.set_size_request(150,10)
nz_label.show()
nz.pack_start(nz_label,False, False, 10)
- nz_entry.set_text( str( wallet.num_zeros ))
+ nz_entry.set_text( str( self.num_zeros ))
nz_entry.connect('changed', numbify, True)
nz_entry.show()
nz.pack_start(nz_entry,False,False, 10)
nz.show()
vbox.pack_start(nz, False,False, 5)
- # gui setting
- gui_box = gtk.HBox()
- gui_label = gtk.Label('Default GUI:')
- gui_label.set_size_request(150,10)
- gui_label.show()
- gui_box.pack_start(gui_label,False, False, 10)
- gui_combo = gtk.combo_box_new_text()
- gui_names = ['lite', 'classic', 'gtk', 'text']
- for name in gui_names: gui_combo.append_text(name.capitalize())
- gui_combo.show()
- gui_box.pack_start(gui_combo,False, False, 10)
- gui_combo.set_active( gui_names.index( wallet.config.get("gui","lite")) )
- gui_box.show()
- add_help_button(gui_box, "Select which GUI mode to use at start up.")
-
- vbox.pack_start(gui_box, False,False, 5)
-
dialog.show()
r = dialog.run()
fee = fee_entry.get_text()
nz = nz_entry.get_text()
- gui = gui_names[ gui_combo.get_active()]
dialog.destroy()
if r==gtk.RESPONSE_CANCEL:
except:
show_message("error")
return
- wallet.set_fee(fee)
+ self.wallet.set_fee(fee)
try:
nz = int( nz )
except:
show_message("error")
return
- if wallet.num_zeros != nz:
- wallet.num_zeros = nz
- wallet.save()
- wallet.config.set_key('gui',gui,True)
+ if self.num_zeros != nz:
+ self.num_zeros = nz
+ self.config.set_key('num_zeros',nz,True)
+ self.update_history_tab()
def run_network_dialog( network, parent ):
image = gtk.Image()
image.set_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_DIALOG)
- interface = network.interface
if parent:
- if interface.is_connected:
- status = "Connected to %s:%d\n%d blocks"%(interface.host, interface.port, network.blockchain.height)
+ if network.is_connected():
+ interface = network.interface
+ status = "Connected to %s:%d\n%d blocks"%(interface.host, interface.port, network.blockchain.height())
else:
status = "Not connected"
else:
import random
status = "Please choose a server.\nSelect cancel if you are offline."
- server = interface.server
+ if network.is_connected():
+ server = interface.server
+ host, port, protocol = server.split(':')
+
servers = network.get_servers()
dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
host_box.pack_start(host_label, False, False, 10)
host_entry = gtk.Entry()
host_entry.set_size_request(200,-1)
- host_entry.set_text(server)
+ if network.is_connected():
+ host_entry.set_text(server)
+ else:
+ host_entry.set_text("Not Connected")
host_entry.show()
host_box.pack_start(host_entry, False, False, 10)
- add_help_button(host_box, 'The name and port number of your Electrum server, separated by a colon. Example: "ecdsa.org:50000". If no port number is provided, port 50000 will be tried. Some servers allow you to connect through http (port 80) or https (port 443)')
+ add_help_button(host_box, 'The name, port number and protocol of your Electrum server, separated by a colon. Example: "ecdsa.org:50002:s". Some servers allow you to connect through http (port 80) or https (port 443)')
host_box.show()
-
p_box = gtk.HBox(False, 10)
p_box.show()
p_label.show()
p_box.pack_start(p_label, False, False, 10)
- radio1 = gtk.RadioButton(None, "tcp")
- p_box.pack_start(radio1, True, True, 0)
- radio1.show()
- radio2 = gtk.RadioButton(radio1, "http")
- p_box.pack_start(radio2, True, True, 0)
- radio2.show()
+ combobox = gtk.combo_box_new_text()
+ combobox.show()
+ combobox.append_text("TCP")
+ combobox.append_text("SSL")
+ combobox.append_text("HTTP")
+ combobox.append_text("HTTPS")
+
+ p_box.pack_start(combobox, True, True, 0)
def current_line():
return unicode(host_entry.get_text()).split(':')
-
- def set_button(protocol):
- if protocol == 't':
- radio1.set_active(1)
- elif protocol == 'h':
- radio2.set_active(1)
+
+ def set_combobox(protocol):
+ combobox.set_active('tshg'.index(protocol))
def set_protocol(protocol):
host = current_line()[0]
pp = servers[host]
if protocol not in pp.keys():
protocol = pp.keys()[0]
- set_button(protocol)
+ set_combobox(protocol)
port = pp[protocol]
host_entry.set_text( host + ':' + port + ':' + protocol)
- radio1.connect("toggled", lambda x,y:set_protocol('t'), "radio button 1")
- radio2.connect("toggled", lambda x,y:set_protocol('h'), "radio button 1")
+ combobox.connect("changed", lambda x:set_protocol('tshg'[combobox.get_active()]))
+ if network.is_connected():
+ set_combobox(protocol)
server_list = gtk.ListStore(str)
for host in servers.keys():
treeview = gtk.TreeView(model=server_list)
treeview.show()
- if interface.servers:
- label = 'Active Servers'
- else:
- label = 'Default Servers'
-
+ label = 'Active Servers' if network.irc_servers else 'Default Servers'
tvcolumn = gtk.TreeViewColumn(label)
treeview.append_column(tvcolumn)
cell = gtk.CellRendererText()
tvcolumn.pack_start(cell, False)
tvcolumn.add_attribute(cell, 'text', 0)
- scroll = gtk.ScrolledWindow()
- scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- scroll.add(treeview)
- scroll.show()
-
vbox.pack_start(host_box, False,False, 5)
vbox.pack_start(p_box, True, True, 0)
- vbox.pack_start(scroll)
+
+ #scroll = gtk.ScrolledWindow()
+ #scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
+ #scroll.add_with_viewport(treeview)
+ #scroll.show()
+ #vbox.pack_start(scroll, True)
+ vbox.pack_start(treeview, True)
def my_treeview_cb(treeview):
path, view_column = treeview.get_cursor()
protocol = pp.keys()[0]
port = pp[protocol]
host_entry.set_text( host + ':' + port + ':' + protocol)
- set_button(protocol)
+ set_combobox(protocol)
treeview.connect('cursor-changed', my_treeview_cb)
- dialog.show()
+ dialog.show_all()
r = dialog.run()
server = host_entry.get_text()
dialog.destroy()
return False
try:
- interface.set_server(server)
+ host, port, protocol = server.split(':')
+ proxy = network.config.get('proxy')
+ auto_connect = network.config.get('auto_cycle')
+ network.set_parameters(host, port, protocol, proxy, auto_connect)
except:
show_message("error:" + server)
return False
- if parent:
- wallet.config.set_key("server", server, True)
- return True
+
return
try:
- seed = wallet.decode_seed(password)
+ wallet.get_seed(password)
except:
show_message("Incorrect password")
return
show_message("passwords do not match")
return
- wallet.update_password(seed, password, new_password)
+ wallet.update_password(password, new_password)
if icon:
if wallet.use_encryption:
self.wallet = wallet
self.network = network
self.funds_error = False # True if not enough funds
- self.num_zeros = int(self.config.get('num_zeros',0))
+ self.num_zeros = int(self.config.get('num_zeros',0))
self.window = MyWindow(gtk.WINDOW_TOPLEVEL)
title = 'Electrum ' + self.wallet.electrum_version + ' - ' + self.config.path
settings_icon.show()
prefs_button = gtk.Button()
- prefs_button.connect("clicked", lambda x: run_settings_dialog(self.wallet, self.window) )
+ prefs_button.connect("clicked", lambda x: run_settings_dialog(self) )
prefs_button.add(settings_icon)
prefs_button.set_tooltip_text("Settings")
prefs_button.set_relief(gtk.RELIEF_NONE)
cell.set_property('editable', True)
def edited_cb(cell, path, new_text, h_list):
tx = h_list.get_value( h_list.get_iter(path), 0)
- self.wallet.labels[tx] = new_text
- self.wallet.save()
+ self.wallet.set_label(tx,new_text)
self.update_history_tab()
cell.connect('edited', edited_cb, self.history_list)
def editing_started(cell, entry, path, h_list):
def create_recv_tab(self):
- self.recv_list = gtk.ListStore(str, str, str)
+ self.recv_list = gtk.ListStore(str, str, str, str)
self.add_tab( self.make_address_list(True), 'Receive')
self.update_receiving_tab()
cell.set_property('editable', True)
def edited_cb2(cell, path, new_text, liststore):
address = liststore.get_value( liststore.get_iter(path), 0)
- self.wallet.labels[address] = new_text
- self.wallet.save()
+ self.wallet.set_label(address, new_text)
self.update_receiving_tab()
self.update_sending_tab()
self.update_history_tab()
tvcolumn.pack_start(cell, True)
tvcolumn.add_attribute(cell, 'text', 2)
+ if is_recv:
+ tvcolumn = gtk.TreeViewColumn('Type')
+ treeview.append_column(tvcolumn)
+ cell = gtk.CellRendererText()
+ tvcolumn.pack_start(cell, True)
+ tvcolumn.add_attribute(cell, 'text', 3)
+
scroll = gtk.ScrolledWindow()
scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scroll.add(treeview)
if self.funds_error:
text = "Not enough funds"
elif interface and interface.is_connected:
- self.network_button.set_tooltip_text("Connected to %s:%d.\n%d blocks"%(interface.host, interface.port, self.network.blockchain.height))
+ self.network_button.set_tooltip_text("Connected to %s:%d.\n%d blocks"%(interface.host, interface.port, self.network.blockchain.height()))
if not self.wallet.up_to_date:
self.status_image.set_from_stock(gtk.STOCK_REFRESH, gtk.ICON_SIZE_MENU)
text = "Synchronizing..."
else:
self.status_image.set_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU)
- self.network_button.set_tooltip_text("Connected to %s:%d.\n%d blocks"%(interface.host, interface.port, self.network.blockchain.height))
+ self.network_button.set_tooltip_text("Connected to %s:%d.\n%d blocks"%(interface.host, interface.port, self.network.blockchain.height()))
c, u = self.wallet.get_balance()
text = "Balance: %s "%( format_satoshis(c,False,self.num_zeros) )
if u: text += "[%s unconfirmed]"%( format_satoshis(u,True,self.num_zeros).strip() )
def update_receiving_tab(self):
self.recv_list.clear()
for address in self.wallet.addresses(True):
- if self.wallet.is_change(address):continue
+ Type = "R"
+ if self.wallet.is_change(address): Type = "C"
+ if address in self.wallet.imported_keys.keys(): Type = "I"
label = self.wallet.labels.get(address)
h = self.wallet.history.get(address,[])
n = len(h)
- tx = "None" if n==0 else "%d"%n
- self.recv_list.append((address, label, tx ))
+ tx = "0" if n==0 else "%d"%n
+ self.recv_list.append((address, label, tx, Type ))
def update_sending_tab(self):
# detect addresses that are not mine in history, add them here...
git://git.novaco.in / electrum-nvc.git / blobdiff