Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f16e2bc
Update settings_dialog.py
silkyjohnson1 Feb 25, 2024
2319397
Update main_window.py
silkyjohnson1 Feb 25, 2024
0d03284
Update main_window.py
silkyjohnson1 Feb 25, 2024
f5640f5
Update settings_dialog.py
silkyjohnson1 Feb 25, 2024
2e2c265
Update settings_dialog.py
silkyjohnson1 Feb 25, 2024
f4fe18e
Update main_window.py
silkyjohnson1 Feb 25, 2024
4f0aa7c
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
7216085
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
7030b6a
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
d160eba
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
61c8e0a
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
2dbd548
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
958f7a4
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
596ae70
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
ef1baa6
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
c2f5e8b
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
0e9c15b
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
3f088cd
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
4781ea2
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
507e7ca
Update base_crash_reporter.py
silkyjohnson1 Feb 25, 2024
a7866df
Update simple_config.py
silkyjohnson1 Feb 25, 2024
54d0223
Update simple_config.py
silkyjohnson1 Feb 25, 2024
19ccee6
Update simple_config.py
silkyjohnson1 Feb 25, 2024
72477c1
Update simple_config.py
silkyjohnson1 Feb 25, 2024
96447b0
Update simple_config.py
silkyjohnson1 Feb 25, 2024
301b99a
Update __init__.py
silkyjohnson1 Feb 25, 2024
e9afd96
Update main_window.py
silkyjohnson1 Feb 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions electrum/gui/qt/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ def add_toggle_action(view_menu, tab):
tools_menu.addAction(_("&Network"), self.gui_object.show_network_dialog).setEnabled(bool(self.network))
if self.network and self.network.local_watchtower:
tools_menu.addAction(_("Local &Watchtower"), self.gui_object.show_watchtower_dialog)
tools_menu.addAction(_("&Plugins"), self.plugins_dialog)
# tools_menu.addAction(_("&Plugins"), self.plugins_dialog)
tools_menu.addSeparator()
tools_menu.addAction(_("&Sign/verify message"), self.sign_verify_message)
tools_menu.addAction(_("&Encrypt/decrypt message"), self.encrypt_message)
Expand All @@ -730,7 +730,7 @@ def add_toggle_action(view_menu, tab):
#help_menu.addAction(_("&Check for updates"), self.show_update_check)
help_menu.addAction(_("&Official website"), lambda: webopen("https://www.fact0rn.io/"))
help_menu.addSeparator()
#help_menu.addAction(_("&Documentation"), lambda: webopen("http://docs.electrum.org/")).setShortcut(QKeySequence.HelpContents)
#help_menu.addAction(_("&Documentation"), lambda: webopen("https://github.com/FACT0RN/FactWallet/releases")).setShortcut(QKeySequence.HelpContents)
#if not constants.net.TESTNET:
# help_menu.addAction(_("&Bitcoin Paper"), self.show_bitcoin_paper)
#help_menu.addAction(_("&Report Bug"), self.show_report_bug)
Expand Down
7 changes: 2 additions & 5 deletions electrum/gui/qt/settings_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,16 +303,13 @@ def on_history_rates(checked):
fiat_widgets.append((QLabel(_('Base currency')), ccy_combo))
fiat_widgets.append((QLabel(_('Source')), ex_combo))
fiat_widgets.append((self.history_rates_cb, None))
misc_widgets = []
misc_widgets.append((filelogging_cb, None))
misc_widgets.append((alias_label, self.alias_e))
misc_widgets.append((qr_label, qr_combo))


tabs_info = [
(gui_widgets, _('Appearance')),
(units_widgets, _('Units')),
(fiat_widgets, _('Fiat')),
(misc_widgets, _('Misc')),

]
for widgets, name in tabs_info:
tab = QWidget()
Expand Down
10 changes: 5 additions & 5 deletions electrum/plugins/payserver/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from electrum.i18n import _

fullname = _('PayServer')
description = 'run a HTTP server for receiving payments'
available_for = ['qt', 'cmdline']
#from electrum.i18n import _
#
#fullname = _('PayServer')
#description = 'run a HTTP server for receiving payments'
#available_for = ['qt', 'cmdline']
14 changes: 7 additions & 7 deletions electrum/simple_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ def _default_swapserver_url(self) -> str:
WALLET_UNCONF_UTXO_FREEZE_THRESHOLD_SAT = ConfigVar('unconf_utxo_freeze_threshold', default=5_000, type_=int)
WALLET_BIP21_LIGHTNING = ConfigVar(
'bip21_lightning', default=False, type_=bool,
short_desc=lambda: _('Add lightning requests to bitcoin URIs'),
short_desc=lambda: _('Add lightning requests to Fact0rn URIs'),
long_desc=lambda: _('This may result in large QR codes'),
)
WALLET_BOLT11_FALLBACK = ConfigVar(
Expand Down Expand Up @@ -1108,16 +1108,16 @@ def _default_swapserver_url(self) -> str:

BTC_AMOUNTS_PREC_POST_SAT = ConfigVar(
'amt_precision_post_satoshi', default=0, type_=int,
short_desc=lambda: _("Lightning precision (not supported)."),
short_desc=lambda: _("Lightning precision (not supported, do not use)."),
)

BTC_AMOUNTS_ADD_THOUSANDS_SEP = ConfigVar(
'amt_add_thousands_sep', default=False, type_=bool,
short_desc=lambda: _("Add thousand separators to bitcoin amounts"),
short_desc=lambda: _("Add thousand separators to Fact0rn amounts"),
)

BLOCK_EXPLORER = ConfigVar(
'block_explorer', default='Blockstream.info', type_=str,
'block_explorer', default='fact0rn.io', type_=str,
short_desc=lambda: _('Online Block Explorer'),
long_desc=lambda: _('Choose which online block explorer to use for functions that open a web browser'),
)
Expand Down Expand Up @@ -1194,9 +1194,9 @@ def _default_swapserver_url(self) -> str:
WATCHTOWER_SERVER_USER = ConfigVar('watchtower_user', default=None, type_=str)
WATCHTOWER_SERVER_PASSWORD = ConfigVar('watchtower_password', default=None, type_=str)

PAYSERVER_PORT = ConfigVar('payserver_port', default=8080, type_=int)
PAYSERVER_ROOT = ConfigVar('payserver_root', default='/r', type_=str)
PAYSERVER_ALLOW_CREATE_INVOICE = ConfigVar('payserver_allow_create_invoice', default=False, type_=bool)
#PAYSERVER_PORT = ConfigVar('payserver_port', default=8080, type_=int)
#PAYSERVER_ROOT = ConfigVar('payserver_root', default='/r', type_=str)
#PAYSERVER_ALLOW_CREATE_INVOICE = ConfigVar('payserver_allow_create_invoice', default=False, type_=bool)

PLUGIN_TRUSTEDCOIN_NUM_PREPAY = ConfigVar('trustedcoin_prepay', default=20, type_=int)

Expand Down