From fa9ac2094862a7e6d61784dcd29d14903220d333 Mon Sep 17 00:00:00 2001 From: adrienmalin <41926238+adrienmalin@users.noreply.github.com> Date: Wed, 1 Aug 2018 00:00:09 +0200 Subject: [PATCH] Add files via upload --- Tetris2000/Tetris2000.py | 23 ++++++++++++----------- Tetris2000/__init__.py | 2 +- Tetris2000/__main__.py | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Tetris2000/Tetris2000.py b/Tetris2000/Tetris2000.py index a6e0d62..c9aa92d 100644 --- a/Tetris2000/Tetris2000.py +++ b/Tetris2000/Tetris2000.py @@ -23,18 +23,19 @@ import collections try: # PyQt5 from PyQt5 import QtWidgets, QtCore, QtGui, QtMultimedia -except ImportError: +except ImportError as pyqt5_error: try: # PySide2 from PySide2 import QtWidgets, QtCore, QtGui, QtMultimedia - except ImportError: + except ImportError as pyside2_error: sys.exit( - "This program require a Qt library.\n" - "You can install PyQt5 package (recommended) :\n" - " pip install PyQt5\n" - "or PySide2 package :\n" - " pip install PySide2\n" - "NB : On Windows, PySide2 may require to install\n" - "Visual C++ Redistributable Packages separately." + "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" @@ -109,11 +110,11 @@ class Block: FILL_COLOR = QtGui.QColor(0, 159, 218, 25) GLOWING_BORDER_COLOR = None GLOWING_FILL_COLOR = QtGui.QColor(186, 211, 255, 70) - LIGHT_COLOR = QtGui.QColor(204, 255, 255, 40) + LIGHT_COLOR = QtGui.QColor(242, 255, 255, 40) TRANSPARENT = QtGui.QColor(255, 255, 255, 0) GLOWING = 0 - side = 0 + side = 20 def __init__(self, coord, trail=0): self.coord = coord diff --git a/Tetris2000/__init__.py b/Tetris2000/__init__.py index cf9f207..b5a6c7b 100644 --- a/Tetris2000/__init__.py +++ b/Tetris2000/__init__.py @@ -1 +1 @@ -import Tetris2000 \ No newline at end of file +from . import Tetris2000 diff --git a/Tetris2000/__main__.py b/Tetris2000/__main__.py index eb42c73..8fa6f89 100644 --- a/Tetris2000/__main__.py +++ b/Tetris2000/__main__.py @@ -1,5 +1,5 @@ import sys -from Tetris2000 import Tetris2000 +from . import Tetris2000 return_code = Tetris2000.main(sys.argv)