LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lightning post-rebase fixups

Browse source
This commit is contained in:
SomberNight 2019-02-11 22:23:30 +01:00 • committed by ThomasV
parent 3d8e168a85
commit 2976f50b8c
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum/gui/kivy/uix/dialogs/lightning_channels.py
View file

@ -94,7 +94,7 @@ Builder.load_string(r'''
class ChannelDetailsPopup(Popup): class ChannelDetailsPopup(Popup):
def __init__(self, data, **kwargs): def __init__(self, data, **kwargs):
super(ChanenlDetailsPopup,self).__init__(**kwargs) super(ChannelDetailsPopup,self).__init__(**kwargs)
self.data = data self.data = data
class LightningChannelsDialog(Factory.Popup): class LightningChannelsDialog(Factory.Popup):

12
electrum/gui/qt/invoice_list.py
View file

@ -36,7 +36,7 @@ from electrum.bitcoin import COIN
from electrum import constants from electrum import constants
from .util import (MyTreeView, read_QIcon, MONOSPACE_FONT, PR_UNPAID, from .util import (MyTreeView, read_QIcon, MONOSPACE_FONT, PR_UNPAID,
pr_tooltips, import_meta_gui, export_meta_gui, pr_icons) import_meta_gui, export_meta_gui, pr_icons)
class InvoiceList(MyTreeView): class InvoiceList(MyTreeView):
@ -99,15 +99,15 @@ class InvoiceList(MyTreeView):
date_str = format_time(lnaddr.date) date_str = format_time(lnaddr.date)
labels = [date_str, description, amount_str, pr_tooltips.get(status,'')] labels = [date_str, description, amount_str, pr_tooltips.get(status,'')]
items = [QStandardItem(e) for e in labels] items = [QStandardItem(e) for e in labels]
#items[0].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE) #items[self.Columns.DATE].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE)
#items[0].setData(key, ROLE_RHASH_OR_ADDR) #items[self.Columns.DATE].setData(key, ROLE_RHASH_OR_ADDR)
items[0].setIcon(read_QIcon('lightning.png')) items[self.Columns.DATE].setIcon(read_QIcon('lightning.png'))
items[3].setIcon(read_QIcon(pr_icons.get(status))) items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status)))
self.model().insertRow(self.model().rowCount(), items) self.model().insertRow(self.model().rowCount(), items)
self.selectionModel().select(self.model().index(0,0), QItemSelectionModel.SelectCurrent) self.selectionModel().select(self.model().index(0,0), QItemSelectionModel.SelectCurrent)
# sort requests by date # sort requests by date
self.model().sort(0) self.model().sort(self.Columns.DATE)
# hide list if empty # hide list if empty
if self.parent.isVisible(): if self.parent.isVisible():
b = self.model().rowCount() > 0 b = self.model().rowCount() > 0

1
electrum/gui/qt/main_window.py
View file

@ -86,6 +86,7 @@ from .util import (read_QIcon, ColorScheme, text_dialog, icon_path, WaitingDialo
CloseButton, HelpButton, MessageBoxMixin, EnterButton, expiration_values, CloseButton, HelpButton, MessageBoxMixin, EnterButton, expiration_values,
ButtonsLineEdit, CopyCloseButton, import_meta_gui, export_meta_gui, ButtonsLineEdit, CopyCloseButton, import_meta_gui, export_meta_gui,
filename_field, address_field, char_width_in_lineedit, webopen) filename_field, address_field, char_width_in_lineedit, webopen)
from .util import ButtonsTextEdit
from .installwizard import WIF_HELP_TEXT from .installwizard import WIF_HELP_TEXT
from .history_list import HistoryList, HistoryModel from .history_list import HistoryList, HistoryModel
from .update_checker import UpdateCheck, UpdateCheckThread from .update_checker import UpdateCheck, UpdateCheckThread

2
electrum/gui/qt/request_list.py
View file

@ -61,7 +61,7 @@ class RequestList(MyTreeView):
Columns.AMOUNT: _('Amount'), Columns.AMOUNT: _('Amount'),
Columns.STATUS: _('Status'), Columns.STATUS: _('Status'),
} }
filter_columns = [Columns.DATE, Columns.ADDRESS, Columns.SIGNATURE, Columns.DESCRIPTION, Columns.AMOUNT] filter_columns = [Columns.DATE, Columns.DESCRIPTION, Columns.AMOUNT]
def __init__(self, parent): def __init__(self, parent):
super().__init__(parent, self.create_menu, super().__init__(parent, self.create_menu,