From e9d0dd578a27219db612813f00ead541e457681e Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 12 Dec 2015 18:26:58 +0900 Subject: [PATCH] Put coin selection combo at bottom --- gui/qt/main_window.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index d3bd74bcb..dd90f7f70 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -2583,24 +2583,6 @@ class ElectrumWindow(QMainWindow, PrintError): nz.valueChanged.connect(on_nz) gui_widgets.append((nz_label, nz)) - def fmt_docs(key, klass): - lines = [ln.lstrip(" ") for ln in klass.__doc__.split("\n")] - return '\n'.join([key, "", " ".join(lines)]) - - choosers = sorted(COIN_CHOOSERS.keys()) - chooser_name = self.wallet.coin_chooser_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 COIN_CHOOSERS.items()) - chooser_label = HelpLabel(_('Coin selection') + ':', msg) - chooser_combo = QComboBox() - chooser_combo.addItems(choosers) - chooser_combo.setCurrentIndex(choosers.index(chooser_name)) - def on_chooser(x): - chooser_name = choosers[chooser_combo.currentIndex()] - self.config.set_key('coin_chooser', chooser_name) - chooser_combo.currentIndexChanged.connect(on_chooser) - tx_widgets.append((chooser_label, chooser_combo)) - msg = _('Fee per kilobyte of transaction.') + '\n' \ + _('If you enable dynamic fees, this parameter will be used as upper bound.') fee_label = HelpLabel(_('Transaction fee per kb') + ':', msg) @@ -2777,6 +2759,24 @@ class ElectrumWindow(QMainWindow, PrintError): can_edit_fees_cb.setToolTip(_('This option lets you edit fees in the send tab.')) tx_widgets.append((can_edit_fees_cb, None)) + def fmt_docs(key, klass): + lines = [ln.lstrip(" ") for ln in klass.__doc__.split("\n")] + return '\n'.join([key, "", " ".join(lines)]) + + choosers = sorted(COIN_CHOOSERS.keys()) + chooser_name = self.wallet.coin_chooser_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 COIN_CHOOSERS.items()) + chooser_label = HelpLabel(_('Coin selection') + ':', msg) + chooser_combo = QComboBox() + chooser_combo.addItems(choosers) + chooser_combo.setCurrentIndex(choosers.index(chooser_name)) + def on_chooser(x): + chooser_name = choosers[chooser_combo.currentIndex()] + self.config.set_key('coin_chooser', chooser_name) + chooser_combo.currentIndexChanged.connect(on_chooser) + tx_widgets.append((chooser_label, chooser_combo)) + tabs_info = [ (tx_widgets, _('Transactions')), (gui_widgets, _('Appearance')),