Merge pull request #47 from wilsonmeier/master

Revert "Removed hw wallet disable property"

lib/base_wizard.py

@@ -53,6 +53,7 @@ def __init__(self, config, storage):
         self.keystores = []
         self.is_kivy = config.get('gui') == 'kivy'
         self.seed_type = None
+        self.hw_wallet_enabled = False
 
     def run(self, *args):
         action = args[0]
@@ -132,15 +133,15 @@ def choose_keystore(self):
                 ('restore_from_seed', _('I already have a seed')),
                 ('restore_from_key', _('Use a master key')),
             ]
-            if not self.is_kivy:
+            if self.hw_wallet_enabled and not self.is_kivy:
                 choices.append(('choose_hw_device',  _('Use a hardware device')))
         else:
             message = _('Add a cosigner to your multi-sig wallet')
             choices = [
                 ('restore_from_key', _('Enter cosigner key')),
                 ('restore_from_seed', _('Enter cosigner seed')),
             ]
-            if not self.is_kivy:
+            if self.hw_wallet_enabled and not self.is_kivy:
                 choices.append(('choose_hw_device',  _('Cosign with hardware device')))
 
         self.choice_dialog(title=title, message=message, choices=choices, run_next=self.run)