This commit is contained in:
James 2019-02-28 22:38:35 +01:00
parent 65c6925e17
commit db7dd1e495
3 changed files with 8 additions and 8 deletions

View File

@ -1197,7 +1197,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
grid.addLayout(vbox_feecontrol, 5, 1, 1, -1)
if not self.config.get('show_fee', False):
if not self.config.get('show_fee', True):
self.fee_adv_controls.setVisible(False)
self.preview_button = EnterButton(_("Preview"), self.do_preview)
@ -2662,7 +2662,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
fee_widgets.append((fee_type_label, fee_type_combo))
feebox_cb = QCheckBox(_('Edit fees manually'))
feebox_cb.setChecked(self.config.get('show_fee', False))
feebox_cb.setChecked(self.config.get('show_fee', True))
feebox_cb.setToolTip(_("Show fee edit box in send tab."))
def on_feebox(x):
self.config.set_key('show_fee', x == Qt.Checked)

View File

@ -434,7 +434,7 @@ class SimpleConfig(PrintError):
return self.has_fee_etas()
def is_dynfee(self):
return bool(self.get('dynamic_fees', True))
return bool(self.get('dynamic_fees', False))
def use_mempool_fees(self):
return False

View File

@ -506,10 +506,10 @@ def time_difference(distance_in_time, include_seconds):
return "over %d years" % (round(distance_in_minutes / 525600))
mainnet_block_explorers = {
'blockexplorer.com': ('https://zclassic.blockexplorer.com/blocks/',
{'tx': 'transactions/', 'addr': 'addresses/'}),
'system default': ('blockchain:/',
{'tx': 'tx/', 'addr': 'address/'}),
'zclele.duckdns.org:3001': ('http://zclele.duckdns.org:3001',
{'tx': 'tx', 'addr': 'address'}),
'zclassic-ce.io': ('http://zclassic-ce.io',
{'tx': 'tx', 'addr': 'address'}),
}
testnet_block_explorers = {
@ -524,7 +524,7 @@ def block_explorer_info():
return testnet_block_explorers if constants.net.TESTNET else mainnet_block_explorers
def block_explorer(config):
return config.get('block_explorer', 'blockexplorer.com')
return config.get('block_explorer', 'zclassic-ce.io')
def block_explorer_tuple(config):
return block_explorer_info().get(block_explorer(config))