lightning post-rebase fixups

electrum/gui/kivy/uix/dialogs/lightning_channels.py

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

electrum/gui/qt/invoice_list.py

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

electrum/gui/qt/main_window.py

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

electrum/gui/qt/request_list.py

@@ -61,7 +61,7 @@ class RequestList(MyTreeView):
         Columns.AMOUNT: _('Amount'),
         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):
         super().__init__(parent, self.create_menu,