AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of git://github.com/spesmilo/electrum

Browse Source
This commit is contained in:
ecdsa
2013-04-01 12:12:29 +02:00
parent 5cc05b0685 dd630a8bb7
commit 2b61c8e0cc
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.fil
View File

@@ -2,3 +2,8 @@ gui/gui_gtk.py
gui/gui_classic.py gui/gui_classic.py
gui/gui_lite.py gui/gui_lite.py
gui/history_widget.py gui/history_widget.py
plugins/aliases.py
plugins/pointofsale.py
plugins/labels.py
plugins/qrscanner.py
plugins/virtualkeyboard.py

2
gui/gui_lite.py
View File

@@ -912,7 +912,7 @@ class MiniActuator:
def copy_master_public_key(self): def copy_master_public_key(self):
master_pubkey = self.wallet.master_public_key master_pubkey = self.wallet.get_master_public_key()
qApp.clipboard().setText(master_pubkey) qApp.clipboard().setText(master_pubkey)
QMessageBox.information(None, _("Copy successful"), _("Your master public key has been copied to your clipboard.")) QMessageBox.information(None, _("Copy successful"), _("Your master public key has been copied to your clipboard."))

2
lib/version.py
View File

@@ -1,4 +1,4 @@
ELECTRUM_VERSION = "1.7.2" # version of the client package ELECTRUM_VERSION = "1.7.2" # version of the client package
PROTOCOL_VERSION = '0.6' # protocol version requested PROTOCOL_VERSION = '0.6' # protocol version requested
SEED_VERSION = 4 # bump this every time the seed generation is modified SEED_VERSION = 4 # bump this every time the seed generation is modified
TRANSLATION_ID = 3992 # version of the wiki page TRANSLATION_ID = 4012 # version of the wiki page

2
plugins/qrscanner.py
View File

@@ -12,7 +12,7 @@ from electrum_gui import BasePlugin
class Plugin(BasePlugin): class Plugin(BasePlugin):
def __init__(self, gui): def __init__(self, gui):
BasePlugin.__init__(self, gui, 'qrscans', 'QR scans', "QR Scans.\nInstall the zbar package to enable this plugin") BasePlugin.__init__(self, gui, 'qrscans', 'QR scans', "QR Scans.\nInstall the zbar package (http://zbar.sourceforge.net/download.html) to enable this plugin")
self._is_available = self._init() self._is_available = self._init()
def _init(self): def _init(self):