lightning: post-rebase fixes, read_QIcon and invalid import

electrum/gui/qt/__init__.py

@@ -51,9 +51,6 @@ from electrum.wallet import Wallet, Abstract_Wallet
 from electrum.logging import Logger
 
 from .installwizard import InstallWizard, WalletAlreadyOpenInMemory
-
-from electrum.lightning import LightningUI
-
 from .util import get_default_language, read_QIcon, ColorScheme, custom_message_box
 from .main_window import ElectrumWindow
 from .network_dialog import NetworkDialog

electrum/gui/qt/invoice_list.py

@@ -100,8 +100,8 @@ class InvoiceList(MyTreeView):
             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(self.icon_cache.get(':icons/lightning.png'))
+            items[0].setIcon(read_QIcon('lightning.png'))
-            items[3].setIcon(self.icon_cache.get(pr_icons.get(status)))
+            items[3].setIcon(read_QIcon(pr_icons.get(status)))
             self.model().insertRow(self.model().rowCount(), items)
 
         self.selectionModel().select(self.model().index(0,0), QItemSelectionModel.SelectCurrent)

electrum/gui/qt/main_window.py

@@ -177,9 +177,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
         self.console_tab = self.create_console_tab()
         self.contacts_tab = self.create_contacts_tab()
         self.channels_tab = self.create_channels_tab(wallet)
-        tabs.addTab(self.create_history_tab(), QIcon(":icons/tab_history.png"), _('History'))
+        tabs.addTab(self.create_history_tab(), read_QIcon("tab_history.png"), _('History'))
-        tabs.addTab(self.send_tab, QIcon(":icons/tab_send.png"), _('Send'))
+        tabs.addTab(self.send_tab, read_QIcon("tab_send.png"), _('Send'))
-        tabs.addTab(self.receive_tab, QIcon(":icons/tab_receive.png"), _('Receive'))
+        tabs.addTab(self.receive_tab, read_QIcon("tab_receive.png"), _('Receive'))
 
         def add_optional_tab(tabs, tab, icon, description, name):
             tab.tab_icon = icon

electrum/gui/qt/request_list.py

@@ -39,7 +39,7 @@ from electrum.bitcoin import COIN
 from electrum.lnaddr import lndecode
 import electrum.constants as constants
 
-from .util import MyTreeView, pr_tooltips, pr_icons, read_QIcon
+from .util import MyTreeView, pr_icons, read_QIcon
 
 REQUEST_TYPE_BITCOIN = 0
 REQUEST_TYPE_LN = 1
@@ -149,10 +149,10 @@ class RequestList(MyTreeView):
             date = format_time(lnaddr.date)
             labels = [date, description, amount_str, pr_tooltips.get(status,'')]
             items = [QStandardItem(e) for e in labels]
-            items[self.Columns.DATE].setIcon(self.icon_cache.get(":icons/lightning.png"))
+            items[self.Columns.DATE].setIcon(read_QIcon("lightning.png"))
             items[self.Columns.DATE].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE)
             items[self.Columns.DATE].setData(key, ROLE_RHASH_OR_ADDR)
-            items[self.Columns.STATUS].setIcon(self.icon_cache.get(pr_icons.get(status)))
+            items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status)))
             self.model().insertRow(self.model().rowCount(), items)
         # sort requests by date
         self.model().sort(self.Columns.DATE)