tRevert commit 36f08ab2c3f4da39355b23dc2eba112b327302e8. - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ed42faa2e62eb2a315eeb791f8d7ffbdbeb53d47
DIR parent 36f08ab2c3f4da39355b23dc2eba112b327302e8
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 8 Mar 2017 11:22:27 +0100
Revert commit 36f08ab2c3f4da39355b23dc2eba112b327302e8.
Diffstat:
M electrum | 9 ++-------
M gui/qt/main_window.py | 2 +-
M lib/qrscanner.py | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -90,16 +90,11 @@ if not is_android:
check_imports()
# load local module as electrum
-if is_local or is_android:
+if is_bundle or is_local or is_android:
import imp
imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui'))
-# for pyinstaller
-import electrum
-import electrum_gui
-import electrum_plugins
-
from electrum import bitcoin, network
from electrum import SimpleConfig, Network
from electrum.wallet import Wallet, Imported_Wallet
t@@ -298,7 +293,7 @@ def run_offline_command(config, config_options):
def init_plugins(config, gui_name):
from electrum.plugins import Plugins
- return Plugins(config, is_local or is_android, gui_name)
+ return Plugins(config, is_bundle or is_local or is_android, gui_name)
if __name__ == '__main__':
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -2586,7 +2586,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
choosers = sorted(coinchooser.COIN_CHOOSERS.keys())
chooser_name = coinchooser.get_name(self.config)
msg = _('Choose coin (UTXO) selection method. The following are available:\n\n')
- #msg += '\n\n'.join(fmt_docs(*item) for item in coinchooser.COIN_CHOOSERS.items())
+ msg += '\n\n'.join(fmt_docs(*item) for item in coinchooser.COIN_CHOOSERS.items())
chooser_label = HelpLabel(_('Coin selection') + ':', msg)
chooser_combo = QComboBox()
chooser_combo.addItems(choosers)
DIR diff --git a/lib/qrscanner.py b/lib/qrscanner.py
t@@ -30,7 +30,7 @@ from ctypes import cdll, c_char_p
if sys.platform == 'darwin':
name = 'libzbar.dylib'
elif sys.platform == 'windows':
- name = 'libzbar-0.dll'
+ name = 'libzbar.dll'
else:
name = 'libzbar.so.0'