Use qtpy
This commit is contained in:
parent
ce0dfa99c1
commit
2b2600812a
@ -10,8 +10,8 @@ Parts of comments issued from 2009 Tetris Design Guideline
|
|||||||
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
from qtpy import QtWidgets
|
||||||
|
|
||||||
from source.qt5 import QtWidgets
|
|
||||||
from source.game_gui import Window
|
from source.game_gui import Window
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from .qt5 import QtGui
|
from qtpy import QtGui
|
||||||
|
|
||||||
|
|
||||||
# Paths
|
# Paths
|
||||||
|
@ -7,10 +7,10 @@ import itertools
|
|||||||
import locale
|
import locale
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
|
from qtpy import QtWidgets, QtCore, QtGui, QtMultimedia
|
||||||
|
|
||||||
from . import consts
|
from . import consts
|
||||||
from .consts import L, R, CLOCKWISE, COUNTERCLOCKWISE
|
from .consts import L, R, CLOCKWISE, COUNTERCLOCKWISE
|
||||||
from .qt5 import QtWidgets, QtCore, QtGui, QtMultimedia
|
|
||||||
from .__version__ import __title__, __author__, __version__
|
from .__version__ import __title__, __author__, __version__
|
||||||
from .point import Point
|
from .point import Point
|
||||||
from .tetromino import Block, Tetromino, GhostPiece
|
from .tetromino import Block, Tetromino, GhostPiece
|
||||||
|
@ -2,8 +2,9 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
|
||||||
|
from qtpy import QtCore
|
||||||
|
|
||||||
from .consts import CLOCKWISE
|
from .consts import CLOCKWISE
|
||||||
from .qt5 import QtCore
|
|
||||||
|
|
||||||
|
|
||||||
class Point(QtCore.QPoint):
|
class Point(QtCore.QPoint):
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
try:
|
|
||||||
from PyQt5 import QtWidgets, QtCore, QtGui, QtMultimedia
|
|
||||||
except ImportError as pyqt5_error:
|
|
||||||
try:
|
|
||||||
from PySide2 import QtWidgets, QtCore, QtGui, QtMultimedia
|
|
||||||
except ImportError as pyside2_error:
|
|
||||||
sys.exit(
|
|
||||||
"This program require a Qt5 library.\n"
|
|
||||||
"You can install PyQt5 (recommended) :\n"
|
|
||||||
" pip3 install --user PyQt5\n"
|
|
||||||
" pip3 install --user qdarkstyle\n"
|
|
||||||
"or PySide2 :\n"
|
|
||||||
" pip3 install --user PySide2\n"
|
|
||||||
+ pyqt5_error.msg
|
|
||||||
+ "\n"
|
|
||||||
+ pyside2_error.msg
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
os.environ["QT_API"] = "pyside2"
|
|
||||||
else:
|
|
||||||
os.environ["QT_API"] = "pyqt5"
|
|
||||||
QtCore.Signal = QtCore.pyqtSignal
|
|
||||||
|
|
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
|
|
||||||
import random
|
import random
|
||||||
|
from qtpy import QtCore, QtGui
|
||||||
|
|
||||||
from . import consts
|
from . import consts
|
||||||
from .consts import L, R, U, D, CLOCKWISE, COUNTERCLOCKWISE
|
from .consts import L, R, U, D, CLOCKWISE, COUNTERCLOCKWISE
|
||||||
from .point import Point
|
from .point import Point
|
||||||
from .qt5 import QtCore, QtGui
|
|
||||||
|
|
||||||
|
|
||||||
class Block:
|
class Block:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user