qt5 fixes

also pep8 compliance

1 files changed, 59 insertions, 41 deletions

diff --git a/src/mainwindow.py b/src/mainwindow.py
index a52a0f4..7a9e397 100644
--- a/src/mainwindow.py
+++ b/src/mainwindow.py
@@ -116,7 +116,6 @@ class MainWindow(QtWidgets.QMainWindow):
             codec = window.comboBox_videoCodec.itemText(i)
             if codec == self.settings.value('outputVideoCodec'):
                 window.comboBox_videoCodec.setCurrentIndex(i)
-                #print(codec)
 
         for i in range(window.comboBox_audioCodec.count()):
             codec = window.comboBox_audioCodec.itemText(i)
@@ -146,10 +145,11 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # Make component buttons
         self.compMenu = QMenu()
+        self.compActions = []
         for i, comp in enumerate(self.core.modules):
             action = self.compMenu.addAction(comp.Component.__doc__)
             action.triggered.connect(
-                lambda item=i: self.core.insertComponent(0, item, self))
+                lambda _, item=i: self.core.insertComponent(0, item, self))
 
         self.window.pushButton_addComponent.setMenu(self.compMenu)
 
@@ -160,9 +160,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.window.pushButton_removeComponent.clicked.connect(
             lambda _: self.removeComponent())
 
-        componentList.setContextMenuPolicy(
-            QtCore.Qt.CustomContextMenu)
-        componentList.customContextMenuRequested.connect(self.componentContextMenu)
+        componentList.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+        componentList.customContextMenuRequested.connect(
+            self.componentContextMenu
+        )
 
         currentRes = str(self.settings.value('outputWidth'))+'x' + \
             str(self.settings.value('outputHeight'))
@@ -245,19 +246,30 @@ class MainWindow(QtWidgets.QMainWindow):
         QtWidgets.QShortcut("Ctrl+O", self.window, self.openOpenProjectDialog)
         QtWidgets.QShortcut("Ctrl+N", self.window, self.createNewProject)
 
-        QtWidgets.QShortcut("Ctrl+T", self.window, activated=lambda:
-                        self.window.pushButton_addComponent.click())
-        QtWidgets.QShortcut("Ctrl+Space", self.window, activated=lambda:
-                        self.window.listWidget_componentList.setFocus())
-        QtWidgets.QShortcut("Ctrl+Shift+S", self.window,
-                        self.presetManager.openSavePresetDialog)
-        QtWidgets.QShortcut("Ctrl+Shift+C", self.window,
-                        self.presetManager.clearPreset)
-
-        QtWidgets.QShortcut("Ctrl+Up", self.window,
-                        activated=lambda: self.moveComponent(-1))
-        QtWidgets.QShortcut("Ctrl+Down", self.window,
-                        activated=lambda: self.moveComponent(1))
+        QtWidgets.QShortcut(
+            "Ctrl+T", self.window,
+            activated=lambda: self.window.pushButton_addComponent.click()
+        )
+        QtWidgets.QShortcut(
+            "Ctrl+Space", self.window,
+            activated=lambda: self.window.listWidget_componentList.setFocus()
+        )
+        QtWidgets.QShortcut(
+            "Ctrl+Shift+S", self.window,
+            self.presetManager.openSavePresetDialog
+        )
+        QtWidgets.QShortcut(
+            "Ctrl+Shift+C", self.window, self.presetManager.clearPreset
+        )
+
+        QtWidgets.QShortcut(
+            "Ctrl+Up", self.window,
+            activated=lambda: self.moveComponent(-1)
+        )
+        QtWidgets.QShortcut(
+            "Ctrl+Down", self.window,
+            activated=lambda: self.moveComponent(1)
+        )
         QtWidgets.QShortcut("Ctrl+Home", self.window, self.moveComponentTop)
         QtWidgets.QShortcut("Ctrl+End", self.window, self.moveComponentBottom)
         QtWidgets.QShortcut("Ctrl+r", self.window, self.removeComponent)
@@ -280,7 +292,7 @@ class MainWindow(QtWidgets.QMainWindow):
     def updateComponentTitle(self, pos, presetStore=False):
         if type(presetStore) == dict:
             name = presetStore['preset']
-            if name == None or name not in self.core.savedPresets:
+            if name is None or name not in self.core.savedPresets:
                 modified = False
             else:
                 modified = (presetStore != self.core.savedPresets[name])
@@ -362,21 +374,22 @@ class MainWindow(QtWidgets.QMainWindow):
     def openInputFileDialog(self):
         inputDir = self.settings.value("inputDir", os.path.expanduser("~"))
 
-        fileName = QtGui.QFileDialog.getOpenFileName(
+        fileName, _ = QtWidgets.QFileDialog.getOpenFileName(
             self.window, "Open Audio File",
             inputDir, "Audio Files (%s)" % " ".join(self.core.audioFormats))
 
-        if not fileName == "":
+        if fileName:
             self.settings.setValue("inputDir", os.path.dirname(fileName))
             self.window.lineEdit_audioFile.setText(fileName)
 
     def openOutputFileDialog(self):
         outputDir = self.settings.value("outputDir", os.path.expanduser("~"))
 
-        fileName = QtGui.QFileDialog.getSaveFileName(
+        fileName, _ = QtWidgets.QFileDialog.getSaveFileName(
             self.window, "Set Output Video File",
             outputDir,
-            "Video Files (%s);; All Files (*)" % " ".join(self.core.videoFormats))
+            "Video Files (%s);; All Files (*)" % " ".join(
+                self.core.videoFormats))
 
         if not fileName == "":
             self.settings.setValue("outputDir", os.path.dirname(fileName))
@@ -547,13 +560,13 @@ class MainWindow(QtWidgets.QMainWindow):
         '''Drop event for the component listwidget'''
         componentList = self.window.listWidget_componentList
 
-        modelIndexes = [ \
-            componentList.model().index(i) \
-                for i in range(componentList.count()) \
+        modelIndexes = [
+            componentList.model().index(i)
+            for i in range(componentList.count())
         ]
-        rects = [ \
-            componentList.visualRect(modelIndex) \
-                for modelIndex in modelIndexes \
+        rects = [
+            componentList.visualRect(modelIndex)
+            for modelIndex in modelIndexes
         ]
 
         rowPos = [rect.contains(event.pos()) for rect in rects]
@@ -602,9 +615,10 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.autosaveExists(identical=False):
             ch = self.showMessage(
                 msg="You have unsaved changes in project '%s'. "
-                "Save before %s?" % \
-                    (os.path.basename(self.currentProject)[:-4],
-                    phrase),
+                "Save before %s?" % (
+                    os.path.basename(self.currentProject)[:-4],
+                    phrase
+                ),
                 showCancel=True)
             if ch:
                 success = self.saveProjectChanges()
@@ -613,7 +627,7 @@ class MainWindow(QtWidgets.QMainWindow):
             os.remove(self.autosavePath)
 
     def openSaveProjectDialog(self):
-        filename = QtGui.QFileDialog.getSaveFileName(
+        filename, _ = QtWidgets.QFileDialog.getSaveFileName(
             self.window, "Create Project File",
             self.settings.value("projectDir"),
             "Project Files (*.avp)")
@@ -628,7 +642,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.core.createProjectFile(filename)
 
     def openOpenProjectDialog(self):
-        filename = QtGui.QFileDialog.getOpenFileName(
+        filename, _ = QtWidgets.QFileDialog.getOpenFileName(
             self.window, "Open Project File",
             self.settings.value("projectDir"),
             "Project Files (*.avp)")
@@ -657,17 +671,19 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def showMessage(self, **kwargs):
         parent = kwargs['parent'] if 'parent' in kwargs else self.window
-        msg = QtGui.QMessageBox(parent)
+        msg = QtWidgets.QMessageBox(parent)
         msg.setModal(True)
         msg.setText(kwargs['msg'])
         msg.setIcon(
-            kwargs['icon'] if 'icon' in kwargs else QtGui.QMessageBox.Information)
+            kwargs['icon']
+            if 'icon' in kwargs else QtWidgets.QMessageBox.Information
+        )
         msg.setDetailedText(kwargs['detail'] if 'detail' in kwargs else None)
         if 'showCancel'in kwargs and kwargs['showCancel']:
             msg.setStandardButtons(
-                QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel)
+                QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel)
         else:
-            msg.setStandardButtons(QtGui.QMessageBox.Ok)
+            msg.setStandardButtons(QtWidgets.QMessageBox.Ok)
         ch = msg.exec_()
         if ch == 1024:
             return True
@@ -687,7 +703,7 @@ class MainWindow(QtWidgets.QMainWindow):
             return
 
         self.presetManager.findPresets()
-        self.menu = QtGui.QMenu()
+        self.menu = QMenu()
         menuItem = self.menu.addAction("Save Preset")
         menuItem.triggered.connect(
             self.presetManager.openSavePresetDialog
@@ -695,8 +711,10 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # submenu for opening presets
         try:
-            presets = self.presetManager.presets[str(self.core.selectedComponents[index])]
-            self.submenu = QtGui.QMenu("Open Preset")
+            presets = self.presetManager.presets[
+                str(self.core.selectedComponents[index])
+            ]
+            self.submenu = QMenu("Open Preset")
             self.menu.addMenu(self.submenu)
 
             for version, presetName in presets: