Merge pull request #95 from Selene29/en6-br

Fixed all crash errors which prevented a start via start.py in Visual Studio Code.

src/component/dialog/base_mask_dialog.py

@@ -9,7 +9,8 @@ class BaseMaskDialog(QDialog):
     closed = Signal()
 
     def __init__(self, parent):
-        QDialog.__init__(self, parent=parent)
+        #QDialog.__init__(self, parent=parent)
+        super().__init__(parent)
         self.vBoxLayout = QVBoxLayout(self)
         self.windowMask = QWidget(self)
         # 蒙版中间的对话框，所有小部件以他为父级窗口

src/component/list/comic_list_widget.py

@@ -2,7 +2,7 @@
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QCursor
-from PySide6.QtWidgets import QListWidgetItem, QMenu, QApplication
+from PySide6.QtWidgets import QListWidgetItem, QMenu, QApplication, QFrame, QListWidget
 
 from component.list.base_list_widget import BaseListWidget
 from component.widget.comic_item_widget import ComicItemWidget
@@ -19,10 +19,10 @@ def __init__(self, parent):
         BaseListWidget.__init__(self, parent)
         self.resize(800, 600)
         # self.setMinimumHeight(400)
-        self.setFrameShape(self.NoFrame)  # 无边框
-        self.setFlow(self.LeftToRight)  # 从左到右
+        self.setFrameShape(QFrame.NoFrame)  # 无边框
+        self.setFlow(QListWidget.LeftToRight)  # 从左到右
         self.setWrapping(True)
-        self.setResizeMode(self.Adjust)
+        self.setResizeMode(QListWidget.Adjust)
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(self.SelectMenuBook)
         # self.doubleClicked.connect(self.OpenBookInfo)

src/component/list/tag_list_widget.py

@@ -1,6 +1,6 @@
 from PySide6.QtCore import Qt, QSize
 from PySide6.QtGui import QFont, QFontMetrics
-from PySide6.QtWidgets import QListWidgetItem, QLabel, QAbstractItemView
+from PySide6.QtWidgets import QListWidgetItem, QLabel, QAbstractItemView, QListWidget
 
 from component.list.base_list_widget import BaseListWidget
 from component.scroll.smooth_scroll_bar import SmoothScrollBar
@@ -9,8 +9,8 @@
 class TagListWidget(BaseListWidget):
     def __init__(self, parent):
         BaseListWidget.__init__(self, parent)
-        self.setViewMode(self.ListMode)
-        self.setFlow(self.LeftToRight)
+        self.setViewMode(QListWidget.ListMode)
+        self.setFlow(QListWidget.LeftToRight)
         self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.setMaximumHeight(30)

src/component/list/user_list_widget.py

@@ -1,7 +1,7 @@
 from functools import partial
 
 from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QListWidgetItem
+from PySide6.QtWidgets import QListWidgetItem, QFrame, QListWidget
 
 from component.list.base_list_widget import BaseListWidget
 from config import config
@@ -16,14 +16,14 @@ def __init__(self, parent):
         self.resize(800, 600)
         # self.setMinimumHeight(400)
         # self.setFrameShape(self.NoFrame)  # 无边框
-        self.setFlow(self.TopToBottom)
+        self.setFlow(QListWidget.TopToBottom)
         # self.setWrapping(True)
         # self.setResizeMode(self.Adjust)
         # self.setContextMenuPolicy(Qt.CustomContextMenu)
         # self.customContextMenuRequested.connect(self.SelectMenuBook)
         # self.doubleClicked.connect(self.OpenBookInfo)
         # self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
-        self.setFrameShape(self.NoFrame)  # 无边框
+        self.setFrameShape(QFrame.NoFrame)  # 无边框
         self.setFocusPolicy(Qt.NoFocus)
 
         self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)

src/component/scroll/smooth_scroll.py

@@ -20,7 +20,7 @@ def __init__(self):
         self.lastWheelEvent = None
         self.scrollStamps = deque()
         self.stepsLeftQueue = deque()
-        self.smoothMoveTimer = QTimer(self)
+        self.smoothMoveTimer = QTimer()
         self.smoothMode = SmoothMode(SmoothMode.LINEAR)
         self.smoothMoveTimer.timeout.connect(self.__smoothMove)
         self.qEventParam = []

src/view/info/book_eps_view.py

@@ -1,7 +1,7 @@
 from PySide6 import QtWidgets
 from PySide6.QtCore import QSize
 from PySide6.QtGui import Qt, QFont
-from PySide6.QtWidgets import QLabel, QListWidgetItem
+from PySide6.QtWidgets import QLabel, QListWidgetItem, QListWidget, QFrame, QAbstractItemView
 
 from interface.ui_book_eps import Ui_BookEps
 from qt_owner import QtOwner
@@ -18,11 +18,11 @@ def __init__(self):
         Ui_BookEps.__init__(self)
         QtTaskBase.__init__(self)
         self.setupUi(self)
-        self.listWidget.setFlow(self.listWidget.LeftToRight)
+        self.listWidget.setFlow(QListWidget.LeftToRight)
         self.listWidget.setWrapping(True)
-        self.listWidget.setFrameShape(self.listWidget.NoFrame)
-        self.listWidget.setResizeMode(self.listWidget.Adjust)
-        self.listWidget.setSelectionMode(self.listWidget.MultiSelection)
+        self.listWidget.setFrameShape(QFrame.NoFrame)
+        self.listWidget.setResizeMode(QListWidget.Adjust)
+        self.listWidget.setSelectionMode(QAbstractItemView.MultiSelection)
         self.listWidget.setSpacing(6)
         self.bookId = ""
         self.selectButton.clicked.connect(self.SelectAll)

src/view/info/book_info_view.py

@@ -4,7 +4,7 @@
 from PySide6 import QtWidgets, QtCore, QtGui
 from PySide6.QtCore import Qt, QSize, QEvent, Signal
 from PySide6.QtGui import QColor, QFont, QPixmap, QIcon
-from PySide6.QtWidgets import QListWidgetItem, QLabel, QScroller, QPushButton, QMessageBox
+from PySide6.QtWidgets import QListWidgetItem, QLabel, QScroller, QPushButton, QMessageBox, QListWidget, QFrame
 
 from component.layout.flow_layout import FlowLayout
 from config.setting import Setting
@@ -58,17 +58,17 @@ def __init__(self):
         # self.tagsList.setContextMenuPolicy(Qt.CustomContextMenu)
         # self.tagsList.customContextMenuRequested.connect(self.CopyClickTagsItem)
 
-        self.epsListWidget.setFlow(self.epsListWidget.LeftToRight)
+        self.epsListWidget.setFlow(QListWidget.LeftToRight)
         self.epsListWidget.setWrapping(True)
-        self.epsListWidget.setFrameShape(self.epsListWidget.NoFrame)
-        self.epsListWidget.setResizeMode(self.epsListWidget.Adjust)
+        self.epsListWidget.setFrameShape(QFrame.NoFrame)
+        self.epsListWidget.setResizeMode(QListWidget.Adjust)
 
         self.epsListWidget.clicked.connect(self.OpenReadImg)
 
-        self.listWidget.setFlow(self.listWidget.LeftToRight)
+        self.listWidget.setFlow(QListWidget.LeftToRight)
         self.listWidget.setWrapping(True)
-        self.listWidget.setFrameShape(self.listWidget.NoFrame)
-        self.listWidget.setResizeMode(self.listWidget.Adjust)
+        self.listWidget.setFrameShape(QFrame.NoFrame)
+        self.listWidget.setResizeMode(QListWidget.Adjust)
         self.listWidget.clicked.connect(self.OpenReadImg2)
         if Setting.IsGrabGesture.value:
             QScroller.grabGesture(self.epsListWidget, QScroller.LeftMouseButtonGesture)

src/view/read/read_graphics.py

@@ -43,9 +43,9 @@ def __init__(self, parent=None):
         self.changeScale.connect(self.ChangeScale)
 
         # self.setInteractive(False)
-        self.setTransformationAnchor(self.NoAnchor)
-        self.setResizeAnchor(self.NoAnchor)
-        self.setDragMode(self.NoDrag)
+        self.setTransformationAnchor(QGraphicsView.NoAnchor)
+        self.setResizeAnchor(QGraphicsView.NoAnchor)
+        self.setDragMode(QGraphicsView.NoDrag)
         self.setFrameStyle(QFrame.NoFrame)
         self.setObjectName("graphicsView")
         # self.graphicsView.setBackgroundBrush(QColor(Qt.white))

src/view/tool/waifu2x_tool_view.py

@@ -5,7 +5,7 @@
 from PySide6.QtCore import Qt, QRectF, QPointF, QSizeF, QEvent
 from PySide6.QtGui import QPainter, QPixmap, QDoubleValidator, \
     QIntValidator, QMouseEvent, QImage
-from PySide6.QtWidgets import QFrame, QGraphicsPixmapItem, QGraphicsScene, QApplication, QFileDialog, QLabel
+from PySide6.QtWidgets import QFrame, QGraphicsPixmapItem, QGraphicsScene, QApplication, QFileDialog, QLabel, QGraphicsView
 
 from config import config
 from interface.ui_waifu2x_tool import Ui_Waifu2xTool
@@ -34,7 +34,7 @@ def __init__(self):
         self.heighEdit.setValidator(validator)
         self.widthEdit.setValidator(validator)
         exp = QDoubleValidator(0.1, 64, 1)
-        exp.setNotation(exp.StandardNotation)
+        exp.setNotation(QDoubleValidator.StandardNotation)
         self.scaleEdit.setValidator(exp)
         # self.setWindowFlags(Qt.FramelessWindowHint)
 
@@ -47,8 +47,8 @@ def __init__(self):
         self.graphicsView.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.graphicsView.setRenderHints(QPainter.Antialiasing |
                                          QPainter.SmoothPixmapTransform)
-        self.graphicsView.setCacheMode(self.graphicsView.CacheBackground)
-        self.graphicsView.setViewportUpdateMode(self.graphicsView.SmartViewportUpdate)
+        self.graphicsView.setCacheMode(QGraphicsView.CacheBackground)
+        self.graphicsView.setViewportUpdateMode(QGraphicsView.SmartViewportUpdate)
 
         self.graphicsItem = ReadQGraphicsProxyWidget()
         self.graphicsItem.setFlags(QGraphicsPixmapItem.ItemIsFocusable |