Merge branch 'startup-gui-option' into merged

diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index 93809a0..972b28c 100644 (file)
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -39,6 +39,7 @@ except:
 from wallet import format_satoshis
 from simple_config import SimpleConfig
 import bmp, mnemonic, pyqrnative, qrscanner
+from simple_config import SimpleConfig
 
 from decimal import Decimal
 
@@ -1242,6 +1243,13 @@ class ElectrumWindow(QMainWindow):
             grid.addWidget(HelpButton(msg), 6, 2)
             gap_e.textChanged.connect(lambda: numbify(nz_e,True))
 
+            gui = QComboBox()
+            gui.addItems(['Lite', 'Qt'])
+            cfg = SimpleConfig()
+            gui.setCurrentIndex(gui.findText(cfg.config["gui"].capitalize()))
+            grid.addWidget(QLabel(_('Default GUI') + ':'), 7, 0)
+            grid.addWidget(gui, 7, 1)
+            grid.addWidget(HelpButton(_('Select which GUI mode to use at start up. ')), 7, 2)
         
         vbox.addLayout(ok_cancel_buttons(d))
         d.setLayout(vbox) 
@@ -1289,6 +1297,10 @@ class ElectrumWindow(QMainWindow):
                     self.update_receive_tab()
                 else:
                     QMessageBox.warning(self, _('Error'), _('Invalid value'), _('OK'))
+                    
+            cfg = SimpleConfig()
+            cfg.config["gui"] = str(gui.currentText()).lower()
+            cfg.save_config()
 
         self.set_expert_mode(cb.isChecked())