Revert commit 36f08ab2c3
.
This commit is contained in:
parent
36f08ab2c3
commit
ed42faa2e6
9
electrum
9
electrum
|
@ -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
|
||||
|
@ -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__':
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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'
|
||||
|
||||
|
|
Loading…
Reference in New Issue