sadpmpk
/
SudokuGame
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extra fixes after rebasing

master
En Yi 2022-07-09 14:10:16 +08:00
parent 9ce1ae0ff7
commit d815281abc
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphic_components/board.py
View File

@ -3,7 +3,7 @@ of the boards."""
from PySide2.QtGui import QPen from PySide2.QtGui import QPen
from PySide2.QtWidgets import QSizePolicy, QGraphicsWidget from PySide2.QtWidgets import QSizePolicy, QGraphicsWidget
from PySide2.QtCore import (QAbstractAnimation, Qt, QLineF, QPropertyAnimation, Property, Signal, QSizeF, QRectF) from PySide2.QtCore import (QAbstractAnimation, Qt, QLineF, QPropertyAnimation, Property, Signal, QSizeF, QRectF, QTimer)
from . import sudoku_graphics as sdk_grap from . import sudoku_graphics as sdk_grap
from . import menu_graphics as menu_grap from . import menu_graphics as menu_grap

2
graphic_components/buttons.py
View File

@ -202,7 +202,7 @@ class RingButton(AnimBox):
buttonClicked: Signal(str) buttonClicked: Signal(str)
Emitted when it is clicked. Sends the text of the button Emitted when it is clicked. Sends the text of the button
""" """
buttonClicked = Signal(str) buttonClicked = Signal(str, int)
# Initialisation # Initialisation
def __init__(self, x, y, width, height, text, parent=None): def __init__(self, x, y, width, height, text, parent=None):

8
graphic_components/menu_graphics.py
View File

@ -88,14 +88,15 @@ class DifficultyDisplayer(QGraphicsWidget):
Attributes Attributes
---------- ----------
notFocus: pyqtSignal notFocus: Signal
Emitted when it loses focus Emitted when it loses focus
difficultySelected = pyqtSignal(str) difficultySelected = Signal(str)
Emitted when a difficulty is selected. Emits the selected difficulty Emitted when a difficulty is selected. Emits the selected difficulty
""" """
notFocus = Signal() notFocus = Signal()
difficultySelected = Signal(str) difficultySelected = Signal(str)
menuClicked = Signal(str)
def __init__(self, parent=None): def __init__(self, parent=None):
"""Create the box and the text. """Create the box and the text.
@ -114,6 +115,7 @@ class DifficultyDisplayer(QGraphicsWidget):
self.diff_menu = DifficultyMenu(self.width, self.height, self) self.diff_menu = DifficultyMenu(self.width, self.height, self)
self.diff_menu.setY(-self.diff_menu.height) self.diff_menu.setY(-self.diff_menu.height)
self.diff_menu.setVisible(False) self.diff_menu.setVisible(False)
self.diff_menu.menuClicked.connect(self.menuClicked.emit)
self.box_pen = QPen() self.box_pen = QPen()
self.box_pen.setColor(Qt.white) self.box_pen.setColor(Qt.white)
@ -162,7 +164,7 @@ class DifficultyDisplayer(QGraphicsWidget):
if not self.diff_menu.isVisible(): if not self.diff_menu.isVisible():
self.diff_menu.setFocus() self.diff_menu.setFocus()
self.diff_menu.setVisible(True) self.diff_menu.setVisible(True)
self.clicked.emit() #self.clicked.emit()
else: else:
self.diff_menu.setVisible(False) self.diff_menu.setVisible(False)
self.notFocus.emit() self.notFocus.emit()

2
main.py
View File

@ -43,7 +43,7 @@ class SudokuWindow(QGraphicsView):
self.gameboard.gridDrawn.connect(lambda: self.menuboard.show_children(True)) self.gameboard.gridDrawn.connect(lambda: self.menuboard.show_children(True))
self.gameboard.newGameSelected.connect(self.menuboard.set_difficulty_text) self.gameboard.newGameSelected.connect(self.menuboard.set_difficulty_text)
self.gameboard.sudokuDone.connect(self.menuboard.finish_the_game) self.gameboard.sudokuDone.connect(self.menuboard.finish_the_game)
self.menuboard.diff_display.clicked.connect(self.gameboard.game_unfocus) self.menuboard.diff_display.menuClicked.connect(self.gameboard.game_unfocus)
self.menuboard.diff_display.notFocus.connect(lambda: self.gameboard.refocus_timer.start(10)) self.menuboard.diff_display.notFocus.connect(lambda: self.gameboard.refocus_timer.start(10))
self.menuboard.diff_display.difficultySelected.connect(self.gameboard.new_game) self.menuboard.diff_display.difficultySelected.connect(self.gameboard.new_game)