From 03f0e048af53a95ea364a6a3a732491bd8fa00a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20R=C3=A9aux?= Date: Tue, 3 Mar 2026 15:56:16 +0100 Subject: [PATCH] clean constant types --- src/warchron/constants.py | 102 +++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/src/warchron/constants.py b/src/warchron/constants.py index 241ff64..5f1d037 100644 --- a/src/warchron/constants.py +++ b/src/warchron/constants.py @@ -15,42 +15,40 @@ RESOURCES_DIR = VIEW_ROOT / "resources" ROLE_TYPE = Qt.ItemDataRole.UserRole ROLE_ID = Qt.ItemDataRole.UserRole + 1 -# TODO use StrEnum and auto() instead of str,Enum and "name" - -class IconName(str, Enum): - UNDO = "undo" - REDO = "redo" - PAIRING = "pairing" - DRAW = "draw" - TIEBREAK = "tie-break" - DELETE = "delete" - SAVE_AS = "save_as" - SAVE = "save" - NEW = "new" - EXIT = "exit" - END = "end" - OPEN = "load" - ONGOING = "ongoing" - EXPORT = "export" - EDIT = "edit" - ADD = "add" - ABOUT = "about" - WARS = "wars" - DONE = "done" - WIN = "win" - PLAYERS = "players" - WARCHRONICO = "warchron_icon" - WARCHRONBACK = "warchron_background" - TOKEN = "token" - TOKENS = "tokens" - VP1ST = "vp1st" - VP2ND = "vp2nd" - VP3RD = "vp3rd" - VPNTH = "vpnth" - NP1ST = "np1st" - NP2ND = "np2nd" - NP3RD = "np3rd" +class IconName(StrEnum): + UNDO = auto() + REDO = auto() + PAIRING = auto() + DRAW = auto() + TIEBREAK = auto() + DELETE = auto() + SAVE_AS = auto() + SAVE = auto() + NEW = auto() + EXIT = auto() + END = auto() + OPEN = auto() + ONGOING = auto() + EXPORT = auto() + EDIT = auto() + ADD = auto() + ABOUT = auto() + WARS = auto() + DONE = auto() + WIN = auto() + PLAYERS = auto() + WARCHRONICO = auto() + WARCHRONBACK = auto() + TOKEN = auto() + TOKENS = auto() + VP1ST = auto() + VP2ND = auto() + VP3RD = auto() + VPNTH = auto() + NP1ST = auto() + NP2ND = auto() + NP3RD = auto() TIEBREAK_TOKEN = auto() VP1STDRAW = auto() VP1STBREAK = auto() @@ -95,9 +93,9 @@ class Icons: _pixmap_cache: Dict[IconName, QPixmap] = {} _paths = { - IconName.UNDO: "arrow-curve-180-left", - IconName.REDO: "arrow-curve", - IconName.PAIRING: "arrow-switch", + IconName.UNDO: "arrow-curve-180-left.png", + IconName.REDO: "arrow-curve.png", + IconName.PAIRING: "arrow-switch.png", IconName.DRAW: "balance.png", IconName.TIEBREAK: "balance-unbalance.png", IconName.DELETE: "cross.png", @@ -283,16 +281,16 @@ class Icons: class ItemType(StrEnum): - PLAYER = "player" - WAR = "war" - CAMPAIGN = "campaign" - ROUND = "round" - OBJECTIVE = "objective" - WAR_PARTICIPANT = "war_participant" - SECTOR = "sector" - CAMPAIGN_PARTICIPANT = "campaign_participant" - CHOICE = "choice" - BATTLE = "battle" + PLAYER = auto() + WAR = auto() + CAMPAIGN = auto() + ROUND = auto() + OBJECTIVE = auto() + WAR_PARTICIPANT = auto() + SECTOR = auto() + CAMPAIGN_PARTICIPANT = auto() + CHOICE = auto() + BATTLE = auto() class RefreshScope(Enum): @@ -306,8 +304,8 @@ class RefreshScope(Enum): class ContextType(StrEnum): - WAR = "war" - CAMPAIGN = "campaign" - CHOICE = "choice" - BATTLE = "battle" + WAR = auto() + CAMPAIGN = auto() + CHOICE = auto() + BATTLE = auto() OBJECTIVE = auto()