From 6f6cb935651d3efd597bc815e9e2f95ad62bd009 Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Tue, 13 Nov 2018 18:11:58 +0200
Subject: [PATCH] Moved actions and connections on tab "Blacklist" back to
 ui-file

---
 src/bitmessageqt/__init__.py  |   2 +-
 src/bitmessageqt/blacklist.py |  50 +---------------
 src/bitmessageqt/blacklist.ui | 110 +++++++++++++++++++++++++++++++++-
 3 files changed, 113 insertions(+), 49 deletions(-)

diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index d3567fcc..0a26433e 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -1180,7 +1180,7 @@ class MainWindow(Window):
             # FIXME: it's called very often
             self.retranslateUi()
             self.init_identities_popup_menu(False)
-            self.blackwhitelist.init_blacklist_popup_menu(False)
+            self.blackwhitelist.init_blacklist_popup_menu()
         if event.type() == QtCore.QEvent.WindowStateChange:
             if self.windowState() & QtCore.Qt.WindowMinimized:
                 if BMConfigParser().getboolean('bitmessagesettings', 'minimizetotray') and not 'darwin' in sys.platform:
diff --git a/src/bitmessageqt/blacklist.py b/src/bitmessageqt/blacklist.py
index 64413ebb..2212020d 100644
--- a/src/bitmessageqt/blacklist.py
+++ b/src/bitmessageqt/blacklist.py
@@ -1,6 +1,5 @@
 from PyQt4 import QtCore, QtGui
 from tr import _translate
-import l10n
 import widgets
 from addresses import addBMIfNotPresent
 from bmconfigparser import BMConfigParser
@@ -16,21 +15,11 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
         super(Blacklist, self).__init__(parent)
         widgets.load('blacklist.ui', self)
 
-        QtCore.QObject.connect(self.radioButtonBlacklist, QtCore.SIGNAL(
-            "clicked()"), self.click_radioButtonBlacklist)
-        QtCore.QObject.connect(self.radioButtonWhitelist, QtCore.SIGNAL(
-            "clicked()"), self.click_radioButtonWhitelist)
-        QtCore.QObject.connect(self.pushButtonAddBlacklist, QtCore.SIGNAL(
-        "clicked()"), self.click_pushButtonAddBlacklist)
-
+        self.blacklistContextMenuToolbar.setVisible(False)
         self.init_blacklist_popup_menu()
 
-        # Initialize blacklist
-        QtCore.QObject.connect(self.tableWidgetBlacklist, QtCore.SIGNAL(
-            "itemChanged(QTableWidgetItem *)"), self.tableWidgetBlacklistItemChanged)
-
         # Set the icon sizes for the identicons
-        identicon_size = 3*7
+        identicon_size = 3 * 7
         self.tableWidgetBlacklist.setIconSize(QtCore.QSize(identicon_size, identicon_size))
 
         self.UISignalThread = UISignaler.get()
@@ -41,16 +30,12 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
         if BMConfigParser().get('bitmessagesettings', 'blackwhitelist') == 'white':
             BMConfigParser().set('bitmessagesettings', 'blackwhitelist', 'black')
             BMConfigParser().save()
-            # self.tableWidgetBlacklist.clearContents()
-            self.tableWidgetBlacklist.setRowCount(0)
             self.rerenderBlackWhiteList()
 
     def click_radioButtonWhitelist(self):
         if BMConfigParser().get('bitmessagesettings', 'blackwhitelist') == 'black':
             BMConfigParser().set('bitmessagesettings', 'blackwhitelist', 'white')
             BMConfigParser().save()
-            # self.tableWidgetBlacklist.clearContents()
-            self.tableWidgetBlacklist.setRowCount(0)
             self.rerenderBlackWhiteList()
 
     def click_pushButtonAddBlacklist(self):
@@ -105,36 +90,8 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
                     sqlExecute('''UPDATE whitelist SET label=? WHERE address=?''',
                             str(item.text()), str(addressitem.text()))
 
-    def init_blacklist_popup_menu(self, connectSignal=True):
+    def init_blacklist_popup_menu(self):
         # Popup menu for the Blacklist page
-        self.blacklistContextMenuToolbar = QtGui.QToolBar()
-        # Actions
-        self.actionBlacklistNew = self.blacklistContextMenuToolbar.addAction(
-            _translate(
-                "MainWindow", "Add new entry"), self.on_action_BlacklistNew)
-        self.actionBlacklistDelete = self.blacklistContextMenuToolbar.addAction(
-            _translate(
-                "MainWindow", "Delete"), self.on_action_BlacklistDelete)
-        self.actionBlacklistClipboard = self.blacklistContextMenuToolbar.addAction(
-            _translate(
-                "MainWindow", "Copy address to clipboard"),
-            self.on_action_BlacklistClipboard)
-        self.actionBlacklistEnable = self.blacklistContextMenuToolbar.addAction(
-            _translate(
-                "MainWindow", "Enable"), self.on_action_BlacklistEnable)
-        self.actionBlacklistDisable = self.blacklistContextMenuToolbar.addAction(
-            _translate(
-                "MainWindow", "Disable"), self.on_action_BlacklistDisable)
-        self.actionBlacklistSetAvatar = self.blacklistContextMenuToolbar.addAction(
-            _translate(
-                "MainWindow", "Set avatar..."),
-            self.on_action_BlacklistSetAvatar)
-        self.tableWidgetBlacklist.setContextMenuPolicy(
-            QtCore.Qt.CustomContextMenu)
-        if connectSignal:
-            self.connect(self.tableWidgetBlacklist, QtCore.SIGNAL(
-                'customContextMenuRequested(const QPoint&)'),
-                        self.on_context_menuBlacklist)
         self.popMenuBlacklist = QtGui.QMenu(self)
         # self.popMenuBlacklist.addAction( self.actionBlacklistNew )
         self.popMenuBlacklist.addAction(self.actionBlacklistDelete)
@@ -239,4 +196,3 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
 
     def on_action_BlacklistSetAvatar(self):
         self.window().on_action_SetAvatar(self.tableWidgetBlacklist)
-
diff --git a/src/bitmessageqt/blacklist.ui b/src/bitmessageqt/blacklist.ui
index 80993fac..d0de5ef0 100644
--- a/src/bitmessageqt/blacklist.ui
+++ b/src/bitmessageqt/blacklist.ui
@@ -10,6 +10,44 @@
     <height>295</height>
    </rect>
   </property>
+  <widget class="QToolBar" name="blacklistContextMenuToolbar">
+    <action name="actionBlacklistNew">
+    <property name="text">
+     <string>Add new entry</string>
+    </property>
+    </action>
+    <action name="actionBlacklistDelete">
+    <property name="text">
+     <string>Delete</string>
+    </property>
+    </action>
+    <action name="actionBlacklistClipboard">
+    <property name="text">
+     <string>Copy address to clipboard</string>
+    </property>
+    </action>
+    <action name="actionBlacklistEnable">
+    <property name="text">
+     <string>Enable</string>
+    </property>
+    </action>
+    <action name="actionBlacklistDisable">
+    <property name="text">
+     <string>Disable</string>
+    </property>
+    </action>
+    <action name="actionBlacklistSetAvatar">
+    <property name="text">
+     <string>Set avatar...</string>
+    </property>
+    </action>
+    <addaction name="actionBlacklistNew"/>
+    <addaction name="actionBlacklistDelete"/>
+    <addaction name="actionBlacklistClipboard"/>
+    <addaction name="actionBlacklistEnable"/>
+    <addaction name="actionBlacklistDisable"/>
+    <addaction name="actionBlacklistSetAvatar"/>
+  </widget>
   <layout class="QGridLayout" name="gridLayout_6">
    <item row="0" column="0" colspan="2">
     <widget class="QRadioButton" name="radioButtonBlacklist">
@@ -62,6 +100,9 @@
      <property name="sortingEnabled">
       <bool>true</bool>
      </property>
+     <property name="contextMenuPolicy">
+       <enum>Qt::CustomContextMenu</enum>
+     </property>
      <attribute name="horizontalHeaderCascadingSectionResizes">
       <bool>true</bool>
      </attribute>
@@ -104,5 +145,72 @@
  <resources>
   <include location="bitmessage_icons.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>radioButtonBlacklist</sender>
+   <signal>clicked()</signal>
+   <receiver>blacklist</receiver>
+   <slot>click_radioButtonBlacklist</slot>
+  </connection>
+  <connection>
+   <sender>radioButtonWhitelist</sender>
+   <signal>clicked()</signal>
+   <receiver>blacklist</receiver>
+   <slot>click_radioButtonWhitelist</slot>
+  </connection>
+  <connection>
+   <sender>pushButtonAddBlacklist</sender>
+   <signal>clicked()</signal>
+   <receiver>blacklist</receiver>
+   <slot>click_pushButtonAddBlacklist</slot>
+  </connection>
+  <connection>
+   <sender>tableWidgetBlacklist</sender>
+   <signal>itemChanged(QTableWidgetItem)</signal>
+   <receiver>blacklist</receiver>
+   <slot>tableWidgetBlacklistItemChanged</slot>
+  </connection>
+  <connection>
+   <sender>actionBlacklistNew</sender>
+   <signal>triggered()</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_action_BlacklistNew</slot>
+  </connection>
+  <connection>
+   <sender>actionBlacklistDelete</sender>
+   <signal>triggered()</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_action_BlacklistDelete</slot>
+  </connection>
+  <connection>
+   <sender>actionBlacklistClipboard</sender>
+   <signal>triggered()</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_action_BlacklistClipboard</slot>
+  </connection>
+  <connection>
+   <sender>actionBlacklistEnable</sender>
+   <signal>triggered()</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_action_BlacklistEnable</slot>
+  </connection>
+  <connection>
+   <sender>actionBlacklistDisable</sender>
+   <signal>triggered()</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_action_BlacklistDisable</slot>
+  </connection>
+  <connection>
+   <sender>actionBlacklistSetAvatar</sender>
+   <signal>triggered()</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_action_BlacklistSetAvatar</slot>
+  </connection>
+  <connection>
+   <sender>tableWidgetBlacklist</sender>
+   <signal>customContextMenuRequested(QPoint)</signal>
+   <receiver>blacklist</receiver>
+   <slot>on_context_menuBlacklist</slot>
+  </connection>
+  </connections>
 </ui>