Extra fixes after rebasing

graphic_components/board.py

@@ -3,7 +3,7 @@ of the boards."""
 
 from PySide2.QtGui import QPen
 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 menu_graphics as menu_grap

graphic_components/buttons.py

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

graphic_components/menu_graphics.py

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

main.py

@@ -43,7 +43,7 @@ class SudokuWindow(QGraphicsView):
         self.gameboard.gridDrawn.connect(lambda: self.menuboard.show_children(True))
         self.gameboard.newGameSelected.connect(self.menuboard.set_difficulty_text)
         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.difficultySelected.connect(self.gameboard.new_game)