fix signal-slot connections

Author: random-zebra

src/mainWindow.py

@@ -6,7 +6,7 @@
 import threading
 import sys
 
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QThread, QSettings
+from PyQt5.QtCore import pyqtSignal, Qt, QThread, QSettings
 from PyQt5.QtGui import QPixmap, QColor, QPalette, QTextCursor, QIcon, QFont
 from PyQt5.QtWidgets import QWidget, QPushButton, QHBoxLayout, QGroupBox, QVBoxLayout, \
     QFileDialog, QMessageBox, QTextEdit, QTabWidget, QLabel, QSplitter
@@ -135,8 +135,10 @@ def __init__(self, parent, masternode_list, imgDir):
 
         ###-- Set Layout
         self.setLayout(self.layout)
+        
         ###-- Init Settings
         self.initSettings()
+        
         ###-- Connect buttons/signals
         self.connButtons()
 
@@ -155,15 +157,13 @@ def __init__(self, parent, masternode_list, imgDir):
 
 
 
-        
-    @pyqtSlot(str)    
+  
     def append_to_console(self, text):
         self.consoleArea.moveCursor(QTextCursor.End)
         self.consoleArea.insertHtml(text)
 
 
 
-    @pyqtSlot(str)
     def clearHWstatus(self, message):
         self.hwStatus = 1
         self.hwStatusMess = 'Unable to connect to the device. Please check that the PIVX app on the device is open, and try again.'
@@ -173,7 +173,7 @@ def clearHWstatus(self, message):
 
 
 
-    @pyqtSlot()
+
     def clearRPCstatus(self):
         self.rpcConnected = False
         self.header.lastPingBox.setHidden(False)
@@ -194,13 +194,9 @@ def connButtons(self):
         self.sig_clearRPCstatus.connect(self.clearRPCstatus)
         self.sig_RPCstatusUpdated.connect(self.showRPCstatus)
         self.parent.sig_changed_rpcServers.connect(self.updateRPClist)
-        self.hwdevice.sig_ledger_disconnected.connect(self.clearHWstatus)
-        self.hwdevice.sigTxdone.connect(self.t_rewards.FinishSend)
-        self.hwdevice.sigTxabort.connect(self.t_rewards.onCancel)
-        self.hwdevice.tx_progress.connect(self.t_rewards.updateProgressPercent)
+        self.hwdevice.sig_ledger_disconnected.connect(self.clearHWstatus)        
         self.tabMain.myList.model().rowsMoved.connect(self.saveMNListOrder)
-        self.sig_UTXOsLoaded.connect(self.t_rewards.display_mn_utxos)
-        self.sig_ProposalsLoaded.connect(self.t_governance.displayProposals)
+
 
 
 
@@ -326,8 +322,7 @@ def loadMNConf(self, fileName):
 
 
 
-    
-    @pyqtSlot()        
+            
     def onCheckHw(self):
         printDbg("Checking for HW device...")
         self.updateHWstatus(None)
@@ -336,13 +331,12 @@ def onCheckHw(self):
 
 
 
-    @pyqtSlot()
     def onCheckRpc(self):
         self.runInThread(self.updateRPCstatus, (True,),) 
 
 
 
-    @pyqtSlot()
+
     def onCheckVersion(self):
         printDbg("Checking SPMT version...")
         self.versionLabel.setText("--")      
@@ -370,7 +364,7 @@ def updateVersion(self):
 
 
 
-    @pyqtSlot(int)
+
     def onChangeSelectedRPC(self, i):
         # Don't update when we are clearing the box
         if not self.updatingRPCbox:
@@ -382,14 +376,14 @@ def onChangeSelectedRPC(self, i):
 
 
 
-    @pyqtSlot()
+
     def onCleanConsole(self):
         self.consoleArea.clear()
 
 
 
 
-    @pyqtSlot()
+
     def onSaveConsole(self):
         timestamp = strftime('%Y-%m-%d_%H-%M-%S', gmtime(now()))
         options = QFileDialog.Options()
@@ -410,22 +404,26 @@ def onSaveConsole(self):
 
 
 
-    @pyqtSlot()
+
     def onTabChange(self):
         # tabRewards
         if self.tabs.currentWidget() == self.tabRewards:
             # reload last used address
-            self.tabRewards.destinationLine.setText(self.parent.cache.get("lastAddress"))          
+            self.tabRewards.destinationLine.setText(self.parent.cache.get("lastAddress"))
+            # show UTXOs from DB
+            self.t_rewards.display_mn_utxos()           
 
         # tabGovernace
         if self.tabs.currentWidget() == self.tabGovernance:
             # update selectedMNlabel (since we might have edited them)
             self.t_governance.updateSelectedMNlabel()
+            # show proposals from DB
+            self.t_governance.displayProposals()
 
 
 
 
-    @pyqtSlot()
+
     def onToggleConsole(self):
         if self.btn_consoleToggle.text() == 'Hide':
             self.btn_consoleToggle.setText('Show')
@@ -462,7 +460,8 @@ def showHWstatus(self):
 
 
 
-    @pyqtSlot(int, bool)
+
+
     def showRPCstatus(self, server_index, fDebug):
         # Update displayed status only if selected server is not changed
         if server_index == self.header.rpcClientsBox.currentIndex():
@@ -557,7 +556,7 @@ def updateRPCled(self, fDebug=False):
 
 
 
-    #@pyqtSlot()   
+  
     def updateRPClist(self):
         # Clear old stuff
         self.updatingRPCbox = True

src/masternode.py

@@ -6,7 +6,7 @@
 import time
 
 from PyQt5.Qt import QObject
-from PyQt5.QtCore import pyqtSlot, pyqtSignal
+from PyQt5.QtCore import pyqtSignal
 
 from constants import MPATH
 from misc import printOK, printDbg, printException, getCallerName, getFunctionName, ipport

src/misc.py

@@ -100,31 +100,34 @@ def checkRPCstring(urlstring, action_msg="Malformed credentials"):
 
 
 
-def clean_v4_migration(db):
-    try:
-        rpc_file = os.path.join(user_dir, 'rpcServer.json')
-        cache_file = os.path.join(user_dir, 'cache.json')
-        mn_file = os.path.join(user_dir, 'masternodes.json')
-        
-        if os.path.exists(rpc_file) or os.path.exists(cache_file) or os.path.exists(mn_file):
-            printDbg("Clean migration to v0.4.0 data storage")
-        
-        if os.path.exists(rpc_file):
-            # If RPC file exists
-            printDbg("found old rpcServer.json file")
+def clean_v4_migration(wnd):
+    rpc_file = os.path.join(user_dir, 'rpcServer.json')
+    cache_file = os.path.join(user_dir, 'cache.json')
+    mn_file = os.path.join(user_dir, 'masternodes.json')
+    messTitle = "Clean migration to v0.4.0 data storage"
+    
+    if os.path.exists(rpc_file) or os.path.exists(cache_file) or os.path.exists(mn_file):
+        printDbg(messTitle)
+    
+    if os.path.exists(rpc_file):
+        # If RPC file exists
+        try:
             with open(rpc_file) as data_file:
                 rpc_config = json.load(data_file)
             # copy to database
             rpc_host = "%s:%d" % (rpc_config['rpc_ip'], rpc_config['rpc_port'])
-            db.editRPCServer("http", rpc_host, rpc_config['rpc_user'], rpc_config['rpc_password'], 0)
+            wnd.db.editRPCServer("http", rpc_host, rpc_config['rpc_user'], rpc_config['rpc_password'], 0)
             printDbg("...saved to Database")
             # and delete old file
             os.remove(rpc_file)
             printDbg("old rpcServer.json file deleted")
-        
-        if os.path.exists(cache_file):
-            # If cache file exists
-            printDbg("found old cache.json file")
+        except Exception as e:
+            mess = "Error importing old rpc_config file"
+            printException(getCallerName(), getFunctionName(), mess, e)
+    
+    if os.path.exists(cache_file):
+        # If cache file exists
+        try:
             with open(cache_file) as data_file:
                 cache = json.load(data_file)
             # copy to Settings
@@ -133,23 +136,25 @@ def clean_v4_migration(db):
             # and delete old file
             os.remove(cache_file)
             printDbg("old cache.json file deleted")
-        
-        if os.path.exists(mn_file):
-            # If mn file exists
-            printDbg("found old masternodes.json file")
+        except Exception as e:
+            mess = "Error importing old cache file"
+            printException(getCallerName(), getFunctionName(), mess, e)
+    
+    if os.path.exists(mn_file):
+        # If mn file exists
+        try:
             with open(mn_file) as data_file:
                 mnList = json.load(data_file)
             # add to database
             for mn in mnList:
-                db.addMasternode(mn)
+                wnd.db.addMasternode(mn)
             printDbg("...saved to Database")
             # and delete old file
             os.remove(mn_file)
-            printDbg("old masternodes.json file deleted")    
-        
-    except Exception as e:
-        printDbg(e)
-        
+            printDbg("old masternodes.json file deleted")   
+        except Exception as e:
+            mess = "Error importing old masternodes_config file"
+            printException(getCallerName(), getFunctionName(), mess, e)    
 
 
 
@@ -442,24 +447,22 @@ def removeMNfromList(mainWnd, mn, removeFromDB=True):
 def saveCacheSettings(cache, old_version=False):
     settings = QSettings('PIVX', 'SecurePivxMasternodeTool')
     settings.setValue('cache_lastAddress', cache.get('lastAddress'))
-    settings.setValue('cache_winWidth', cache.get('window_width'))
-    settings.setValue('cache_winHeight', cache.get('window_height'))
-    if old_version:
-        settings.setValue('cache_splitterX', cache.get('splitter_sizes')[0])
-        settings.setValue('cache_splitterY', cache.get('splitter_sizes')[1])
-    else:
-        settings.setValue('cache_splitterX', cache.get('splitter_x'))
-        settings.setValue('cache_splitterY', cache.get('splitter_y'))
-    settings.setValue('cache_mnOrder', json.dumps(cache.get('mnList_order')))
-    settings.setValue('cache_consoleHidden', cache.get('console_hidden'))   
     settings.setValue('cache_useSwiftX', cache.get('useSwiftX'))
-    settings.setValue('cache_votingMNs', json.dumps(cache.get('votingMasternodes')))
     settings.setValue('cache_vdCheck', cache.get('votingDelayCheck'))
     settings.setValue('cache_vdNeg', cache.get('votingDelayNeg'))
     settings.setValue('cache_vdPos', cache.get('votingDelayPos'))
-    if not old_version:
-        settings.setValue('cache_RPCindex', cache.get('selectedRPC_index'))
-        settings.setValue('cache_MNcount', cache.get('MN_count'))
+    # that's enough for clean_v4_migration
+    if old_version:
+        return
+    settings.setValue('cache_winWidth', cache.get('window_width'))
+    settings.setValue('cache_winHeight', cache.get('window_height'))
+    settings.setValue('cache_splitterX', cache.get('splitter_x'))
+    settings.setValue('cache_splitterY', cache.get('splitter_y'))
+    settings.setValue('cache_mnOrder', json.dumps(cache.get('mnList_order')))
+    settings.setValue('cache_consoleHidden', cache.get('console_hidden'))    
+    settings.setValue('cache_votingMNs', json.dumps(cache.get('votingMasternodes'))) 
+    settings.setValue('cache_RPCindex', cache.get('selectedRPC_index'))
+    settings.setValue('cache_MNcount', cache.get('MN_count'))
 
 
 

src/qt/dlg_budgetProjection.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from PyQt5.QtCore import Qt, pyqtSlot
+from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDialog, QVBoxLayout, QTableWidget, QAbstractItemView, QHeaderView, \
     QTableWidgetItem, QPushButton, QLabel, QGroupBox, QHBoxLayout, QFormLayout
 

src/qt/dlg_configureRPCservers.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QDialog, QHBoxLayout, QVBoxLayout, QLabel,\
     QListWidget, QFrame, QFormLayout, QComboBox, QLineEdit, QListWidgetItem,\
     QWidget, QPushButton, QMessageBox
@@ -94,7 +93,7 @@ def loadEditFrame(self, index):
         self.ui.host_edt.setText(server['host'])
 
 
-    @pyqtSlot(int)
+
     def onAddServer(self, index=None):
         # Save current index (None for new entry)
         self.changing_index = index
@@ -112,7 +111,7 @@ def onAddServer(self, index=None):
             self.loadEditFrame(index)
 
 
-    @pyqtSlot()
+
     def onCancel(self):
         # Show 'Add' and 'Close' buttons and enable serversBox
         self.ui.addServer_btn.show()
@@ -124,13 +123,13 @@ def onCancel(self):
         self.clearEditFrame()
 
 
-    @pyqtSlot()
+
     def onClose(self):
         # close dialog
         self.close()
 
 
-    @pyqtSlot(int)
+
     def onRemoveServer(self, index):
         mess = "Are you sure you want to remove server with index %d (%s) from list?" % (
             index, self.main_wnd.mainWindow.rpcServersList[index].get('host'))
@@ -140,8 +139,7 @@ def onRemoveServer(self, index):
             self.main_wnd.db.removeRPCServer(index)
 
 
-    
-    @pyqtSlot()
+
     def onSave(self):
         # Get new config data
         protocol = "http" if self.ui.protocol_select.currentIndex() == 0 else "https"