AaronFiore/electrum
1
0
Fork 0
Code Activity

remove dead code

Browse Source
This commit is contained in:
ThomasV
2011-12-19 12:35:39 +01:00
parent 9580562677
commit a7aa613b58
1 changed files with 48 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
client/gui.py
View File

@@ -820,8 +820,8 @@ class BitcoinGUI:
hbox = gtk.HBox() hbox = gtk.HBox()
if not is_recv: if not is_recv:
button = gtk.Button("New address") button = gtk.Button("New")
button.connect("clicked", self.newaddress_dialog, is_recv) button.connect("clicked", self.newaddress_dialog)
button.show() button.show()
hbox.pack_start(button,False) hbox.pack_start(button,False)
@@ -967,76 +967,56 @@ class BitcoinGUI:
def newaddress_dialog(self, w, is_recv): def newaddress_dialog(self, w):
if not is_recv: title = "New sending address"
dialog = gtk.Dialog(title, parent=self.window,
flags=gtk.DIALOG_MODAL|gtk.DIALOG_NO_SEPARATOR,
buttons= ("cancel", 0, "ok",1) )
dialog.show()
title = "New sending address" label = gtk.HBox()
dialog = gtk.Dialog(title, parent=self.window, label_label = gtk.Label('Label:')
flags=gtk.DIALOG_MODAL|gtk.DIALOG_NO_SEPARATOR, label_label.set_size_request(120,10)
buttons= ("cancel", 0, "ok",1) ) label_label.show()
dialog.show() label.pack_start(label_label)
label_entry = gtk.Entry()
label_entry.show()
label.pack_start(label_entry)
label.show()
dialog.vbox.pack_start(label, False, True, 5)
label = gtk.HBox() address = gtk.HBox()
label_label = gtk.Label('Label:') address_label = gtk.Label('Address:')
label_label.set_size_request(120,10) address_label.set_size_request(120,10)
label_label.show() address_label.show()
label.pack_start(label_label) address.pack_start(address_label)
label_entry = gtk.Entry() address_entry = gtk.Entry()
label_entry.show() address_entry.show()
label.pack_start(label_entry) address.pack_start(address_entry)
label.show() address.show()
dialog.vbox.pack_start(label, False, True, 5) dialog.vbox.pack_start(address, False, True, 5)
result = dialog.run()
address = address_entry.get_text()
label = label_entry.get_text()
dialog.destroy()
address = gtk.HBox() if result == 1:
address_label = gtk.Label('Address:') if self.wallet.is_valid(address):
address_label.set_size_request(120,10) self.wallet.addressbook.append(address)
address_label.show() if label: self.wallet.labels[address] = label
address.pack_start(address_label) self.wallet.save()
address_entry = gtk.Entry() self.update_sending_tab()
address_entry.show() else:
address.pack_start(address_entry) errorDialog = gtk.MessageDialog(
address.show() parent=self.window,
dialog.vbox.pack_start(address, False, True, 5) flags=gtk.DIALOG_MODAL,
buttons= gtk.BUTTONS_CLOSE,
result = dialog.run() message_format = "Invalid address")
address = address_entry.get_text() errorDialog.show()
label = label_entry.get_text() errorDialog.run()
dialog.destroy() errorDialog.destroy()
if result == 1:
if self.wallet.is_valid(address):
self.wallet.addressbook.append(address)
if label: self.wallet.labels[address] = label
self.wallet.save()
self.update_sending_tab()
else:
errorDialog = gtk.MessageDialog(
parent=self.window,
flags=gtk.DIALOG_MODAL,
buttons= gtk.BUTTONS_CLOSE,
message_format = "Invalid address")
errorDialog.show()
errorDialog.run()
errorDialog.destroy()
else:
success, ret = self.wallet.get_new_address()
self.update_session = True # we created a new address
if success:
address = ret
#if label: self.wallet.labels[address] = label
self.wallet.save()
self.update_receiving_tab()
else:
msg = ret
errorDialog = gtk.MessageDialog(
parent=self.window,
flags=gtk.DIALOG_MODAL,
buttons= gtk.BUTTONS_CLOSE,
message_format = msg)
errorDialog.show()
errorDialog.run()
errorDialog.destroy()
def network_dialog( self, w ): def network_dialog( self, w ):