Commit 4abdbb8e authored by dmMaze's avatar dmMaze
Browse files

compatibility with pyside6

parent ad990fc1

launch.py

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ python = sys.executable 
git = os.environ.get('GIT', "git")

skip_install = False

index_url = os.environ.get('INDEX_URL', "")

QT_APIS = ['pyqt5', 'pyqt6']

QT_APIS = ['pyqt5', 'pyqt6', 'pyside6']

stored_commit_hash = None



REQ_WIN = [
@@ -202,7 +202,7 @@ def main(): 
        if font.endswith(('.ttf','.otf')):

            QFontDatabase.addApplicationFont((PATH_FONTS/font).as_posix())

    yahei = QFont('Microsoft YaHei UI')

    if yahei.exactMatch():

    if yahei.exactMatch() and not sys.platform == 'darwin':

        QGuiApplication.setFont(yahei)



    C.APP_DEFAULT_FONT = app.font().defaultFamily()

ui/canvas.py

+2 −3
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ class Canvas(QGraphicsScene): 


    def prepareClose(self):

        self.blockSignals(True)

        self.disconnect()

        self.text_undo_stack.disconnect()

        self.draw_undo_stack.disconnect()

        self.text_undo_stack.disconnect(True)

        self.draw_undo_stack.disconnect(True)

ui/configpanel.py

+5 −1
Original line number Diff line number Diff line
@@ -3,11 +3,15 @@ from typing import List, Union, Tuple 
from qtpy.QtWidgets import QKeySequenceEdit, QLayout, QHBoxLayout, QVBoxLayout, QTreeView, QWidget, QLabel, QSizePolicy, QSpacerItem, QCheckBox, QSplitter, QScrollArea, QGroupBox, QLineEdit

from qtpy.QtCore import Qt, Signal, QSize, QEvent, QItemSelection

from qtpy.QtGui import QStandardItem, QStandardItemModel, QMouseEvent, QFont, QColor, QPalette

from qtpy import API



from . import constants as C



# nuitka seems to require import QtCore explicitly 

if C.FLAG_QT6:

    if API == 'pyside6':

        from PySide6 import QtCore

    else:

        from PyQt6 import QtCore

else:

    from PyQt5 import QtCore

ui/framelesswindow/fw_qt6/linux/__init__.py

+3 −3
Original line number Diff line number Diff line 
# coding:utf-8

from PyQt6.QtCore import QCoreApplication, QEvent, Qt

from PyQt6.QtGui import QMouseEvent

from PyQt6.QtWidgets import QWidget

from qtpy.QtCore import QCoreApplication, QEvent, Qt

from qtpy.QtGui import QMouseEvent

from qtpy.QtWidgets import QWidget



# from ..titlebar import TitleBar

from ..utils.linux_utils import LinuxMoveResize

ui/framelesswindow/fw_qt6/mac/__init__.py

+2 −2
Original line number Diff line number Diff line 
# coding:utf-8

import Cocoa

import objc

from PyQt6.QtCore import QEvent, Qt

from PyQt6.QtWidgets import QWidget

from qtpy.QtCore import QEvent, Qt

from qtpy.QtWidgets import QWidget



# from ..titlebar import TitleBar

from .window_effect import MacWindowEffect