feat: more background colors

Author: truenicoco

hh_creator/main_window.py

@@ -5,6 +5,7 @@
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtWidgets import QMessageBox
 
 from . import config
 from .animations import Animations
@@ -58,6 +59,9 @@ def __init__(self, show_new_hh_dialog: bool = True):
 
         self.full_screen_widget = None
 
+        self.background_color = "black"
+        self.webcam = "plain"
+
         self.graphics_view: QtWidgets.QGraphicsView = self.widgets["graphicsView"]
 
         self.hand_history: Union[None, HandHistory] = None
@@ -80,6 +84,7 @@ def __init__(self, show_new_hh_dialog: bool = True):
         self.state = self.State.LAUNCH
 
         self.current_filename = None
+        self.update_background()
         if show_new_hh_dialog:
             self.on_actionNew_triggered()
 
@@ -323,19 +328,43 @@ def on_actionTableBlue_triggered(self):
 
     @pyqtSlot()
     def on_actionWebcamPlain_triggered(self):
-        self.scene.change_background("plain")
+        self.webcam = "plain"
+        self.update_background()
 
     @pyqtSlot()
     def on_actionWebcamBoth_triggered(self):
-        self.scene.change_background("both")
+        self.webcam = "both"
+        self.update_background()
 
     @pyqtSlot()
     def on_actionWebcamLeft_triggered(self):
-        self.scene.change_background("left")
+        self.webcam = "left"
+        self.update_background()
 
     @pyqtSlot()
     def on_actionWebcamRight_triggered(self):
-        self.scene.change_background("right")
+        self.webcam = "right"
+        self.update_background()
+
+    @pyqtSlot()
+    def on_actionBackgroundBlack_triggered(self):
+        self.background_color = "black"
+        self.update_background()
+
+    @pyqtSlot()
+    def on_actionBackgroundViolet_triggered(self):
+        self.background_color = "violet"
+        self.update_background()
+
+    @pyqtSlot()
+    def on_actionBackgroundBlue_triggered(self):
+        self.background_color = "blue"
+        self.update_background()
+
+    @pyqtSlot()
+    def on_actionBackgroundRed_triggered(self):
+        self.background_color = "red"
+        self.update_background()
 
     @pyqtSlot()
     def on_actionBackBlue_triggered(self):
@@ -494,6 +523,20 @@ def update_buttons(self):
 
             start.setEnabled(True)
 
+    def update_background(self):
+        file_name = f"{self.background_color}-{self.webcam}"
+        try:
+            self.scene.change_background(file_name)
+        except FileNotFoundError:
+            msg = QMessageBox()
+            msg.setIcon(QMessageBox.Critical)
+            msg.setText("Image non trouvée")
+            msg.setInformativeText(
+                f"Il manque un fichier pour avoir ce fond: {file_name}"
+            )
+            msg.setWindowTitle("Erreur")
+            msg.exec_()
+
 
 class FullScreenView(QtWidgets.QGraphicsView, KeyboardShortcutsMixin):
     def __init__(self, main_window: MainWindow, scene: TableScene):

…creator/resource/img/background/both.png …r/resource/img/background/black-both.pnghh_creator/resource/img/background/both.png renamed to hh_creator/resource/img/background/black-both.png hh_creator/resource/img/background/both.png renamed to hh_creator/resource/img/background/black-both.png

@@ -127,21 +127,31 @@
      <addaction name="actionBackRed"/>
      <addaction name="actionBackBlue"/>
     </widget>
+    <widget class="QMenu" name="menuBackground">
+     <property name="title">
+      <string>Couleur du fond</string>
+     </property>
+     <addaction name="actionBackgroundBlack"/>
+     <addaction name="actionBackgroundViolet"/>
+     <addaction name="actionBackgroundBlue"/>
+     <addaction name="actionBackgroundRed"/>
+    </widget>
     <widget class="QMenu" name="menuWebcam">
      <property name="title">
       <string>Webcam</string>
      </property>
-     <addaction name="actionLeft"/>
-     <addaction name="actionRight"/>
-     <addaction name="actionBoth"/>
-     <addaction name="actionSans"/>
+     <addaction name="actionWebcamLeft"/>
+     <addaction name="actionWebcamRight"/>
+     <addaction name="actionWebcamBoth"/>
+     <addaction name="actionWebcamSans"/>
     </widget>
     <addaction name="actionFullScreen"/>
     <addaction name="separator"/>
     <addaction name="actionChooseHero"/>
     <addaction name="actionHideHandsBeforeShowdown"/>
     <addaction name="separator"/>
     <addaction name="menuTable"/>
+    <addaction name="menuBackground"/>
     <addaction name="menuWebcam"/>
     <addaction name="menuCardsBack"/>
     <addaction name="separator"/>
@@ -244,22 +254,22 @@
     <string>Cacher mains avant showdown</string>
    </property>
   </action>
-  <action name="actionLeft">
+  <action name="actionWebcamLeft">
    <property name="text">
     <string>Gauche</string>
    </property>
   </action>
-  <action name="actionRight">
+  <action name="actionWebcamRight">
    <property name="text">
     <string>Droite</string>
    </property>
   </action>
-  <action name="actionBoth">
+  <action name="actionWebcamBoth">
    <property name="text">
     <string>Les deux</string>
    </property>
   </action>
-  <action name="actionSans">
+  <action name="actionWebcamSans">
    <property name="text">
     <string>Sans</string>
    </property>
@@ -274,6 +284,26 @@
     <string>Restaurer la configuration par défaut</string>
    </property>
   </action>
+  <action name="actionBackgroundBlack">
+   <property name="text">
+    <string>Noir</string>
+   </property>
+  </action>
+  <action name="actionBackgroundViolet">
+   <property name="text">
+    <string>Violet</string>
+   </property>
+  </action>
+  <action name="actionBackgroundBlue">
+   <property name="text">
+    <string>Bleu</string>
+   </property>
+  </action>
+  <action name="actionBackgroundRed">
+   <property name="text">
+    <string>Rouge</string>
+   </property>
+  </action>
   <action name="actionOpenGL">
    <property name="checkable">
     <bool>true</bool>

…creator/resource/img/background/left.png …r/resource/img/background/black-left.pnghh_creator/resource/img/background/left.png renamed to hh_creator/resource/img/background/black-left.png hh_creator/resource/img/background/left.png renamed to hh_creator/resource/img/background/black-left.png

@@ -137,7 +137,13 @@ def _get_player_item_from_hh_position(self, position: hh.Position):
 
     def _create_background(self):
         table_item = Image.get(Path("table") / config.config["look"].get("table"))
-        background = Image.get(Path("background") / config.config["look"].get("webcam"))
+        webcam = config.config["look"].get("webcam")
+        if "-" not in webcam:
+            webcam = f"black-{webcam}"
+        try:
+            background = Image.get(Path("background") / webcam)
+        except FileNotFoundError:
+            background = Image.get(Path("background") / "black-plain")
 
         shadow = QtWidgets.QGraphicsDropShadowEffect()
         shadow.setBlurRadius(config.config["look"].getfloat("TABLE_SHADOW_RADIUS"))