zebra.lucky
/
electrum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

config: migrate qt gui optional tabs to config vars

master
SomberNight 3 years ago
parent
dfa2b71bc3
commit
328a2bb3f2
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
2 changed files with 29 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      electrum/gui/qt/main_window.py
  2. 5
      electrum/simple_config.py

40
electrum/gui/qt/main_window.py
Unescape View File

@ -103,6 +103,7 @@ from .swap_dialog import SwapDialog, InvalidSwapParameters
from .balance_dialog import BalanceToolButton, COLOR_FROZEN, COLOR_UNMATURED, COLOR_UNCONFIRMED, COLOR_CONFIRMED, COLOR_LIGHTNING, COLOR_FROZEN_LIGHTNING from .balance_dialog import BalanceToolButton, COLOR_FROZEN, COLOR_UNMATURED, COLOR_UNCONFIRMED, COLOR_CONFIRMED, COLOR_LIGHTNING, COLOR_FROZEN_LIGHTNING
if TYPE_CHECKING: if TYPE_CHECKING:
from electrum.simple_config import ConfigVarWithConfig
from . import ElectrumGui from . import ElectrumGui
@ -173,8 +174,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
self.gui_thread = gui_object.gui_thread self.gui_thread = gui_object.gui_thread
assert wallet, "no wallet" assert wallet, "no wallet"
self.wallet = wallet self.wallet = wallet
if wallet.has_lightning(): if wallet.has_lightning() and not self.config.cv.GUI_QT_SHOW_TAB_CHANNELS.is_set():
self.wallet.config.set_key('show_channels_tab', True) self.config.GUI_QT_SHOW_TAB_CHANNELS = True # override default, but still allow disabling tab manually
Exception_Hook.maybe_setup(config=self.config, wallet=self.wallet) Exception_Hook.maybe_setup(config=self.config, wallet=self.wallet)
@ -216,19 +217,18 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
tabs.addTab(self.send_tab, read_QIcon("tab_send.png"), _('Send')) tabs.addTab(self.send_tab, read_QIcon("tab_send.png"), _('Send'))
tabs.addTab(self.receive_tab, read_QIcon("tab_receive.png"), _('Receive')) tabs.addTab(self.receive_tab, read_QIcon("tab_receive.png"), _('Receive'))
def add_optional_tab(tabs, tab, icon, description, name): def add_optional_tab(tabs, tab, icon, description):
tab.tab_icon = icon tab.tab_icon = icon
tab.tab_description = description tab.tab_description = description
tab.tab_pos = len(tabs) tab.tab_pos = len(tabs)
tab.tab_name = name if tab.is_shown_cv.get():
if self.config.get('show_{}_tab'.format(name), False):
tabs.addTab(tab, icon, description.replace("&", "")) tabs.addTab(tab, icon, description.replace("&", ""))
add_optional_tab(tabs, self.addresses_tab, read_QIcon("tab_addresses.png"), _("&Addresses"), "addresses") add_optional_tab(tabs, self.addresses_tab, read_QIcon("tab_addresses.png"), _("&Addresses"))
add_optional_tab(tabs, self.channels_tab, read_QIcon("lightning.png"), _("Channels"), "channels") add_optional_tab(tabs, self.channels_tab, read_QIcon("lightning.png"), _("Channels"))
add_optional_tab(tabs, self.utxo_tab, read_QIcon("tab_coins.png"), _("Co&ins"), "utxo") add_optional_tab(tabs, self.utxo_tab, read_QIcon("tab_coins.png"), _("Co&ins"))
add_optional_tab(tabs, self.contacts_tab, read_QIcon("tab_contacts.png"), _("Con&tacts"), "contacts") add_optional_tab(tabs, self.contacts_tab, read_QIcon("tab_contacts.png"), _("Con&tacts"))
add_optional_tab(tabs, self.console_tab, read_QIcon("tab_console.png"), _("Con&sole"), "console") add_optional_tab(tabs, self.console_tab, read_QIcon("tab_console.png"), _("Con&sole"))
tabs.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) tabs.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
@ -339,8 +339,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
self.address_list.refresh_all() self.address_list.refresh_all()
def toggle_tab(self, tab): def toggle_tab(self, tab):
show = not self.config.get('show_{}_tab'.format(tab.tab_name), False) show = not tab.is_shown_cv.get()
self.config.set_key('show_{}_tab'.format(tab.tab_name), show) tab.is_shown_cv.set(show)
if show: if show:
# Find out where to place the tab # Find out where to place the tab
index = len(self.tabs) index = len(self.tabs)
@ -698,7 +698,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
wallet_menu.addAction(_("Find"), self.toggle_search).setShortcut(QKeySequence("Ctrl+F")) wallet_menu.addAction(_("Find"), self.toggle_search).setShortcut(QKeySequence("Ctrl+F"))
def add_toggle_action(view_menu, tab): def add_toggle_action(view_menu, tab):
is_shown = self.config.get('show_{}_tab'.format(tab.tab_name), False) is_shown = tab.is_shown_cv.get()
tab.menu_action = view_menu.addAction(tab.tab_description, lambda: self.toggle_tab(tab)) tab.menu_action = view_menu.addAction(tab.tab_description, lambda: self.toggle_tab(tab))
tab.menu_action.setCheckable(True) tab.menu_action.setCheckable(True)
tab.menu_action.setChecked(is_shown) tab.menu_action.setChecked(is_shown)
@ -1026,7 +1026,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
def create_channels_tab(self): def create_channels_tab(self):
self.channels_list = ChannelsList(self) self.channels_list = ChannelsList(self)
return self.create_list_tab(self.channels_list) tab = self.create_list_tab(self.channels_list)
tab.is_shown_cv = self.config.cv.GUI_QT_SHOW_TAB_CHANNELS
return tab
def create_history_tab(self): def create_history_tab(self):
self.history_model = HistoryModel(self) self.history_model = HistoryModel(self)
@ -1351,17 +1353,22 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
from .address_list import AddressList from .address_list import AddressList
self.address_list = AddressList(self) self.address_list = AddressList(self)
tab = self.create_list_tab(self.address_list) tab = self.create_list_tab(self.address_list)
tab.is_shown_cv = self.config.cv.GUI_QT_SHOW_TAB_ADDRESSES
return tab return tab
def create_utxo_tab(self): def create_utxo_tab(self):
from .utxo_list import UTXOList from .utxo_list import UTXOList
self.utxo_list = UTXOList(self) self.utxo_list = UTXOList(self)
return self.create_list_tab(self.utxo_list) tab = self.create_list_tab(self.utxo_list)
tab.is_shown_cv = self.config.cv.GUI_QT_SHOW_TAB_UTXO
return tab
def create_contacts_tab(self): def create_contacts_tab(self):
from .contact_list import ContactList from .contact_list import ContactList
self.contact_list = l = ContactList(self) self.contact_list = l = ContactList(self)
return self.create_list_tab(l) tab = self.create_list_tab(l)
tab.is_shown_cv = self.config.cv.GUI_QT_SHOW_TAB_CONTACTS
return tab
def remove_address(self, addr): def remove_address(self, addr):
if not self.question(_("Do you want to remove {} from your wallet?").format(addr)): if not self.question(_("Do you want to remove {} from your wallet?").format(addr)):
@ -1489,6 +1496,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
def create_console_tab(self): def create_console_tab(self):
from .console import Console from .console import Console
self.console = console = Console() self.console = console = Console()
console.is_shown_cv = self.config.cv.GUI_QT_SHOW_TAB_CONSOLE
return console return console
def update_console(self): def update_console(self):

5
electrum/simple_config.py
Unescape View File

@ -911,6 +911,11 @@ class SimpleConfig(Logger):
GUI_QT_TX_EDITOR_SHOW_IO = ConfigVar('show_tx_io', default=False, type_=bool) GUI_QT_TX_EDITOR_SHOW_IO = ConfigVar('show_tx_io', default=False, type_=bool)
GUI_QT_TX_EDITOR_SHOW_FEE_DETAILS = ConfigVar('show_tx_fee_details', default=False, type_=bool) GUI_QT_TX_EDITOR_SHOW_FEE_DETAILS = ConfigVar('show_tx_fee_details', default=False, type_=bool)
GUI_QT_TX_EDITOR_SHOW_LOCKTIME = ConfigVar('show_tx_locktime', default=False, type_=bool) GUI_QT_TX_EDITOR_SHOW_LOCKTIME = ConfigVar('show_tx_locktime', default=False, type_=bool)
GUI_QT_SHOW_TAB_ADDRESSES = ConfigVar('show_addresses_tab', default=False, type_=bool)
GUI_QT_SHOW_TAB_CHANNELS = ConfigVar('show_channels_tab', default=False, type_=bool)
GUI_QT_SHOW_TAB_UTXO = ConfigVar('show_utxo_tab', default=False, type_=bool)
GUI_QT_SHOW_TAB_CONTACTS = ConfigVar('show_contacts_tab', default=False, type_=bool)
GUI_QT_SHOW_TAB_CONSOLE = ConfigVar('show_console_tab', default=False, type_=bool)
GUI_QML_PREFERRED_REQUEST_TYPE = ConfigVar('preferred_request_type', default='bolt11', type_=str) GUI_QML_PREFERRED_REQUEST_TYPE = ConfigVar('preferred_request_type', default='bolt11', type_=str)
GUI_QML_USER_KNOWS_PRESS_AND_HOLD = ConfigVar('user_knows_press_and_hold', default=False, type_=bool) GUI_QML_USER_KNOWS_PRESS_AND_HOLD = ConfigVar('user_knows_press_and_hold', default=False, type_=bool)

Write Preview
Loading…
Cancel
Save