From 7792a76f8ee64711fa9db24dd164d70ebbfb9416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20R=C3=A9aux?= Date: Tue, 10 Feb 2026 09:53:49 +0100 Subject: [PATCH 1/4] split controller --- README.md | 7 + main.py | 4 +- src/warchron/controller/app_controller.py | 246 +++++ .../controller/campaign_controller.py | 239 +++++ src/warchron/controller/controller.py | 903 ------------------ .../controller/navigation_controller.py | 111 +++ src/warchron/controller/player_controller.py | 42 + src/warchron/controller/round_controller.py | 201 ++++ src/warchron/controller/war_controller.py | 161 ++++ src/warchron/view/ui/ui_main_window.py | 106 +- src/warchron/view/ui/ui_main_window.ui | 179 +++- 11 files changed, 1212 insertions(+), 987 deletions(-) create mode 100644 src/warchron/controller/app_controller.py create mode 100644 src/warchron/controller/campaign_controller.py delete mode 100644 src/warchron/controller/controller.py create mode 100644 src/warchron/controller/navigation_controller.py create mode 100644 src/warchron/controller/player_controller.py create mode 100644 src/warchron/controller/round_controller.py create mode 100644 src/warchron/controller/war_controller.py diff --git a/README.md b/README.md index d8fbdf6..2de4b02 100644 --- a/README.md +++ b/README.md @@ -39,3 +39,10 @@ pip install -e . ### Run `python main.py` + +## Dev + +### UI with QT Designer + +Save UI design from QT designer as `ui_*_.ui` file and then convert them to python using : +`pyuic6 -x .ui -o .py ` \ No newline at end of file diff --git a/main.py b/main.py index 4e7d4a0..eecc802 100644 --- a/main.py +++ b/main.py @@ -4,7 +4,7 @@ from PyQt6.QtWidgets import QApplication from warchron.view.view import View from warchron.model.model import Model -from warchron.controller.controller import Controller +from warchron.controller.app_controller import AppController if sys.version_info < (3, 12): raise RuntimeError("Python 3.12 or higher is required") @@ -14,7 +14,7 @@ if __name__ == "__main__": view = View() model = Model() - controller = Controller(model, view) + controller = AppController(model, view) view.show() diff --git a/src/warchron/controller/app_controller.py b/src/warchron/controller/app_controller.py new file mode 100644 index 0000000..8bd1206 --- /dev/null +++ b/src/warchron/controller/app_controller.py @@ -0,0 +1,246 @@ +from pathlib import Path + +from PyQt6.QtWidgets import QMessageBox + +from warchron.model.model import Model +from warchron.model.exception import ( + DeletionForbidden, + DeletionRequiresConfirmation, + UpdateRequiresConfirmation, +) +from warchron.view.view import View +from warchron.constants import ItemType, RefreshScope +from warchron.controller.navigation_controller import NavigationController +from warchron.controller.player_controller import PlayerController +from warchron.controller.war_controller import WarController +from warchron.controller.campaign_controller import CampaignController +from warchron.controller.round_controller import RoundController + + +class AppController: + def __init__(self, model: Model, view: View) -> None: + self.model: Model = model + self.view: View = view + self.navigation = NavigationController(self) + self.players = PlayerController(self) + self.wars = WarController(self) + self.campaigns = CampaignController(self) + self.rounds = RoundController(self) + self.current_file: Path | None = None + self.view.on_close_callback = self.on_app_close + self.is_dirty: bool = False + self.__connect() + self.navigation.refresh_players_view() + self.navigation.refresh_wars_view() + self.update_window_title() + self.view.on_tree_selection_changed = self.navigation.on_tree_selection_changed + self.view.on_add_campaign = self.campaigns.add_campaign + self.view.on_add_round = self.rounds.add_round + + def __connect(self) -> None: + self.view.actionExit.triggered.connect(self.view.close) + self.view.actionNew.triggered.connect(self.new) + self.view.actionOpen.triggered.connect(self.open_file) + self.view.actionSave.triggered.connect(self.save) + self.view.actionSave_as.triggered.connect(self.save_as) + self.view.addPlayerBtn.clicked.connect(self.players.add_player) + self.view.addWarBtn.clicked.connect(self.wars.add_war) + self.view.addObjectiveBtn.clicked.connect(self.wars.add_objective) + self.view.addWarParticipantBtn.clicked.connect(self.wars.add_war_participant) + self.view.addSectorBtn.clicked.connect(self.campaigns.add_sector) + self.view.addCampaignParticipantBtn.clicked.connect( + self.campaigns.add_campaign_participant + ) + self.view.on_edit_item = self.edit_item + self.view.on_delete_item = self.delete_item + + def on_app_close(self) -> bool: + if self.is_dirty: + reply = QMessageBox.question( + self.view, + "Unsaved changes", + "You have unsaved changes. Do you want to save before quitting?", + QMessageBox.StandardButton.Yes + | QMessageBox.StandardButton.No + | QMessageBox.StandardButton.Cancel, + ) + if reply == QMessageBox.StandardButton.Yes: + self.save() + elif reply == QMessageBox.StandardButton.Cancel: + return False + return True + + # Menu bar methods + + def new(self) -> None: + if self.is_dirty: + reply = QMessageBox.question( + self.view, + "Unsaved changes", + "Discard current campaign?", + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + ) + if reply != QMessageBox.StandardButton.Yes: + return + self.model.new() + self.current_file = None + self.is_dirty = False + self.navigation.refresh_players_view() + self.navigation.refresh_wars_view() + self.update_window_title() + + def open_file(self) -> None: + if self.is_dirty: + reply = QMessageBox.question( + self.view, + "Unsaved changes", + "Discard current campaign?", + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + ) + if reply != QMessageBox.StandardButton.Yes: + return + path = self.view.ask_open_file() + if not path: + return + self.model.load(path) + self.current_file = path + self.is_dirty = False + self.navigation.refresh_players_view() + self.navigation.refresh_wars_view() + self.update_window_title() + + def save(self) -> None: + if not self.current_file: + self.save_as() + return + self.model.save(self.current_file) + self.is_dirty = False + self.update_window_title() + + def save_as(self) -> None: + path = self.view.ask_save_file() + if not path: + return + self.current_file = path + self.model.save(path) + self.is_dirty = False + self.update_window_title() + + # Display methods + + def update_window_title(self) -> None: + base = "WarChron" + if self.current_file: + base += f" - {self.current_file.name}" + else: + base += " - New file" + if self.is_dirty: + base = base + " *" + self.view.setWindowTitle(base) + + # Command methods + + def edit_item(self, item_type: str, item_id: str) -> None: + try: + if item_type == ItemType.PLAYER: + self.players.edit_player(item_id) + self.navigation.refresh(RefreshScope.PLAYERS_LIST) + elif item_type == ItemType.WAR: + self.wars.edit_war(item_id) + self.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.WAR, item_id=item_id + ) + elif item_type == ItemType.CAMPAIGN: + self.campaigns.edit_campaign(item_id) + self.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.CAMPAIGN, item_id=item_id + ) + elif item_type == ItemType.OBJECTIVE: + self.wars.edit_objective(item_id) + self.navigation.refresh(RefreshScope.WAR_DETAILS) + elif item_type == ItemType.WAR_PARTICIPANT: + self.wars.edit_war_participant(item_id) + self.navigation.refresh(RefreshScope.WAR_DETAILS) + elif item_type == ItemType.SECTOR: + self.campaigns.edit_sector(item_id) + self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + elif item_type == ItemType.CAMPAIGN_PARTICIPANT: + self.campaigns.edit_campaign_participant(item_id) + self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + elif item_type == ItemType.CHOICE: + self.rounds.edit_round_choice(item_id) + self.navigation.refresh(RefreshScope.ROUND_DETAILS) + elif item_type == ItemType.BATTLE: + self.rounds.edit_round_battle(item_id) + self.navigation.refresh(RefreshScope.ROUND_DETAILS) + self.is_dirty = True + except UpdateRequiresConfirmation as e: + reply = QMessageBox.question( + self.view, + "Confirm update", + e.message, + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + ) + if reply == QMessageBox.StandardButton.Yes: + e.apply_update() + self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + + def delete_item(self, item_type: str, item_id: str) -> None: + reply = QMessageBox.question( + self.view, + "Confirm deletion", + "Are you sure you want to delete this item?", + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + ) + if reply != QMessageBox.StandardButton.Yes: + return + try: + if item_type == ItemType.PLAYER: + self.model.remove_player(item_id) + self.navigation.refresh(RefreshScope.PLAYERS_LIST) + elif item_type == ItemType.WAR: + self.model.remove_war(item_id) + self.navigation.refresh(RefreshScope.WARS_TREE) + elif item_type == ItemType.CAMPAIGN: + war = self.model.get_war_by_campaign(item_id) + war_id = war.id + self.model.remove_campaign(item_id) + self.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.WAR, item_id=war_id + ) + elif item_type == ItemType.OBJECTIVE: + self.model.remove_objective(item_id) + self.navigation.refresh(RefreshScope.WAR_DETAILS) + elif item_type == ItemType.WAR_PARTICIPANT: + self.model.remove_war_participant(item_id) + self.navigation.refresh(RefreshScope.WAR_DETAILS) + elif item_type == ItemType.SECTOR: + self.model.remove_sector(item_id) + self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + elif item_type == ItemType.CAMPAIGN_PARTICIPANT: + self.model.remove_campaign_participant(item_id) + self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + elif item_type == ItemType.ROUND: + camp = self.model.get_campaign_by_round(item_id) + camp_id = camp.id + self.model.remove_round(item_id) + self.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.CAMPAIGN, item_id=camp_id + ) + self.is_dirty = True + except DeletionForbidden as e: + QMessageBox.warning( + self.view, + "Deletion forbidden", + e.reason, + ) + except DeletionRequiresConfirmation as e: + reply = QMessageBox.question( + self.view, + "Confirm deletion", + e.message, + QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, + ) + if reply == QMessageBox.StandardButton.Yes: + e.cleanup_action() + self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) diff --git a/src/warchron/controller/campaign_controller.py b/src/warchron/controller/campaign_controller.py new file mode 100644 index 0000000..24464ef --- /dev/null +++ b/src/warchron/controller/campaign_controller.py @@ -0,0 +1,239 @@ +from typing import List, TYPE_CHECKING + +from PyQt6.QtWidgets import QMessageBox, QDialog + +from warchron.constants import ItemType, RefreshScope + +if TYPE_CHECKING: + from warchron.controller.app_controller import AppController +from warchron.controller.dtos import ( + ParticipantOption, + ObjectiveDTO, + CampaignParticipantDTO, + SectorDTO, + RoundDTO, +) +from warchron.view.campaign_dialog import CampaignDialog +from warchron.view.campaign_participant_dialog import CampaignParticipantDialog +from warchron.view.sector_dialog import SectorDialog + + +class CampaignController: + def __init__(self, app: "AppController"): + self.app = app + + def _fill_campaign_details(self, campaign_id: str) -> None: + camp = self.app.model.get_campaign(campaign_id) + self.app.view.show_campaign_details(name=camp.name, month=camp.month) + sectors = camp.get_all_sectors() + war = self.app.model.get_war_by_campaign(camp.id) + sectors_for_display: List[SectorDTO] = [ + SectorDTO( + id=sect.id, + name=sect.name, + round_index=camp.get_round_index(sect.round_id), + major=war.get_objective_name(sect.major_objective_id), + minor=war.get_objective_name(sect.minor_objective_id), + influence=war.get_objective_name(sect.influence_objective_id), + ) + for sect in sectors + ] + self.app.view.display_campaign_sectors(sectors_for_display) + camp_parts = camp.get_all_campaign_participants() + participants_for_display: List[CampaignParticipantDTO] = [ + CampaignParticipantDTO( + id=p.id, + player_name=self.app.model.get_participant_name(p.war_participant_id), + leader=p.leader or "", + theme=p.theme or "", + ) + for p in camp_parts + ] + self.app.view.display_campaign_participants(participants_for_display) + + def _validate_campaign_inputs(self, name: str, month: int) -> bool: + if not name.strip(): + QMessageBox.warning( + self.app.view, "Invalid name", "Campaign name cannot be empty." + ) + return False + if not (1 <= month <= 12): + QMessageBox.warning( + self.app.view, "Invalid month", "Month must be between 1 and 12." + ) + return False + return True + + def add_campaign(self) -> None: + if not self.app.navigation.selected_war_id: + return + dialog = CampaignDialog( + self.app.view, + default_month=self.app.model.get_default_campaign_values( + self.app.navigation.selected_war_id + )["month"], + ) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + name = dialog.get_campaign_name() + month = dialog.get_campaign_month() + if not self._validate_campaign_inputs(name, month): + return + camp = self.app.model.add_campaign( + self.app.navigation.selected_war_id, name, month + ) + self.app.is_dirty = True + self.app.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.CAMPAIGN, item_id=camp.id + ) + + def edit_campaign(self, campaign_id: str) -> None: + camp = self.app.model.get_campaign(campaign_id) + camp_dialog = CampaignDialog( + self.app.view, default_name=camp.name, default_month=camp.month + ) + if camp_dialog.exec() == QDialog.DialogCode.Accepted: + name = camp_dialog.get_campaign_name() + month = camp_dialog.get_campaign_month() + if not self._validate_campaign_inputs(name, month): + return + self.app.model.update_campaign(campaign_id, name=name, month=month) + + # Campaign participant methods + + def add_campaign_participant(self) -> None: + if not self.app.navigation.selected_campaign_id: + return + participants = self.app.model.get_available_war_participants( + self.app.navigation.selected_campaign_id + ) + part_opts = [ + ParticipantOption(id=p.id, name=self.app.model.get_player_name(p.player_id)) + for p in participants + ] + dialog = CampaignParticipantDialog(self.app.view, participants=part_opts) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + player_id = dialog.get_player_id() + leader = dialog.get_participant_leader() + theme = dialog.get_participant_theme() + if not player_id: + return + self.app.model.add_campaign_participant( + self.app.navigation.selected_campaign_id, player_id, leader, theme + ) + self.app.is_dirty = True + self.app.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + + def edit_campaign_participant(self, participant_id: str) -> None: + camp_part = self.app.model.get_campaign_participant(participant_id) + war_part = self.app.model.get_war_participant(camp_part.war_participant_id) + player = self.app.model.get_player(war_part.player_id) + part_opt = [ParticipantOption(id=player.id, name=player.name)] + camp_part_dialog = CampaignParticipantDialog( + self.app.view, + participants=part_opt, + default_participant_id=camp_part.id, + default_leader=camp_part.leader, + default_theme=camp_part.theme, + editable_player=False, + ) + if camp_part_dialog.exec() == QDialog.DialogCode.Accepted: + leader = camp_part_dialog.get_participant_leader() + theme = camp_part_dialog.get_participant_theme() + self.app.model.update_campaign_participant( + participant_id, leader=leader, theme=theme + ) + + # Sector methods + + def _validate_sector_inputs( + self, name: str, round_id: str, major_id: str, minor_id: str, influence_id: str + ) -> bool: + + if not name.strip(): + QMessageBox.warning( + self.app.view, "Invalid name", "Sector name cannot be empty." + ) + return False + # allow same objectives in different fields? + return True + + def add_sector(self) -> None: + if not self.app.navigation.selected_campaign_id: + return + war = self.app.model.get_war_by_campaign( + self.app.navigation.selected_campaign_id + ) + camp = self.app.model.get_campaign(self.app.navigation.selected_campaign_id) + rounds = camp.get_all_rounds() + rnd_objs: List[RoundDTO] = [ + RoundDTO(id=rnd.id, index=camp.get_round_index(rnd.id)) for rnd in rounds + ] + objectives = war.get_all_objectives() + obj_dtos: List[ObjectiveDTO] = [ + ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) + for obj in objectives + ] + dialog = SectorDialog( + self.app.view, default_name="", rounds=rnd_objs, objectives=obj_dtos + ) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + name = dialog.get_sector_name() + round_id = dialog.get_round_id() + major_id = dialog.get_major_id() + minor_id = dialog.get_minor_id() + influence_id = dialog.get_influence_id() + if not self._validate_sector_inputs( + name, round_id, major_id, minor_id, influence_id + ): + return + self.app.model.add_sector( + self.app.navigation.selected_campaign_id, + name, + round_id, + major_id, + minor_id, + influence_id, + ) + self.app.is_dirty = True + self.app.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + + def edit_sector(self, sector_id: str) -> None: + sect = self.app.model.get_sector(sector_id) + camp = self.app.model.get_campaign_by_sector(sector_id) + war = self.app.model.get_war_by_campaign(camp.id) + rounds = camp.get_all_rounds() + rnd_dto: List[RoundDTO] = [ + RoundDTO(id=rnd.id, index=i) for i, rnd in enumerate(rounds, start=1) + ] + objectives = war.get_all_objectives() + obj_dto: List[ObjectiveDTO] = [ + ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) + for obj in objectives + ] + sect_dialog = SectorDialog( + self.app.view, + default_name=sect.name, + rounds=rnd_dto, + default_round_id=sect.round_id, + objectives=obj_dto, + default_major_id=sect.major_objective_id, + default_minor_id=sect.minor_objective_id, + default_influence_id=sect.influence_objective_id, + ) + if sect_dialog.exec() == QDialog.DialogCode.Accepted: + name = sect_dialog.get_sector_name() + round_id = sect_dialog.get_round_id() + major_id = sect_dialog.get_major_id() + minor_id = sect_dialog.get_minor_id() + influence_id = sect_dialog.get_influence_id() + self.app.model.update_sector( + sector_id, + name=name, + round_id=round_id, + major_id=major_id, + minor_id=minor_id, + influence_id=influence_id, + ) diff --git a/src/warchron/controller/controller.py b/src/warchron/controller/controller.py deleted file mode 100644 index 2cbd73c..0000000 --- a/src/warchron/controller/controller.py +++ /dev/null @@ -1,903 +0,0 @@ -from typing import List -from pathlib import Path - -from PyQt6.QtWidgets import QMessageBox, QDialog - -from warchron.model.model import Model -from warchron.model.exception import ( - DeletionForbidden, - DeletionRequiresConfirmation, - UpdateRequiresConfirmation, -) -from warchron.view.view import View -from warchron.constants import ItemType, RefreshScope -from warchron.controller.dtos import ( - ParticipantOption, - TreeSelection, - WarDTO, - WarParticipantDTO, - ObjectiveDTO, - CampaignDTO, - CampaignParticipantDTO, - SectorDTO, - RoundDTO, - ChoiceDTO, - BattleDTO, -) -from warchron.view.player_dialog import PlayerDialog -from warchron.view.war_dialog import WarDialog -from warchron.view.campaign_dialog import CampaignDialog -from warchron.view.objective_dialog import ObjectiveDialog -from warchron.view.war_participant_dialog import WarParticipantDialog -from warchron.view.campaign_participant_dialog import CampaignParticipantDialog -from warchron.view.sector_dialog import SectorDialog -from warchron.view.choices_dialog import ChoicesDialog -from warchron.view.battles_dialog import BattlesDialog - - -class Controller: - def __init__(self, model: Model, view: View) -> None: - self.model: Model = model - self.view: View = view - self.current_file: Path | None = None - self.selected_war_id: str | None = None - self.selected_campaign_id: str | None = None - self.selected_round_id: str | None = None - self.view.on_close_callback = self.on_app_close - self.is_dirty: bool = False - self.__connect() - self.refresh_players_view() - self.refresh_wars_view() - self.update_window_title() - self.update_actions_state() - self.view.on_tree_selection_changed = self.on_tree_selection_changed - self.view.on_add_campaign = self.add_campaign - self.view.on_add_round = self.add_round - - def __connect(self) -> None: - self.view.actionExit.triggered.connect(self.view.close) - self.view.actionNew.triggered.connect(self.new) - self.view.actionOpen.triggered.connect(self.open_file) - self.view.actionSave.triggered.connect(self.save) - self.view.actionSave_as.triggered.connect(self.save_as) - self.view.addPlayerBtn.clicked.connect(self.add_player) - self.view.addWarBtn.clicked.connect(self.add_war) - self.view.addObjectiveBtn.clicked.connect(self.add_objective) - self.view.addWarParticipantBtn.clicked.connect(self.add_war_participant) - self.view.addSectorBtn.clicked.connect(self.add_sector) - self.view.addCampaignParticipantBtn.clicked.connect( - self.add_campaign_participant - ) - self.view.on_edit_item = self.edit_item - self.view.on_delete_item = self.delete_item - - def on_app_close(self) -> bool: - if self.is_dirty: - reply = QMessageBox.question( - self.view, - "Unsaved changes", - "You have unsaved changes. Do you want to save before quitting?", - QMessageBox.StandardButton.Yes - | QMessageBox.StandardButton.No - | QMessageBox.StandardButton.Cancel, - ) - if reply == QMessageBox.StandardButton.Yes: - self.save() - elif reply == QMessageBox.StandardButton.Cancel: - return False - return True - - # Menu bar methods - - def new(self) -> None: - if self.is_dirty: - reply = QMessageBox.question( - self.view, - "Unsaved changes", - "Discard current campaign?", - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - ) - if reply != QMessageBox.StandardButton.Yes: - return - self.model.new() - self.current_file = None - self.is_dirty = False - self.refresh_players_view() - self.refresh_wars_view() - self.update_window_title() - - def open_file(self) -> None: - if self.is_dirty: - reply = QMessageBox.question( - self.view, - "Unsaved changes", - "Discard current campaign?", - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - ) - if reply != QMessageBox.StandardButton.Yes: - return - path = self.view.ask_open_file() - if not path: - return - self.model.load(path) - self.current_file = path - self.is_dirty = False - self.refresh_players_view() - self.refresh_wars_view() - self.update_window_title() - - def save(self) -> None: - if not self.current_file: - self.save_as() - return - self.model.save(self.current_file) - self.is_dirty = False - self.update_window_title() - - def save_as(self) -> None: - path = self.view.ask_save_file() - if not path: - return - self.current_file = path - self.model.save(path) - self.is_dirty = False - self.update_window_title() - - # Display methods - - def update_window_title(self) -> None: - base = "WarChron" - if self.current_file: - base += f" - {self.current_file.name}" - else: - base += " - New file" - if self.is_dirty: - base = base + " *" - self.view.setWindowTitle(base) - - def refresh_players_view(self) -> None: - players = self.model.get_all_players() - players_for_display: List[ParticipantOption] = [ - ParticipantOption(id=p.id, name=p.name) for p in players - ] - self.view.display_players(players_for_display) - - def refresh_wars_view(self) -> None: - wars: List[WarDTO] = [ - WarDTO( - id=w.id, - name=w.name, - year=w.year, - _campaigns=[ - CampaignDTO( - id=c.id, - name=c.name, - month=c.month, - _rounds=[ - RoundDTO(id=r.id, index=c.get_round_index(r.id)) - for r in c.get_all_rounds() - ], - ) - for c in w.get_all_campaigns() - ], - ) - for w in self.model.get_all_wars() - ] - self.view.display_wars_tree(wars) - - def _fill_war_details(self, war_id: str) -> None: - war = self.model.get_war(war_id) - self.view.show_war_details(name=war.name, year=war.year) - objectives = war.get_all_objectives() - objectives_for_display: List[ObjectiveDTO] = [ - ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) - for obj in objectives - ] - self.view.display_war_objectives(objectives_for_display) - war_parts = war.get_all_war_participants() - participants_for_display: List[WarParticipantDTO] = [ - WarParticipantDTO( - id=p.id, - player_name=self.model.get_player_name(p.player_id), - faction=p.faction, - ) - for p in war_parts - ] - self.view.display_war_participants(participants_for_display) - - def _fill_campaign_details(self, campaign_id: str) -> None: - camp = self.model.get_campaign(campaign_id) - self.view.show_campaign_details(name=camp.name, month=camp.month) - sectors = camp.get_all_sectors() - war = self.model.get_war_by_campaign(camp.id) - sectors_for_display: List[SectorDTO] = [ - SectorDTO( - id=sect.id, - name=sect.name, - round_index=camp.get_round_index(sect.round_id), - major=war.get_objective_name(sect.major_objective_id), - minor=war.get_objective_name(sect.minor_objective_id), - influence=war.get_objective_name(sect.influence_objective_id), - ) - for sect in sectors - ] - self.view.display_campaign_sectors(sectors_for_display) - camp_parts = camp.get_all_campaign_participants() - participants_for_display: List[CampaignParticipantDTO] = [ - CampaignParticipantDTO( - id=p.id, - player_name=self.model.get_participant_name(p.war_participant_id), - leader=p.leader or "", - theme=p.theme or "", - ) - for p in camp_parts - ] - self.view.display_campaign_participants(participants_for_display) - - def _fill_round_details(self, round_id: str) -> None: - rnd = self.model.get_round(round_id) - camp = self.model.get_campaign_by_round(round_id) - self.view.show_round_details(index=camp.get_round_index(round_id)) - participants = self.model.get_round_participants(round_id) - sectors = camp.get_sectors_in_round(round_id) - choices_for_display: List[ChoiceDTO] = [] - for part in participants: - choice = rnd.get_choice(part.id) - if not choice: - choice = self.model.create_choice( - round_id=rnd.id, participant_id=part.id - ) - priority_name = ( - camp.get_sector_name(choice.priority_sector_id) - if choice.priority_sector_id is not None - else "" - ) - secondary_name = ( - camp.get_sector_name(choice.secondary_sector_id) - if choice.secondary_sector_id is not None - else "" - ) - choices_for_display.append( - ChoiceDTO( - id=choice.participant_id, - participant_name=self.model.get_participant_name( - part.war_participant_id - ), - priority_sector=priority_name, - secondary_sector=secondary_name, - comment=choice.comment, - ) - ) - self.view.display_round_choices(choices_for_display) - battles_for_display: List[BattleDTO] = [] - for sect in sectors: - battle = rnd.get_battle(sect.id) - if not battle: - battle = self.model.create_battle(round_id=rnd.id, sector_id=sect.id) - if battle.player_1_id: - camp_part = camp.participants[battle.player_1_id] - player_1_name = self.model.get_participant_name( - camp_part.war_participant_id - ) - else: - player_1_name = "" - if battle.player_2_id: - camp_part = camp.participants[battle.player_2_id] - player_2_name = self.model.get_participant_name( - camp_part.war_participant_id - ) - else: - player_2_name = "" - if battle.winner_id: - camp_part = camp.participants[battle.winner_id] - winner_name = self.model.get_participant_name( - camp_part.war_participant_id - ) - else: - winner_name = "" - battles_for_display.append( - BattleDTO( - id=battle.sector_id, - sector_name=camp.get_sector_name(battle.sector_id), - player_1=player_1_name, - player_2=player_2_name, - winner=winner_name, - score=battle.score, - victory_condition=battle.victory_condition, - comment=battle.comment, - ) - ) - self.view.display_round_battles(battles_for_display) - - def on_tree_selection_changed(self, selection: TreeSelection | None) -> None: - self.selected_war_id = None - self.selected_campaign_id = None - self.selected_round_id = None - if selection: - item_type = selection.type - item_id = selection.id - if item_type == ItemType.WAR: - self.selected_war_id = item_id - self.view.show_details(ItemType.WAR) - self._fill_war_details(item_id) - elif item_type == ItemType.CAMPAIGN: - self.selected_campaign_id = item_id - self.view.show_details(ItemType.CAMPAIGN) - self._fill_campaign_details(item_id) - elif item_type == ItemType.ROUND: - self.selected_round_id = item_id - self.view.show_details(ItemType.ROUND) - self._fill_round_details(item_id) - else: - self.view.show_details(None) - self.update_actions_state() - return - self.update_actions_state() - - def update_actions_state(self) -> None: - self.view.set_add_campaign_enabled(self.selected_war_id is not None) - self.view.set_add_round_enabled(self.selected_campaign_id is not None) - - def refresh(self, scope: RefreshScope) -> None: - match scope: - case RefreshScope.PLAYERS_LIST: - self.refresh_players_view() - case RefreshScope.WARS_TREE: - self.refresh_wars_view() - case RefreshScope.WAR_DETAILS: - if self.selected_war_id: - self.view.show_details(ItemType.WAR) - self._fill_war_details(self.selected_war_id) - case RefreshScope.CAMPAIGN_DETAILS: - if self.selected_campaign_id: - self.view.show_details(ItemType.CAMPAIGN) - self._fill_campaign_details(self.selected_campaign_id) - case RefreshScope.ROUND_DETAILS: - if self.selected_round_id: - self.view.show_details(ItemType.ROUND) - self._fill_round_details(self.selected_round_id) - self.update_window_title() - - # Common command methods - - def refresh_and_select( - self, scope: RefreshScope, *, item_type: ItemType, item_id: str - ) -> None: - self.refresh(scope) - self.view.select_tree_item(item_type=item_type, item_id=item_id) - - def edit_item(self, item_type: str, item_id: str) -> None: - try: - if item_type == ItemType.PLAYER: - self.edit_player(item_id) - self.refresh(RefreshScope.PLAYERS_LIST) - elif item_type == ItemType.WAR: - self.edit_war(item_id) - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.WAR, item_id=item_id - ) - elif item_type == ItemType.CAMPAIGN: - self.edit_campaign(item_id) - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.CAMPAIGN, item_id=item_id - ) - elif item_type == ItemType.OBJECTIVE: - self.edit_objective(item_id) - self.refresh(RefreshScope.WAR_DETAILS) - elif item_type == ItemType.WAR_PARTICIPANT: - self.edit_war_participant(item_id) - self.refresh(RefreshScope.WAR_DETAILS) - elif item_type == ItemType.SECTOR: - self.edit_sector(item_id) - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - elif item_type == ItemType.CAMPAIGN_PARTICIPANT: - self.edit_campaign_participant(item_id) - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - elif item_type == ItemType.CHOICE: - self.edit_round_choice(item_id) - self.refresh(RefreshScope.ROUND_DETAILS) - elif item_type == ItemType.BATTLE: - self.edit_round_battle(item_id) - self.refresh(RefreshScope.ROUND_DETAILS) - self.is_dirty = True - except UpdateRequiresConfirmation as e: - reply = QMessageBox.question( - self.view, - "Confirm update", - e.message, - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - ) - if reply == QMessageBox.StandardButton.Yes: - e.apply_update() - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - - def delete_item(self, item_type: str, item_id: str) -> None: - reply = QMessageBox.question( - self.view, - "Confirm deletion", - "Are you sure you want to delete this item?", - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - ) - if reply != QMessageBox.StandardButton.Yes: - return - try: - if item_type == ItemType.PLAYER: - self.model.remove_player(item_id) - self.refresh(RefreshScope.PLAYERS_LIST) - elif item_type == ItemType.WAR: - self.model.remove_war(item_id) - self.refresh(RefreshScope.WARS_TREE) - elif item_type == ItemType.CAMPAIGN: - war = self.model.get_war_by_campaign(item_id) - war_id = war.id - self.model.remove_campaign(item_id) - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.WAR, item_id=war_id - ) - elif item_type == ItemType.OBJECTIVE: - self.model.remove_objective(item_id) - self.refresh(RefreshScope.WAR_DETAILS) - elif item_type == ItemType.WAR_PARTICIPANT: - self.model.remove_war_participant(item_id) - self.refresh(RefreshScope.WAR_DETAILS) - elif item_type == ItemType.SECTOR: - self.model.remove_sector(item_id) - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - elif item_type == ItemType.CAMPAIGN_PARTICIPANT: - self.model.remove_campaign_participant(item_id) - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - elif item_type == ItemType.ROUND: - camp = self.model.get_campaign_by_round(item_id) - camp_id = camp.id - self.model.remove_round(item_id) - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.CAMPAIGN, item_id=camp_id - ) - self.is_dirty = True - except DeletionForbidden as e: - QMessageBox.warning( - self.view, - "Deletion forbidden", - e.reason, - ) - except DeletionRequiresConfirmation as e: - reply = QMessageBox.question( - self.view, - "Confirm deletion", - e.message, - QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, - ) - if reply == QMessageBox.StandardButton.Yes: - e.cleanup_action() - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - - # Player methods - - def _validate_player_inputs(self, name: str) -> bool: - if not name.strip(): - QMessageBox.warning( - self.view, "Invalid name", "Player name cannot be empty." - ) - return False - return True - - def add_player(self) -> None: - dialog = PlayerDialog(self.view) - result = dialog.exec() # modal blocking dialog - if result == QDialog.DialogCode.Accepted: - name = dialog.get_player_name() - if not self._validate_player_inputs(name): - return - self.model.add_player(name) - self.is_dirty = True - self.refresh(RefreshScope.PLAYERS_LIST) - - def edit_player(self, player_id: str) -> None: - play = self.model.get_player(player_id) - player_dialog = PlayerDialog(self.view, default_name=play.name) - if player_dialog.exec() == QDialog.DialogCode.Accepted: - name = player_dialog.get_player_name() - if not self._validate_player_inputs(name): - return - self.model.update_player(player_id, name=name) - - # War methods - - def _validate_war_inputs(self, name: str, year: int) -> bool: - if not name.strip(): - QMessageBox.warning(self.view, "Invalid name", "War name cannot be empty.") - return False - if not (1970 <= year <= 3000): - QMessageBox.warning( - self.view, "Invalid year", "Year must be between 1970 and 3000." - ) - return False - return True - - def add_war(self) -> None: - dialog = WarDialog( - self.view, default_year=self.model.get_default_war_values()["year"] - ) - result = dialog.exec() # modal blocking dialog - if result == QDialog.DialogCode.Accepted: - name = dialog.get_war_name() - year = dialog.get_war_year() - if not self._validate_war_inputs(name, year): - return - war = self.model.add_war(name, year) - self.is_dirty = True - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.WAR, item_id=war.id - ) - - def edit_war(self, war_id: str) -> None: - war = self.model.get_war(war_id) - war_dialog = WarDialog(self.view, default_name=war.name, default_year=war.year) - if war_dialog.exec() == QDialog.DialogCode.Accepted: - name = war_dialog.get_war_name() - year = war_dialog.get_war_year() - if not self._validate_war_inputs(name, year): - return - self.model.update_war(war_id, name=name, year=year) - - # Objective methods - - def _validate_objective_inputs(self, name: str, description: str) -> bool: - if not name.strip(): - QMessageBox.warning( - self.view, "Invalid name", "Objective name cannot be empty." - ) - return False - return True - - def add_objective(self) -> None: - if not self.selected_war_id: - return - dialog = ObjectiveDialog(self.view) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - name = dialog.get_objective_name() - description = dialog.get_objective_description() - if not self._validate_objective_inputs(name, description): - return - self.model.add_objective(self.selected_war_id, name, description) - self.is_dirty = True - self.refresh(RefreshScope.WAR_DETAILS) - - def edit_objective(self, objective_id: str) -> None: - obj = self.model.get_objective(objective_id) - obj_dialog = ObjectiveDialog( - self.view, default_name=obj.name, default_description=obj.description - ) - if obj_dialog.exec() == QDialog.DialogCode.Accepted: - name = obj_dialog.get_objective_name() - description = obj_dialog.get_objective_description() - if not self._validate_objective_inputs(name, description): - return - self.model.update_objective( - objective_id, name=name, description=description - ) - - # War participant methods - - def add_war_participant(self) -> None: - if not self.selected_war_id: - return - players = self.model.get_available_players(self.selected_war_id) - play_opts: List[ParticipantOption] = [ - ParticipantOption(id=p.id, name=p.name) for p in players - ] - dialog = WarParticipantDialog(self.view, players=play_opts) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - player_id = dialog.get_player_id() - faction = dialog.get_participant_faction() - if not player_id: - return - self.model.add_war_participant(self.selected_war_id, player_id, faction) - self.is_dirty = True - self.refresh(RefreshScope.WAR_DETAILS) - - def edit_war_participant(self, participant_id: str) -> None: - war_part = self.model.get_war_participant(participant_id) - player = self.model.get_player(war_part.player_id) - play_opt = ParticipantOption(id=player.id, name=player.name) - war_part_dialog = WarParticipantDialog( - self.view, - players=[play_opt], - default_player_id=war_part.id, - default_faction=war_part.faction, - editable_player=False, - ) - if war_part_dialog.exec() == QDialog.DialogCode.Accepted: - faction = war_part_dialog.get_participant_faction() - self.model.update_war_participant(participant_id, faction=faction) - - # Campaign methods - - def _validate_campaign_inputs(self, name: str, month: int) -> bool: - if not name.strip(): - QMessageBox.warning( - self.view, "Invalid name", "Campaign name cannot be empty." - ) - return False - if not (1 <= month <= 12): - QMessageBox.warning( - self.view, "Invalid month", "Month must be between 1 and 12." - ) - return False - return True - - def add_campaign(self) -> None: - if not self.selected_war_id: - return - dialog = CampaignDialog( - self.view, - default_month=self.model.get_default_campaign_values(self.selected_war_id)[ - "month" - ], - ) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - name = dialog.get_campaign_name() - month = dialog.get_campaign_month() - if not self._validate_campaign_inputs(name, month): - return - camp = self.model.add_campaign(self.selected_war_id, name, month) - self.is_dirty = True - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.CAMPAIGN, item_id=camp.id - ) - - def edit_campaign(self, campaign_id: str) -> None: - camp = self.model.get_campaign(campaign_id) - camp_dialog = CampaignDialog( - self.view, default_name=camp.name, default_month=camp.month - ) - if camp_dialog.exec() == QDialog.DialogCode.Accepted: - name = camp_dialog.get_campaign_name() - month = camp_dialog.get_campaign_month() - if not self._validate_campaign_inputs(name, month): - return - self.model.update_campaign(campaign_id, name=name, month=month) - - # Campaign participant methods - - def add_campaign_participant(self) -> None: - if not self.selected_campaign_id: - return - participants = self.model.get_available_war_participants( - self.selected_campaign_id - ) - part_opts = [ - ParticipantOption(id=p.id, name=self.model.get_player_name(p.player_id)) - for p in participants - ] - dialog = CampaignParticipantDialog(self.view, participants=part_opts) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - player_id = dialog.get_player_id() - leader = dialog.get_participant_leader() - theme = dialog.get_participant_theme() - if not player_id: - return - self.model.add_campaign_participant( - self.selected_campaign_id, player_id, leader, theme - ) - self.is_dirty = True - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - - def edit_campaign_participant(self, participant_id: str) -> None: - camp_part = self.model.get_campaign_participant(participant_id) - war_part = self.model.get_war_participant(camp_part.war_participant_id) - player = self.model.get_player(war_part.player_id) - part_opt = [ParticipantOption(id=player.id, name=player.name)] - camp_part_dialog = CampaignParticipantDialog( - self.view, - participants=part_opt, - default_participant_id=camp_part.id, - default_leader=camp_part.leader, - default_theme=camp_part.theme, - editable_player=False, - ) - if camp_part_dialog.exec() == QDialog.DialogCode.Accepted: - leader = camp_part_dialog.get_participant_leader() - theme = camp_part_dialog.get_participant_theme() - self.model.update_campaign_participant( - participant_id, leader=leader, theme=theme - ) - - # Sector methods - - def _validate_sector_inputs( - self, name: str, round_id: str, major_id: str, minor_id: str, influence_id: str - ) -> bool: - - if not name.strip(): - QMessageBox.warning( - self.view, "Invalid name", "Sector name cannot be empty." - ) - return False - # allow same objectives in different fields? - return True - - def add_sector(self) -> None: - if not self.selected_campaign_id: - return - war = self.model.get_war_by_campaign(self.selected_campaign_id) - camp = self.model.get_campaign(self.selected_campaign_id) - rounds = camp.get_all_rounds() - rnd_objs: List[RoundDTO] = [ - RoundDTO(id=rnd.id, index=camp.get_round_index(rnd.id)) for rnd in rounds - ] - objectives = war.get_all_objectives() - obj_dtos: List[ObjectiveDTO] = [ - ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) - for obj in objectives - ] - dialog = SectorDialog( - self.view, default_name="", rounds=rnd_objs, objectives=obj_dtos - ) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - name = dialog.get_sector_name() - round_id = dialog.get_round_id() - major_id = dialog.get_major_id() - minor_id = dialog.get_minor_id() - influence_id = dialog.get_influence_id() - if not self._validate_sector_inputs( - name, round_id, major_id, minor_id, influence_id - ): - return - self.model.add_sector( - self.selected_campaign_id, name, round_id, major_id, minor_id, influence_id - ) - self.is_dirty = True - self.refresh(RefreshScope.CAMPAIGN_DETAILS) - - def edit_sector(self, sector_id: str) -> None: - sect = self.model.get_sector(sector_id) - camp = self.model.get_campaign_by_sector(sector_id) - war = self.model.get_war_by_campaign(camp.id) - rounds = camp.get_all_rounds() - rnd_dto: List[RoundDTO] = [ - RoundDTO(id=rnd.id, index=i) for i, rnd in enumerate(rounds, start=1) - ] - objectives = war.get_all_objectives() - obj_dto: List[ObjectiveDTO] = [ - ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) - for obj in objectives - ] - sect_dialog = SectorDialog( - self.view, - default_name=sect.name, - rounds=rnd_dto, - default_round_id=sect.round_id, - objectives=obj_dto, - default_major_id=sect.major_objective_id, - default_minor_id=sect.minor_objective_id, - default_influence_id=sect.influence_objective_id, - ) - if sect_dialog.exec() == QDialog.DialogCode.Accepted: - name = sect_dialog.get_sector_name() - round_id = sect_dialog.get_round_id() - major_id = sect_dialog.get_major_id() - minor_id = sect_dialog.get_minor_id() - influence_id = sect_dialog.get_influence_id() - self.model.update_sector( - sector_id, - name=name, - round_id=round_id, - major_id=major_id, - minor_id=minor_id, - influence_id=influence_id, - ) - - # Round methods - - def add_round(self) -> None: - if not self.selected_campaign_id: - return - rnd = self.model.add_round(self.selected_campaign_id) - self.is_dirty = True - self.refresh_and_select( - RefreshScope.WARS_TREE, item_type=ItemType.ROUND, item_id=rnd.id - ) - - # Choice methods - - def edit_round_choice(self, choice_id: str) -> None: - round_id = self.selected_round_id - if not round_id: - return - war = self.model.get_war_by_round(round_id) - camp = self.model.get_campaign_by_round(round_id) - rnd = camp.get_round(round_id) - sectors = camp.get_sectors_in_round(round_id) - sect_opts: List[SectorDTO] = [ - SectorDTO( - id=sect.id, - name=sect.name, - round_index=camp.get_round_index(sect.round_id), - major=war.get_objective_name(sect.major_objective_id), - minor=war.get_objective_name(sect.minor_objective_id), - influence=war.get_objective_name(sect.influence_objective_id), - ) - for sect in sectors - ] - choice = rnd.get_choice(choice_id) - if not choice: - return - participant = camp.participants[choice.participant_id] - player = self.model.get_player_from_campaign_participant(participant) - part_opt = ParticipantOption(id=participant.id, name=player.name) - dialog = ChoicesDialog( - self.view, - participants=[part_opt], - default_participant_id=participant.id, - sectors=sect_opts, - default_priority_id=choice.priority_sector_id, - default_secondary_id=choice.secondary_sector_id, - default_comment=choice.comment, - ) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - self.model.update_choice( - round_id=round_id, - participant_id=participant.id, - priority_sector_id=dialog.get_priority_id(), - secondary_sector_id=dialog.get_secondary_id(), - comment=dialog.get_comment(), - ) - - # Battle methods - - def edit_round_battle(self, battle_id: str) -> None: - round_id = self.selected_round_id - if not round_id: - return - war = self.model.get_war_by_round(round_id) - camp = self.model.get_campaign_by_round(round_id) - rnd = camp.get_round(round_id) - participants = camp.get_all_campaign_participants() - battle = rnd.get_battle(battle_id) - if not battle: - return - sect = camp.sectors[battle.sector_id] - sect_dto = SectorDTO( - id=sect.id, - name=sect.name, - round_index=camp.get_round_index(sect.round_id), - major=war.get_objective_name(sect.major_objective_id), - minor=war.get_objective_name(sect.minor_objective_id), - influence=war.get_objective_name(sect.influence_objective_id), - ) - - part_opts: List[ParticipantOption] = [] - for participant in participants: - player = self.model.get_player_from_campaign_participant(participant) - part_opts.append(ParticipantOption(id=participant.id, name=player.name)) - dialog = BattlesDialog( - self.view, - sectors=[sect_dto], - default_sector_id=sect.id, - players=part_opts, - default_player_1_id=battle.player_1_id, - default_player_2_id=battle.player_2_id, - default_winner_id=battle.winner_id, - default_score=battle.score, - default_victory_condition=battle.victory_condition, - default_comment=battle.comment, - ) - if dialog.exec() != QDialog.DialogCode.Accepted: - return - self.model.update_battle( - round_id=round_id, - sector_id=sect.id, - player_1_id=dialog.get_player_1_id(), - player_2_id=dialog.get_player_2_id(), - winner_id=dialog.get_winner_id(), - score=dialog.get_score(), - victory_condition=dialog.get_victory_condition(), - comment=dialog.get_comment(), - ) diff --git a/src/warchron/controller/navigation_controller.py b/src/warchron/controller/navigation_controller.py new file mode 100644 index 0000000..40491d1 --- /dev/null +++ b/src/warchron/controller/navigation_controller.py @@ -0,0 +1,111 @@ +from typing import List, TYPE_CHECKING + +from warchron.constants import ItemType, RefreshScope + +if TYPE_CHECKING: + from warchron.controller.app_controller import AppController +from warchron.controller.dtos import ( + TreeSelection, + ParticipantOption, + WarDTO, + CampaignDTO, + RoundDTO, +) + + +class NavigationController: + def __init__(self, app: "AppController"): + self.app: AppController = app + self.selected_war_id: str | None = None + self.selected_campaign_id: str | None = None + self.selected_round_id: str | None = None + self.update_actions_state() + + # Display methods + + def refresh_players_view(self) -> None: + players = self.app.model.get_all_players() + players_for_display: List[ParticipantOption] = [ + ParticipantOption(id=p.id, name=p.name) for p in players + ] + self.app.view.display_players(players_for_display) + + def refresh_wars_view(self) -> None: + wars: List[WarDTO] = [ + WarDTO( + id=w.id, + name=w.name, + year=w.year, + _campaigns=[ + CampaignDTO( + id=c.id, + name=c.name, + month=c.month, + _rounds=[ + RoundDTO(id=r.id, index=c.get_round_index(r.id)) + for r in c.get_all_rounds() + ], + ) + for c in w.get_all_campaigns() + ], + ) + for w in self.app.model.get_all_wars() + ] + self.app.view.display_wars_tree(wars) + + def refresh(self, scope: RefreshScope) -> None: + match scope: + case RefreshScope.PLAYERS_LIST: + self.app.navigation.refresh_players_view() + case RefreshScope.WARS_TREE: + self.app.navigation.refresh_wars_view() + case RefreshScope.WAR_DETAILS: + if self.selected_war_id: + self.app.view.show_details(ItemType.WAR) + self.app.wars._fill_war_details(self.selected_war_id) + case RefreshScope.CAMPAIGN_DETAILS: + if self.selected_campaign_id: + self.app.view.show_details(ItemType.CAMPAIGN) + self.app.campaigns._fill_campaign_details(self.selected_campaign_id) + case RefreshScope.ROUND_DETAILS: + if self.selected_round_id: + self.app.view.show_details(ItemType.ROUND) + self.app.rounds._fill_round_details(self.selected_round_id) + self.app.update_window_title() + + def refresh_and_select( + self, scope: RefreshScope, *, item_type: ItemType, item_id: str + ) -> None: + self.refresh(scope) + self.app.view.select_tree_item(item_type=item_type, item_id=item_id) + + # Commands methods + + def on_tree_selection_changed(self, selection: TreeSelection | None) -> None: + self.selected_war_id = None + self.selected_campaign_id = None + self.selected_round_id = None + if selection: + item_type = selection.type + item_id = selection.id + if item_type == ItemType.WAR: + self.selected_war_id = item_id + self.app.view.show_details(ItemType.WAR) + self.app.wars._fill_war_details(item_id) + elif item_type == ItemType.CAMPAIGN: + self.selected_campaign_id = item_id + self.app.view.show_details(ItemType.CAMPAIGN) + self.app.campaigns._fill_campaign_details(item_id) + elif item_type == ItemType.ROUND: + self.selected_round_id = item_id + self.app.view.show_details(ItemType.ROUND) + self.app.rounds._fill_round_details(item_id) + else: + self.app.view.show_details(None) + self.update_actions_state() + return + self.update_actions_state() + + def update_actions_state(self) -> None: + self.app.view.set_add_campaign_enabled(self.selected_war_id is not None) + self.app.view.set_add_round_enabled(self.selected_campaign_id is not None) diff --git a/src/warchron/controller/player_controller.py b/src/warchron/controller/player_controller.py new file mode 100644 index 0000000..d461182 --- /dev/null +++ b/src/warchron/controller/player_controller.py @@ -0,0 +1,42 @@ +from typing import TYPE_CHECKING + +from PyQt6.QtWidgets import QMessageBox, QDialog + +from warchron.constants import RefreshScope + +if TYPE_CHECKING: + from warchron.controller.app_controller import AppController +from warchron.view.player_dialog import PlayerDialog + + +class PlayerController: + def __init__(self, app: "AppController"): + self.app: AppController = app + + def _validate_player_inputs(self, name: str) -> bool: + if not name.strip(): + QMessageBox.warning( + self.app.view, "Invalid name", "Player name cannot be empty." + ) + return False + return True + + def add_player(self) -> None: + dialog = PlayerDialog(self.app.view) + result = dialog.exec() # modal blocking dialog + if result == QDialog.DialogCode.Accepted: + name = dialog.get_player_name() + if not self._validate_player_inputs(name): + return + self.app.model.add_player(name) + self.app.is_dirty = True + self.app.navigation.refresh(RefreshScope.PLAYERS_LIST) + + def edit_player(self, player_id: str) -> None: + play = self.app.model.get_player(player_id) + player_dialog = PlayerDialog(self.app.view, default_name=play.name) + if player_dialog.exec() == QDialog.DialogCode.Accepted: + name = player_dialog.get_player_name() + if not self._validate_player_inputs(name): + return + self.app.model.update_player(player_id, name=name) diff --git a/src/warchron/controller/round_controller.py b/src/warchron/controller/round_controller.py new file mode 100644 index 0000000..41dde70 --- /dev/null +++ b/src/warchron/controller/round_controller.py @@ -0,0 +1,201 @@ +from typing import List, TYPE_CHECKING + +from PyQt6.QtWidgets import QDialog + +from warchron.constants import ItemType, RefreshScope + +if TYPE_CHECKING: + from warchron.controller.app_controller import AppController +from warchron.controller.dtos import ParticipantOption, SectorDTO, ChoiceDTO, BattleDTO + +from warchron.view.choices_dialog import ChoicesDialog +from warchron.view.battles_dialog import BattlesDialog + + +class RoundController: + def __init__(self, app: "AppController"): + self.app = app + + def _fill_round_details(self, round_id: str) -> None: + rnd = self.app.model.get_round(round_id) + camp = self.app.model.get_campaign_by_round(round_id) + self.app.view.show_round_details(index=camp.get_round_index(round_id)) + participants = self.app.model.get_round_participants(round_id) + sectors = camp.get_sectors_in_round(round_id) + choices_for_display: List[ChoiceDTO] = [] + for part in participants: + choice = rnd.get_choice(part.id) + if not choice: + choice = self.app.model.create_choice( + round_id=rnd.id, participant_id=part.id + ) + priority_name = ( + camp.get_sector_name(choice.priority_sector_id) + if choice.priority_sector_id is not None + else "" + ) + secondary_name = ( + camp.get_sector_name(choice.secondary_sector_id) + if choice.secondary_sector_id is not None + else "" + ) + choices_for_display.append( + ChoiceDTO( + id=choice.participant_id, + participant_name=self.app.model.get_participant_name( + part.war_participant_id + ), + priority_sector=priority_name, + secondary_sector=secondary_name, + comment=choice.comment, + ) + ) + self.app.view.display_round_choices(choices_for_display) + battles_for_display: List[BattleDTO] = [] + for sect in sectors: + battle = rnd.get_battle(sect.id) + if not battle: + battle = self.app.model.create_battle( + round_id=rnd.id, sector_id=sect.id + ) + if battle.player_1_id: + camp_part = camp.participants[battle.player_1_id] + player_1_name = self.app.model.get_participant_name( + camp_part.war_participant_id + ) + else: + player_1_name = "" + if battle.player_2_id: + camp_part = camp.participants[battle.player_2_id] + player_2_name = self.app.model.get_participant_name( + camp_part.war_participant_id + ) + else: + player_2_name = "" + if battle.winner_id: + camp_part = camp.participants[battle.winner_id] + winner_name = self.app.model.get_participant_name( + camp_part.war_participant_id + ) + else: + winner_name = "" + battles_for_display.append( + BattleDTO( + id=battle.sector_id, + sector_name=camp.get_sector_name(battle.sector_id), + player_1=player_1_name, + player_2=player_2_name, + winner=winner_name, + score=battle.score, + victory_condition=battle.victory_condition, + comment=battle.comment, + ) + ) + self.app.view.display_round_battles(battles_for_display) + + def add_round(self) -> None: + if not self.app.navigation.selected_campaign_id: + return + rnd = self.app.model.add_round(self.app.navigation.selected_campaign_id) + self.app.is_dirty = True + self.app.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.ROUND, item_id=rnd.id + ) + + # Choice methods + + def edit_round_choice(self, choice_id: str) -> None: + round_id = self.app.navigation.selected_round_id + if not round_id: + return + war = self.app.model.get_war_by_round(round_id) + camp = self.app.model.get_campaign_by_round(round_id) + rnd = camp.get_round(round_id) + sectors = camp.get_sectors_in_round(round_id) + sect_opts: List[SectorDTO] = [ + SectorDTO( + id=sect.id, + name=sect.name, + round_index=camp.get_round_index(sect.round_id), + major=war.get_objective_name(sect.major_objective_id), + minor=war.get_objective_name(sect.minor_objective_id), + influence=war.get_objective_name(sect.influence_objective_id), + ) + for sect in sectors + ] + choice = rnd.get_choice(choice_id) + if not choice: + return + participant = camp.participants[choice.participant_id] + player = self.app.model.get_player_from_campaign_participant(participant) + part_opt = ParticipantOption(id=participant.id, name=player.name) + dialog = ChoicesDialog( + self.app.view, + participants=[part_opt], + default_participant_id=participant.id, + sectors=sect_opts, + default_priority_id=choice.priority_sector_id, + default_secondary_id=choice.secondary_sector_id, + default_comment=choice.comment, + ) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + self.app.model.update_choice( + round_id=round_id, + participant_id=participant.id, + priority_sector_id=dialog.get_priority_id(), + secondary_sector_id=dialog.get_secondary_id(), + comment=dialog.get_comment(), + ) + + # Battle methods + + def edit_round_battle(self, battle_id: str) -> None: + round_id = self.app.navigation.selected_round_id + if not round_id: + return + war = self.app.model.get_war_by_round(round_id) + camp = self.app.model.get_campaign_by_round(round_id) + rnd = camp.get_round(round_id) + participants = camp.get_all_campaign_participants() + battle = rnd.get_battle(battle_id) + if not battle: + return + sect = camp.sectors[battle.sector_id] + sect_dto = SectorDTO( + id=sect.id, + name=sect.name, + round_index=camp.get_round_index(sect.round_id), + major=war.get_objective_name(sect.major_objective_id), + minor=war.get_objective_name(sect.minor_objective_id), + influence=war.get_objective_name(sect.influence_objective_id), + ) + + part_opts: List[ParticipantOption] = [] + for participant in participants: + player = self.app.model.get_player_from_campaign_participant(participant) + part_opts.append(ParticipantOption(id=participant.id, name=player.name)) + dialog = BattlesDialog( + self.app.view, + sectors=[sect_dto], + default_sector_id=sect.id, + players=part_opts, + default_player_1_id=battle.player_1_id, + default_player_2_id=battle.player_2_id, + default_winner_id=battle.winner_id, + default_score=battle.score, + default_victory_condition=battle.victory_condition, + default_comment=battle.comment, + ) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + self.app.model.update_battle( + round_id=round_id, + sector_id=sect.id, + player_1_id=dialog.get_player_1_id(), + player_2_id=dialog.get_player_2_id(), + winner_id=dialog.get_winner_id(), + score=dialog.get_score(), + victory_condition=dialog.get_victory_condition(), + comment=dialog.get_comment(), + ) diff --git a/src/warchron/controller/war_controller.py b/src/warchron/controller/war_controller.py new file mode 100644 index 0000000..7c2d867 --- /dev/null +++ b/src/warchron/controller/war_controller.py @@ -0,0 +1,161 @@ +from typing import List, TYPE_CHECKING + +from PyQt6.QtWidgets import QMessageBox, QDialog + +from warchron.constants import ItemType, RefreshScope + +if TYPE_CHECKING: + from warchron.controller.app_controller import AppController +from warchron.controller.dtos import ( + ParticipantOption, + WarParticipantDTO, + ObjectiveDTO, +) +from warchron.view.war_dialog import WarDialog +from warchron.view.objective_dialog import ObjectiveDialog +from warchron.view.war_participant_dialog import WarParticipantDialog + + +class WarController: + def __init__(self, app: "AppController"): + self.app = app + + def _fill_war_details(self, war_id: str) -> None: + war = self.app.model.get_war(war_id) + self.app.view.show_war_details(name=war.name, year=war.year) + objectives = war.get_all_objectives() + objectives_for_display: List[ObjectiveDTO] = [ + ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) + for obj in objectives + ] + self.app.view.display_war_objectives(objectives_for_display) + war_parts = war.get_all_war_participants() + participants_for_display: List[WarParticipantDTO] = [ + WarParticipantDTO( + id=p.id, + player_name=self.app.model.get_player_name(p.player_id), + faction=p.faction, + ) + for p in war_parts + ] + self.app.view.display_war_participants(participants_for_display) + + def _validate_war_inputs(self, name: str, year: int) -> bool: + if not name.strip(): + QMessageBox.warning( + self.app.view, "Invalid name", "War name cannot be empty." + ) + return False + if not (1970 <= year <= 3000): + QMessageBox.warning( + self.app.view, "Invalid year", "Year must be between 1970 and 3000." + ) + return False + return True + + def add_war(self) -> None: + dialog = WarDialog( + self.app.view, default_year=self.app.model.get_default_war_values()["year"] + ) + result = dialog.exec() # modal blocking dialog + if result == QDialog.DialogCode.Accepted: + name = dialog.get_war_name() + year = dialog.get_war_year() + if not self._validate_war_inputs(name, year): + return + war = self.app.model.add_war(name, year) + self.app.is_dirty = True + self.app.navigation.refresh_and_select( + RefreshScope.WARS_TREE, item_type=ItemType.WAR, item_id=war.id + ) + + def edit_war(self, war_id: str) -> None: + war = self.app.model.get_war(war_id) + war_dialog = WarDialog( + self.app.view, default_name=war.name, default_year=war.year + ) + if war_dialog.exec() == QDialog.DialogCode.Accepted: + name = war_dialog.get_war_name() + year = war_dialog.get_war_year() + if not self._validate_war_inputs(name, year): + return + self.app.model.update_war(war_id, name=name, year=year) + + # Objective methods + + def _validate_objective_inputs(self, name: str, description: str) -> bool: + if not name.strip(): + QMessageBox.warning( + self.app.view, "Invalid name", "Objective name cannot be empty." + ) + return False + return True + + def add_objective(self) -> None: + if not self.app.navigation.selected_war_id: + return + dialog = ObjectiveDialog(self.app.view) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + name = dialog.get_objective_name() + description = dialog.get_objective_description() + if not self._validate_objective_inputs(name, description): + return + self.app.model.add_objective( + self.app.navigation.selected_war_id, name, description + ) + self.app.is_dirty = True + self.app.navigation.refresh(RefreshScope.WAR_DETAILS) + + def edit_objective(self, objective_id: str) -> None: + obj = self.app.model.get_objective(objective_id) + obj_dialog = ObjectiveDialog( + self.app.view, default_name=obj.name, default_description=obj.description + ) + if obj_dialog.exec() == QDialog.DialogCode.Accepted: + name = obj_dialog.get_objective_name() + description = obj_dialog.get_objective_description() + if not self._validate_objective_inputs(name, description): + return + self.app.model.update_objective( + objective_id, name=name, description=description + ) + + # War participant methods + + def add_war_participant(self) -> None: + if not self.app.navigation.selected_war_id: + return + players = self.app.model.get_available_players( + self.app.navigation.selected_war_id + ) + play_opts: List[ParticipantOption] = [ + ParticipantOption(id=p.id, name=p.name) for p in players + ] + dialog = WarParticipantDialog(self.app.view, players=play_opts) + if dialog.exec() != QDialog.DialogCode.Accepted: + return + player_id = dialog.get_player_id() + faction = dialog.get_participant_faction() + if not player_id: + return + self.app.model.add_war_participant( + self.app.navigation.selected_war_id, player_id, faction + ) + self.app.is_dirty = True + self.app.navigation.refresh(RefreshScope.WAR_DETAILS) + + def edit_war_participant(self, participant_id: str) -> None: + war_part = self.app.model.get_war_participant(participant_id) + player = self.app.model.get_player(war_part.player_id) + play_opt = ParticipantOption(id=player.id, name=player.name) + war_part_dialog = WarParticipantDialog( + self.app.view, + players=[play_opt], + default_player_id=war_part.id, + default_faction=war_part.faction, + editable_player=False, + ) + if war_part_dialog.exec() == QDialog.DialogCode.Accepted: + faction = war_part_dialog.get_participant_faction() + self.app.model.update_war_participant(participant_id, faction=faction) diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py index 8e1cd65..02bff79 100644 --- a/src/warchron/view/ui/ui_main_window.py +++ b/src/warchron/view/ui/ui_main_window.py @@ -118,6 +118,31 @@ class Ui_MainWindow(object): self.addWarParticipantBtn.setObjectName("addWarParticipantBtn") self.horizontalLayout_10.addWidget(self.addWarParticipantBtn) self.gridLayout_3.addLayout(self.horizontalLayout_10, 4, 0, 1, 4) + self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar) + self.labelObjectives.setObjectName("labelObjectives") + self.gridLayout_3.addWidget(self.labelObjectives, 1, 0, 1, 1) + self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar) + self.endWarBtn.setEnabled(True) + self.endWarBtn.setObjectName("endWarBtn") + self.gridLayout_3.addWidget(self.endWarBtn, 5, 1, 1, 1) + self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar) + self.labelParticipants.setObjectName("labelParticipants") + self.gridLayout_3.addWidget(self.labelParticipants, 3, 0, 1, 1) + self.horizontalLayout_8 = QtWidgets.QHBoxLayout() + self.horizontalLayout_8.setObjectName("horizontalLayout_8") + self.warName = QtWidgets.QLabel(parent=self.pageWar) + font = QtGui.QFont() + font.setPointSize(12) + self.warName.setFont(font) + self.warName.setObjectName("warName") + self.horizontalLayout_8.addWidget(self.warName) + self.warYear = QtWidgets.QLabel(parent=self.pageWar) + font = QtGui.QFont() + font.setPointSize(12) + self.warYear.setFont(font) + self.warYear.setObjectName("warYear") + self.horizontalLayout_8.addWidget(self.warYear) + self.gridLayout_3.addLayout(self.horizontalLayout_8, 0, 0, 1, 4) self.horizontalLayout_9 = QtWidgets.QHBoxLayout() self.horizontalLayout_9.setObjectName("horizontalLayout_9") self.objectivesTable = QtWidgets.QTableWidget(parent=self.pageWar) @@ -136,32 +161,45 @@ class Ui_MainWindow(object): self.addObjectiveBtn.setFont(font) self.addObjectiveBtn.setObjectName("addObjectiveBtn") self.horizontalLayout_9.addWidget(self.addObjectiveBtn) + self.verticalLayout_2 = QtWidgets.QVBoxLayout() + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.label = QtWidgets.QLabel(parent=self.pageWar) + self.label.setObjectName("label") + self.verticalLayout_2.addWidget(self.label) + self.horizontalLayout_5 = QtWidgets.QHBoxLayout() + self.horizontalLayout_5.setObjectName("horizontalLayout_5") + self.majorValue = QtWidgets.QSpinBox(parent=self.pageWar) + self.majorValue.setMinimum(1) + self.majorValue.setObjectName("majorValue") + self.horizontalLayout_5.addWidget(self.majorValue) + self.label_5 = QtWidgets.QLabel(parent=self.pageWar) + self.label_5.setObjectName("label_5") + self.horizontalLayout_5.addWidget(self.label_5) + self.verticalLayout_2.addLayout(self.horizontalLayout_5) + self.label_2 = QtWidgets.QLabel(parent=self.pageWar) + self.label_2.setObjectName("label_2") + self.verticalLayout_2.addWidget(self.label_2) + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.minorValue = QtWidgets.QSpinBox(parent=self.pageWar) + self.minorValue.setMinimum(1) + self.minorValue.setObjectName("minorValue") + self.horizontalLayout_4.addWidget(self.minorValue) + self.label_4 = QtWidgets.QLabel(parent=self.pageWar) + self.label_4.setObjectName("label_4") + self.horizontalLayout_4.addWidget(self.label_4) + self.verticalLayout_2.addLayout(self.horizontalLayout_4) + self.label_3 = QtWidgets.QLabel(parent=self.pageWar) + self.label_3.setObjectName("label_3") + self.verticalLayout_2.addWidget(self.label_3) + self.influenceToken = QtWidgets.QCheckBox(parent=self.pageWar) + self.influenceToken.setEnabled(False) + self.influenceToken.setCheckable(True) + self.influenceToken.setChecked(True) + self.influenceToken.setObjectName("influenceToken") + self.verticalLayout_2.addWidget(self.influenceToken) + self.horizontalLayout_9.addLayout(self.verticalLayout_2) self.gridLayout_3.addLayout(self.horizontalLayout_9, 2, 0, 1, 4) - self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar) - self.endWarBtn.setEnabled(True) - self.endWarBtn.setObjectName("endWarBtn") - self.gridLayout_3.addWidget(self.endWarBtn, 5, 1, 1, 1) - self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar) - self.labelParticipants.setObjectName("labelParticipants") - self.gridLayout_3.addWidget(self.labelParticipants, 3, 0, 1, 1) - self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar) - self.labelObjectives.setObjectName("labelObjectives") - self.gridLayout_3.addWidget(self.labelObjectives, 1, 0, 1, 1) - self.horizontalLayout_8 = QtWidgets.QHBoxLayout() - self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.warName = QtWidgets.QLabel(parent=self.pageWar) - font = QtGui.QFont() - font.setPointSize(12) - self.warName.setFont(font) - self.warName.setObjectName("warName") - self.horizontalLayout_8.addWidget(self.warName) - self.warYear = QtWidgets.QLabel(parent=self.pageWar) - font = QtGui.QFont() - font.setPointSize(12) - self.warYear.setFont(font) - self.warYear.setObjectName("warYear") - self.horizontalLayout_8.addWidget(self.warYear) - self.gridLayout_3.addLayout(self.horizontalLayout_8, 0, 0, 1, 4) self.selectedDetailsStack.addWidget(self.pageWar) self.pageCampaign = QtWidgets.QWidget() self.pageCampaign.setObjectName("pageCampaign") @@ -309,7 +347,7 @@ class Ui_MainWindow(object): self.verticalLayout.addWidget(self.tabWidget) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(parent=MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1288, 21)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1288, 22)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(parent=self.menubar) self.menuFile.setObjectName("menuFile") @@ -415,16 +453,22 @@ class Ui_MainWindow(object): item = self.warParticipantsTable.horizontalHeaderItem(4) item.setText(_translate("MainWindow", "Theme pts")) self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant")) + self.labelObjectives.setText(_translate("MainWindow", "Objectives")) + self.endWarBtn.setText(_translate("MainWindow", "End war")) + self.labelParticipants.setText(_translate("MainWindow", "Participants")) + self.warName.setText(_translate("MainWindow", "warName")) + self.warYear.setText(_translate("MainWindow", "warYear")) item = self.objectivesTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.objectivesTable.horizontalHeaderItem(1) item.setText(_translate("MainWindow", "Description")) self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective")) - self.endWarBtn.setText(_translate("MainWindow", "End war")) - self.labelParticipants.setText(_translate("MainWindow", "Participants")) - self.labelObjectives.setText(_translate("MainWindow", "Objectives")) - self.warName.setText(_translate("MainWindow", "warName")) - self.warYear.setText(_translate("MainWindow", "warYear")) + self.label.setText(_translate("MainWindow", "Major objective")) + self.label_5.setText(_translate("MainWindow", "points")) + self.label_2.setText(_translate("MainWindow", "Minor opportunity")) + self.label_4.setText(_translate("MainWindow", "points")) + self.label_3.setText(_translate("MainWindow", "Influence")) + self.influenceToken.setText(_translate("MainWindow", "Token")) self.labelSectors.setText(_translate("MainWindow", "Sectors")) self.labelParticipants_2.setText(_translate("MainWindow", "Participants")) self.endCampaignBtn.setText(_translate("MainWindow", "End campaign")) diff --git a/src/warchron/view/ui/ui_main_window.ui b/src/warchron/view/ui/ui_main_window.ui index 0be2351..5ea7bb6 100644 --- a/src/warchron/view/ui/ui_main_window.ui +++ b/src/warchron/view/ui/ui_main_window.ui @@ -238,6 +238,58 @@ + + + + Objectives + + + + + + + true + + + End war + + + + + + + Participants + + + + + + + + + + 12 + + + + warName + + + + + + + + 12 + + + + warYear + + + + + @@ -269,57 +321,82 @@ - - - - - - true - - - End war - - - - - - - Participants - - - - - - - Objectives - - - - - - - - - 12 - - - - warName - - - - - - - - 12 - - - - warYear - - + + + + + Major objective + + + + + + + + + 1 + + + + + + + points + + + + + + + + + Minor opportunity + + + + + + + + + 1 + + + + + + + points + + + + + + + + + Influence + + + + + + + false + + + Token + + + true + + + true + + + + @@ -620,7 +697,7 @@ 0 0 1288 - 21 + 22 From dd886802f4f1225fb498d1094dffd8154093045d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20R=C3=A9aux?= Date: Tue, 10 Feb 2026 11:09:58 +0100 Subject: [PATCH 2/4] fix propagate player update to participant views --- src/warchron/constants.py | 1 + src/warchron/controller/app_controller.py | 24 +++++++++---------- .../controller/campaign_controller.py | 4 ++-- .../controller/navigation_controller.py | 10 ++++---- src/warchron/controller/player_controller.py | 2 ++ src/warchron/controller/war_controller.py | 4 ++-- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/warchron/constants.py b/src/warchron/constants.py index 9b35083..2566267 100644 --- a/src/warchron/constants.py +++ b/src/warchron/constants.py @@ -27,3 +27,4 @@ class RefreshScope(Enum): WAR_DETAILS = auto() CAMPAIGN_DETAILS = auto() ROUND_DETAILS = auto() + CURRENT_SELECTION_DETAILS = auto() diff --git a/src/warchron/controller/app_controller.py b/src/warchron/controller/app_controller.py index 8bd1206..e4e65f2 100644 --- a/src/warchron/controller/app_controller.py +++ b/src/warchron/controller/app_controller.py @@ -157,22 +157,22 @@ class AppController: ) elif item_type == ItemType.OBJECTIVE: self.wars.edit_objective(item_id) - self.navigation.refresh(RefreshScope.WAR_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.WAR_PARTICIPANT: self.wars.edit_war_participant(item_id) - self.navigation.refresh(RefreshScope.WAR_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.SECTOR: self.campaigns.edit_sector(item_id) - self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.CAMPAIGN_PARTICIPANT: self.campaigns.edit_campaign_participant(item_id) - self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.CHOICE: self.rounds.edit_round_choice(item_id) - self.navigation.refresh(RefreshScope.ROUND_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.BATTLE: self.rounds.edit_round_battle(item_id) - self.navigation.refresh(RefreshScope.ROUND_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) self.is_dirty = True except UpdateRequiresConfirmation as e: reply = QMessageBox.question( @@ -183,7 +183,7 @@ class AppController: ) if reply == QMessageBox.StandardButton.Yes: e.apply_update() - self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) def delete_item(self, item_type: str, item_id: str) -> None: reply = QMessageBox.question( @@ -210,16 +210,16 @@ class AppController: ) elif item_type == ItemType.OBJECTIVE: self.model.remove_objective(item_id) - self.navigation.refresh(RefreshScope.WAR_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.WAR_PARTICIPANT: self.model.remove_war_participant(item_id) - self.navigation.refresh(RefreshScope.WAR_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.SECTOR: self.model.remove_sector(item_id) - self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.CAMPAIGN_PARTICIPANT: self.model.remove_campaign_participant(item_id) - self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) elif item_type == ItemType.ROUND: camp = self.model.get_campaign_by_round(item_id) camp_id = camp.id @@ -243,4 +243,4 @@ class AppController: ) if reply == QMessageBox.StandardButton.Yes: e.cleanup_action() - self.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) diff --git a/src/warchron/controller/campaign_controller.py b/src/warchron/controller/campaign_controller.py index 24464ef..0521783 100644 --- a/src/warchron/controller/campaign_controller.py +++ b/src/warchron/controller/campaign_controller.py @@ -123,7 +123,7 @@ class CampaignController: self.app.navigation.selected_campaign_id, player_id, leader, theme ) self.app.is_dirty = True - self.app.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.app.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) def edit_campaign_participant(self, participant_id: str) -> None: camp_part = self.app.model.get_campaign_participant(participant_id) @@ -198,7 +198,7 @@ class CampaignController: influence_id, ) self.app.is_dirty = True - self.app.navigation.refresh(RefreshScope.CAMPAIGN_DETAILS) + self.app.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) def edit_sector(self, sector_id: str) -> None: sect = self.app.model.get_sector(sector_id) diff --git a/src/warchron/controller/navigation_controller.py b/src/warchron/controller/navigation_controller.py index 40491d1..ad1344d 100644 --- a/src/warchron/controller/navigation_controller.py +++ b/src/warchron/controller/navigation_controller.py @@ -59,18 +59,18 @@ class NavigationController: self.app.navigation.refresh_players_view() case RefreshScope.WARS_TREE: self.app.navigation.refresh_wars_view() - case RefreshScope.WAR_DETAILS: + case RefreshScope.CURRENT_SELECTION_DETAILS: if self.selected_war_id: self.app.view.show_details(ItemType.WAR) self.app.wars._fill_war_details(self.selected_war_id) - case RefreshScope.CAMPAIGN_DETAILS: - if self.selected_campaign_id: + elif self.selected_campaign_id: self.app.view.show_details(ItemType.CAMPAIGN) self.app.campaigns._fill_campaign_details(self.selected_campaign_id) - case RefreshScope.ROUND_DETAILS: - if self.selected_round_id: + elif self.selected_round_id: self.app.view.show_details(ItemType.ROUND) self.app.rounds._fill_round_details(self.selected_round_id) + else: + self.app.view.show_details(None) self.app.update_window_title() def refresh_and_select( diff --git a/src/warchron/controller/player_controller.py b/src/warchron/controller/player_controller.py index d461182..4767576 100644 --- a/src/warchron/controller/player_controller.py +++ b/src/warchron/controller/player_controller.py @@ -40,3 +40,5 @@ class PlayerController: if not self._validate_player_inputs(name): return self.app.model.update_player(player_id, name=name) + # Propagate update to participants + self.app.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) diff --git a/src/warchron/controller/war_controller.py b/src/warchron/controller/war_controller.py index 7c2d867..cef7e1a 100644 --- a/src/warchron/controller/war_controller.py +++ b/src/warchron/controller/war_controller.py @@ -105,7 +105,7 @@ class WarController: self.app.navigation.selected_war_id, name, description ) self.app.is_dirty = True - self.app.navigation.refresh(RefreshScope.WAR_DETAILS) + self.app.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) def edit_objective(self, objective_id: str) -> None: obj = self.app.model.get_objective(objective_id) @@ -143,7 +143,7 @@ class WarController: self.app.navigation.selected_war_id, player_id, faction ) self.app.is_dirty = True - self.app.navigation.refresh(RefreshScope.WAR_DETAILS) + self.app.navigation.refresh(RefreshScope.CURRENT_SELECTION_DETAILS) def edit_war_participant(self, participant_id: str) -> None: war_part = self.app.model.get_war_participant(participant_id) From f04aeaf525a60d925e5c8ccc9cc810af25cc3d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20R=C3=A9aux?= Date: Tue, 10 Feb 2026 14:32:27 +0100 Subject: [PATCH 3/4] improve UI --- src/warchron/view/ui/ui_main_window.py | 548 +++++++------ src/warchron/view/ui/ui_main_window.ui | 1027 +++++++++++++++--------- 2 files changed, 951 insertions(+), 624 deletions(-) diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py index 02bff79..c074afa 100644 --- a/src/warchron/view/ui/ui_main_window.py +++ b/src/warchron/view/ui/ui_main_window.py @@ -12,14 +12,14 @@ from PyQt6 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(1288, 817) + MainWindow.resize(1235, 954) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/warchron_logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) MainWindow.setWindowIcon(icon) self.centralwidget = QtWidgets.QWidget(parent=MainWindow) self.centralwidget.setObjectName("centralwidget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout.setObjectName("verticalLayout") + self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.centralwidget) + self.verticalLayout_9.setObjectName("verticalLayout_9") self.tabWidget = QtWidgets.QTabWidget(parent=self.centralwidget) self.tabWidget.setObjectName("tabWidget") self.playersTab = QtWidgets.QWidget() @@ -35,6 +35,9 @@ class Ui_MainWindow(object): self.horizontalLayout.addItem(spacerItem) self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1) self.playersTable = QtWidgets.QTableWidget(parent=self.playersTab) + self.playersTable.setEnabled(True) + self.playersTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.playersTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.playersTable.setObjectName("playersTable") self.playersTable.setColumnCount(4) self.playersTable.setRowCount(0) @@ -46,6 +49,7 @@ class Ui_MainWindow(object): self.playersTable.setHorizontalHeaderItem(2, item) item = QtWidgets.QTableWidgetItem() self.playersTable.setHorizontalHeaderItem(3, item) + self.playersTable.horizontalHeader().setStretchLastSection(True) self.gridLayout.addWidget(self.playersTable, 1, 0, 1, 1) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/users.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) @@ -95,11 +99,106 @@ class Ui_MainWindow(object): self.selectedDetailsStack.addWidget(self.pageEmpty) self.pageWar = QtWidgets.QWidget() self.pageWar.setObjectName("pageWar") - self.gridLayout_3 = QtWidgets.QGridLayout(self.pageWar) - self.gridLayout_3.setObjectName("gridLayout_3") - self.horizontalLayout_10 = QtWidgets.QHBoxLayout() - self.horizontalLayout_10.setObjectName("horizontalLayout_10") - self.warParticipantsTable = QtWidgets.QTableWidget(parent=self.pageWar) + self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.pageWar) + self.verticalLayout_10.setObjectName("verticalLayout_10") + self.horizontalLayout_8 = QtWidgets.QHBoxLayout() + self.horizontalLayout_8.setObjectName("horizontalLayout_8") + self.warName = QtWidgets.QLabel(parent=self.pageWar) + font = QtGui.QFont() + font.setPointSize(12) + self.warName.setFont(font) + self.warName.setObjectName("warName") + self.horizontalLayout_8.addWidget(self.warName) + spacerItem4 = QtWidgets.QSpacerItem(630, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_8.addItem(spacerItem4) + self.warYear = QtWidgets.QLabel(parent=self.pageWar) + font = QtGui.QFont() + font.setPointSize(12) + self.warYear.setFont(font) + self.warYear.setObjectName("warYear") + self.horizontalLayout_8.addWidget(self.warYear) + self.verticalLayout_10.addLayout(self.horizontalLayout_8) + self.groupBox = QtWidgets.QGroupBox(parent=self.pageWar) + self.groupBox.setObjectName("groupBox") + self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.addObjectiveBtn = QtWidgets.QPushButton(parent=self.groupBox) + self.addObjectiveBtn.setEnabled(True) + font = QtGui.QFont() + font.setPointSize(10) + self.addObjectiveBtn.setFont(font) + self.addObjectiveBtn.setObjectName("addObjectiveBtn") + self.horizontalLayout_3.addWidget(self.addObjectiveBtn) + spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_3.addItem(spacerItem5) + self.label = QtWidgets.QLabel(parent=self.groupBox) + self.label.setObjectName("label") + self.horizontalLayout_3.addWidget(self.label) + self.majorValue = QtWidgets.QSpinBox(parent=self.groupBox) + self.majorValue.setMinimum(1) + self.majorValue.setObjectName("majorValue") + self.horizontalLayout_3.addWidget(self.majorValue) + self.label_5 = QtWidgets.QLabel(parent=self.groupBox) + self.label_5.setObjectName("label_5") + self.horizontalLayout_3.addWidget(self.label_5) + spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_3.addItem(spacerItem6) + self.label_2 = QtWidgets.QLabel(parent=self.groupBox) + self.label_2.setObjectName("label_2") + self.horizontalLayout_3.addWidget(self.label_2) + self.minorValue = QtWidgets.QSpinBox(parent=self.groupBox) + self.minorValue.setMinimum(1) + self.minorValue.setObjectName("minorValue") + self.horizontalLayout_3.addWidget(self.minorValue) + self.label_4 = QtWidgets.QLabel(parent=self.groupBox) + self.label_4.setObjectName("label_4") + self.horizontalLayout_3.addWidget(self.label_4) + spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_3.addItem(spacerItem7) + self.label_3 = QtWidgets.QLabel(parent=self.groupBox) + self.label_3.setObjectName("label_3") + self.horizontalLayout_3.addWidget(self.label_3) + self.influenceToken = QtWidgets.QCheckBox(parent=self.groupBox) + self.influenceToken.setEnabled(True) + self.influenceToken.setCheckable(True) + self.influenceToken.setChecked(True) + self.influenceToken.setObjectName("influenceToken") + self.horizontalLayout_3.addWidget(self.influenceToken) + spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_3.addItem(spacerItem8) + self.verticalLayout.addLayout(self.horizontalLayout_3) + self.objectivesTable = QtWidgets.QTableWidget(parent=self.groupBox) + self.objectivesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.objectivesTable.setAlternatingRowColors(False) + self.objectivesTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + self.objectivesTable.setObjectName("objectivesTable") + self.objectivesTable.setColumnCount(2) + self.objectivesTable.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.objectivesTable.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.objectivesTable.setHorizontalHeaderItem(1, item) + self.objectivesTable.horizontalHeader().setStretchLastSection(True) + self.verticalLayout.addWidget(self.objectivesTable) + self.verticalLayout_10.addWidget(self.groupBox) + self.groupBox_2 = QtWidgets.QGroupBox(parent=self.pageWar) + self.groupBox_2.setObjectName("groupBox_2") + self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_2) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.horizontalLayout_5 = QtWidgets.QHBoxLayout() + self.horizontalLayout_5.setObjectName("horizontalLayout_5") + self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_2) + self.addWarParticipantBtn.setObjectName("addWarParticipantBtn") + self.horizontalLayout_5.addWidget(self.addWarParticipantBtn) + spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_5.addItem(spacerItem9) + self.verticalLayout_2.addLayout(self.horizontalLayout_5) + self.warParticipantsTable = QtWidgets.QTableWidget(parent=self.groupBox_2) + self.warParticipantsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.warParticipantsTable.setAlternatingRowColors(False) + self.warParticipantsTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.warParticipantsTable.setObjectName("warParticipantsTable") self.warParticipantsTable.setColumnCount(5) self.warParticipantsTable.setRowCount(0) @@ -113,134 +212,56 @@ class Ui_MainWindow(object): self.warParticipantsTable.setHorizontalHeaderItem(3, item) item = QtWidgets.QTableWidgetItem() self.warParticipantsTable.setHorizontalHeaderItem(4, item) - self.horizontalLayout_10.addWidget(self.warParticipantsTable) - self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.pageWar) - self.addWarParticipantBtn.setObjectName("addWarParticipantBtn") - self.horizontalLayout_10.addWidget(self.addWarParticipantBtn) - self.gridLayout_3.addLayout(self.horizontalLayout_10, 4, 0, 1, 4) - self.labelObjectives = QtWidgets.QLabel(parent=self.pageWar) - self.labelObjectives.setObjectName("labelObjectives") - self.gridLayout_3.addWidget(self.labelObjectives, 1, 0, 1, 1) + self.warParticipantsTable.horizontalHeader().setStretchLastSection(True) + self.verticalLayout_2.addWidget(self.warParticipantsTable) + self.verticalLayout_10.addWidget(self.groupBox_2) + self.horizontalLayout_6 = QtWidgets.QHBoxLayout() + self.horizontalLayout_6.setObjectName("horizontalLayout_6") + spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_6.addItem(spacerItem10) self.endWarBtn = QtWidgets.QPushButton(parent=self.pageWar) self.endWarBtn.setEnabled(True) self.endWarBtn.setObjectName("endWarBtn") - self.gridLayout_3.addWidget(self.endWarBtn, 5, 1, 1, 1) - self.labelParticipants = QtWidgets.QLabel(parent=self.pageWar) - self.labelParticipants.setObjectName("labelParticipants") - self.gridLayout_3.addWidget(self.labelParticipants, 3, 0, 1, 1) - self.horizontalLayout_8 = QtWidgets.QHBoxLayout() - self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.warName = QtWidgets.QLabel(parent=self.pageWar) - font = QtGui.QFont() - font.setPointSize(12) - self.warName.setFont(font) - self.warName.setObjectName("warName") - self.horizontalLayout_8.addWidget(self.warName) - self.warYear = QtWidgets.QLabel(parent=self.pageWar) - font = QtGui.QFont() - font.setPointSize(12) - self.warYear.setFont(font) - self.warYear.setObjectName("warYear") - self.horizontalLayout_8.addWidget(self.warYear) - self.gridLayout_3.addLayout(self.horizontalLayout_8, 0, 0, 1, 4) - self.horizontalLayout_9 = QtWidgets.QHBoxLayout() - self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.objectivesTable = QtWidgets.QTableWidget(parent=self.pageWar) - self.objectivesTable.setObjectName("objectivesTable") - self.objectivesTable.setColumnCount(2) - self.objectivesTable.setRowCount(0) - item = QtWidgets.QTableWidgetItem() - self.objectivesTable.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.objectivesTable.setHorizontalHeaderItem(1, item) - self.horizontalLayout_9.addWidget(self.objectivesTable) - self.addObjectiveBtn = QtWidgets.QPushButton(parent=self.pageWar) - self.addObjectiveBtn.setEnabled(True) - font = QtGui.QFont() - font.setPointSize(10) - self.addObjectiveBtn.setFont(font) - self.addObjectiveBtn.setObjectName("addObjectiveBtn") - self.horizontalLayout_9.addWidget(self.addObjectiveBtn) - self.verticalLayout_2 = QtWidgets.QVBoxLayout() - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.label = QtWidgets.QLabel(parent=self.pageWar) - self.label.setObjectName("label") - self.verticalLayout_2.addWidget(self.label) - self.horizontalLayout_5 = QtWidgets.QHBoxLayout() - self.horizontalLayout_5.setObjectName("horizontalLayout_5") - self.majorValue = QtWidgets.QSpinBox(parent=self.pageWar) - self.majorValue.setMinimum(1) - self.majorValue.setObjectName("majorValue") - self.horizontalLayout_5.addWidget(self.majorValue) - self.label_5 = QtWidgets.QLabel(parent=self.pageWar) - self.label_5.setObjectName("label_5") - self.horizontalLayout_5.addWidget(self.label_5) - self.verticalLayout_2.addLayout(self.horizontalLayout_5) - self.label_2 = QtWidgets.QLabel(parent=self.pageWar) - self.label_2.setObjectName("label_2") - self.verticalLayout_2.addWidget(self.label_2) - self.horizontalLayout_4 = QtWidgets.QHBoxLayout() - self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.minorValue = QtWidgets.QSpinBox(parent=self.pageWar) - self.minorValue.setMinimum(1) - self.minorValue.setObjectName("minorValue") - self.horizontalLayout_4.addWidget(self.minorValue) - self.label_4 = QtWidgets.QLabel(parent=self.pageWar) - self.label_4.setObjectName("label_4") - self.horizontalLayout_4.addWidget(self.label_4) - self.verticalLayout_2.addLayout(self.horizontalLayout_4) - self.label_3 = QtWidgets.QLabel(parent=self.pageWar) - self.label_3.setObjectName("label_3") - self.verticalLayout_2.addWidget(self.label_3) - self.influenceToken = QtWidgets.QCheckBox(parent=self.pageWar) - self.influenceToken.setEnabled(False) - self.influenceToken.setCheckable(True) - self.influenceToken.setChecked(True) - self.influenceToken.setObjectName("influenceToken") - self.verticalLayout_2.addWidget(self.influenceToken) - self.horizontalLayout_9.addLayout(self.verticalLayout_2) - self.gridLayout_3.addLayout(self.horizontalLayout_9, 2, 0, 1, 4) + self.horizontalLayout_6.addWidget(self.endWarBtn) + self.verticalLayout_10.addLayout(self.horizontalLayout_6) self.selectedDetailsStack.addWidget(self.pageWar) self.pageCampaign = QtWidgets.QWidget() self.pageCampaign.setObjectName("pageCampaign") - self.gridLayout_4 = QtWidgets.QGridLayout(self.pageCampaign) - self.gridLayout_4.setObjectName("gridLayout_4") - self.labelSectors = QtWidgets.QLabel(parent=self.pageCampaign) - self.labelSectors.setObjectName("labelSectors") - self.gridLayout_4.addWidget(self.labelSectors, 1, 0, 1, 1) - self.labelParticipants_2 = QtWidgets.QLabel(parent=self.pageCampaign) - self.labelParticipants_2.setObjectName("labelParticipants_2") - self.gridLayout_4.addWidget(self.labelParticipants_2, 3, 0, 1, 1) - self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign) - self.endCampaignBtn.setEnabled(True) - self.endCampaignBtn.setObjectName("endCampaignBtn") - self.gridLayout_4.addWidget(self.endCampaignBtn, 5, 1, 1, 1) - spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.gridLayout_4.addItem(spacerItem4, 5, 2, 1, 1) - self.horizontalLayout_12 = QtWidgets.QHBoxLayout() - self.horizontalLayout_12.setObjectName("horizontalLayout_12") - self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.pageCampaign) - self.campaignParticipantsTable.setObjectName("campaignParticipantsTable") - self.campaignParticipantsTable.setColumnCount(5) - self.campaignParticipantsTable.setRowCount(0) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(1, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(2, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(3, item) - item = QtWidgets.QTableWidgetItem() - self.campaignParticipantsTable.setHorizontalHeaderItem(4, item) - self.horizontalLayout_12.addWidget(self.campaignParticipantsTable) - self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.pageCampaign) - self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn") - self.horizontalLayout_12.addWidget(self.addCampaignParticipantBtn) - self.gridLayout_4.addLayout(self.horizontalLayout_12, 4, 0, 1, 3) - self.horizontalLayout_13 = QtWidgets.QHBoxLayout() - self.horizontalLayout_13.setObjectName("horizontalLayout_13") - self.sectorsTable = QtWidgets.QTableWidget(parent=self.pageCampaign) + self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.pageCampaign) + self.verticalLayout_7.setObjectName("verticalLayout_7") + self.horizontalLayout_11 = QtWidgets.QHBoxLayout() + self.horizontalLayout_11.setObjectName("horizontalLayout_11") + self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign) + font = QtGui.QFont() + font.setPointSize(12) + self.campaignName.setFont(font) + self.campaignName.setObjectName("campaignName") + self.horizontalLayout_11.addWidget(self.campaignName) + spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_11.addItem(spacerItem11) + self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign) + font = QtGui.QFont() + font.setPointSize(12) + self.campaignMonth.setFont(font) + self.campaignMonth.setObjectName("campaignMonth") + self.horizontalLayout_11.addWidget(self.campaignMonth) + self.verticalLayout_7.addLayout(self.horizontalLayout_11) + self.groupBox_3 = QtWidgets.QGroupBox(parent=self.pageCampaign) + self.groupBox_3.setObjectName("groupBox_3") + self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_3) + self.verticalLayout_5.setObjectName("verticalLayout_5") + self.horizontalLayout_17 = QtWidgets.QHBoxLayout() + self.horizontalLayout_17.setObjectName("horizontalLayout_17") + self.addSectorBtn = QtWidgets.QPushButton(parent=self.groupBox_3) + self.addSectorBtn.setEnabled(True) + self.addSectorBtn.setObjectName("addSectorBtn") + self.horizontalLayout_17.addWidget(self.addSectorBtn) + spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_17.addItem(spacerItem12) + self.verticalLayout_5.addLayout(self.horizontalLayout_17) + self.sectorsTable = QtWidgets.QTableWidget(parent=self.groupBox_3) + self.sectorsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.sectorsTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.sectorsTable.setObjectName("sectorsTable") self.sectorsTable.setColumnCount(6) self.sectorsTable.setRowCount(0) @@ -256,65 +277,71 @@ class Ui_MainWindow(object): self.sectorsTable.setHorizontalHeaderItem(4, item) item = QtWidgets.QTableWidgetItem() self.sectorsTable.setHorizontalHeaderItem(5, item) - self.horizontalLayout_13.addWidget(self.sectorsTable) - self.addSectorBtn = QtWidgets.QPushButton(parent=self.pageCampaign) - self.addSectorBtn.setEnabled(True) - self.addSectorBtn.setObjectName("addSectorBtn") - self.horizontalLayout_13.addWidget(self.addSectorBtn) - self.gridLayout_4.addLayout(self.horizontalLayout_13, 2, 0, 1, 3) - self.horizontalLayout_11 = QtWidgets.QHBoxLayout() - self.horizontalLayout_11.setObjectName("horizontalLayout_11") - self.campaignName = QtWidgets.QLabel(parent=self.pageCampaign) - font = QtGui.QFont() - font.setPointSize(12) - self.campaignName.setFont(font) - self.campaignName.setObjectName("campaignName") - self.horizontalLayout_11.addWidget(self.campaignName) - self.campaignMonth = QtWidgets.QLabel(parent=self.pageCampaign) - font = QtGui.QFont() - font.setPointSize(12) - self.campaignMonth.setFont(font) - self.campaignMonth.setObjectName("campaignMonth") - self.horizontalLayout_11.addWidget(self.campaignMonth) - self.gridLayout_4.addLayout(self.horizontalLayout_11, 0, 0, 1, 3) + self.sectorsTable.horizontalHeader().setStretchLastSection(True) + self.verticalLayout_5.addWidget(self.sectorsTable) + self.verticalLayout_7.addWidget(self.groupBox_3) + self.groupBox_4 = QtWidgets.QGroupBox(parent=self.pageCampaign) + self.groupBox_4.setObjectName("groupBox_4") + self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox_4) + self.verticalLayout_6.setObjectName("verticalLayout_6") + self.horizontalLayout_18 = QtWidgets.QHBoxLayout() + self.horizontalLayout_18.setObjectName("horizontalLayout_18") + self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_4) + self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn") + self.horizontalLayout_18.addWidget(self.addCampaignParticipantBtn) + spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_18.addItem(spacerItem13) + self.verticalLayout_6.addLayout(self.horizontalLayout_18) + self.campaignParticipantsTable = QtWidgets.QTableWidget(parent=self.groupBox_4) + self.campaignParticipantsTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.campaignParticipantsTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + self.campaignParticipantsTable.setObjectName("campaignParticipantsTable") + self.campaignParticipantsTable.setColumnCount(5) + self.campaignParticipantsTable.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(2, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(3, item) + item = QtWidgets.QTableWidgetItem() + self.campaignParticipantsTable.setHorizontalHeaderItem(4, item) + self.campaignParticipantsTable.horizontalHeader().setStretchLastSection(True) + self.verticalLayout_6.addWidget(self.campaignParticipantsTable) + self.verticalLayout_7.addWidget(self.groupBox_4) + self.horizontalLayout_10 = QtWidgets.QHBoxLayout() + self.horizontalLayout_10.setObjectName("horizontalLayout_10") + spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_10.addItem(spacerItem14) + self.endCampaignBtn = QtWidgets.QPushButton(parent=self.pageCampaign) + self.endCampaignBtn.setEnabled(True) + self.endCampaignBtn.setObjectName("endCampaignBtn") + self.horizontalLayout_10.addWidget(self.endCampaignBtn) + self.verticalLayout_7.addLayout(self.horizontalLayout_10) self.selectedDetailsStack.addWidget(self.pageCampaign) self.pageRound = QtWidgets.QWidget() self.pageRound.setObjectName("pageRound") - self.gridLayout_5 = QtWidgets.QGridLayout(self.pageRound) - self.gridLayout_5.setObjectName("gridLayout_5") - self.labelChoices = QtWidgets.QLabel(parent=self.pageRound) - self.labelChoices.setObjectName("labelChoices") - self.gridLayout_5.addWidget(self.labelChoices, 1, 0, 1, 1) - self.labelBattles = QtWidgets.QLabel(parent=self.pageRound) - self.labelBattles.setObjectName("labelBattles") - self.gridLayout_5.addWidget(self.labelBattles, 3, 0, 1, 1) - self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound) - self.endRoundBtn.setEnabled(True) - self.endRoundBtn.setObjectName("endRoundBtn") - self.gridLayout_5.addWidget(self.endRoundBtn, 5, 1, 1, 1) - spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.gridLayout_5.addItem(spacerItem5, 5, 2, 1, 1) - self.horizontalLayout_15 = QtWidgets.QHBoxLayout() - self.horizontalLayout_15.setObjectName("horizontalLayout_15") - self.battlesTable = QtWidgets.QTableWidget(parent=self.pageRound) - self.battlesTable.setObjectName("battlesTable") - self.battlesTable.setColumnCount(3) - self.battlesTable.setRowCount(0) - item = QtWidgets.QTableWidgetItem() - self.battlesTable.setHorizontalHeaderItem(0, item) - item = QtWidgets.QTableWidgetItem() - self.battlesTable.setHorizontalHeaderItem(1, item) - item = QtWidgets.QTableWidgetItem() - self.battlesTable.setHorizontalHeaderItem(2, item) - self.horizontalLayout_15.addWidget(self.battlesTable) - self.countResultBtn = QtWidgets.QPushButton(parent=self.pageRound) - self.countResultBtn.setEnabled(False) - self.countResultBtn.setObjectName("countResultBtn") - self.horizontalLayout_15.addWidget(self.countResultBtn) - self.gridLayout_5.addLayout(self.horizontalLayout_15, 4, 0, 1, 3) - self.horizontalLayout_16 = QtWidgets.QHBoxLayout() - self.horizontalLayout_16.setObjectName("horizontalLayout_16") - self.choicesTable = QtWidgets.QTableWidget(parent=self.pageRound) + self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.pageRound) + self.verticalLayout_8.setObjectName("verticalLayout_8") + self.horizontalLayout_14 = QtWidgets.QHBoxLayout() + self.horizontalLayout_14.setObjectName("horizontalLayout_14") + self.roundNb = QtWidgets.QLabel(parent=self.pageRound) + font = QtGui.QFont() + font.setPointSize(12) + self.roundNb.setFont(font) + self.roundNb.setObjectName("roundNb") + self.horizontalLayout_14.addWidget(self.roundNb) + self.verticalLayout_8.addLayout(self.horizontalLayout_14) + self.groupBox_5 = QtWidgets.QGroupBox(parent=self.pageRound) + self.groupBox_5.setObjectName("groupBox_5") + self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.groupBox_5) + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.choicesTable = QtWidgets.QTableWidget(parent=self.groupBox_5) + self.choicesTable.setEnabled(True) + self.choicesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.choicesTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) self.choicesTable.setObjectName("choicesTable") self.choicesTable.setColumnCount(3) self.choicesTable.setRowCount(0) @@ -324,30 +351,55 @@ class Ui_MainWindow(object): self.choicesTable.setHorizontalHeaderItem(1, item) item = QtWidgets.QTableWidgetItem() self.choicesTable.setHorizontalHeaderItem(2, item) - self.horizontalLayout_16.addWidget(self.choicesTable) + self.choicesTable.horizontalHeader().setStretchLastSection(True) + self.horizontalLayout_4.addWidget(self.choicesTable) + self.verticalLayout_8.addWidget(self.groupBox_5) + self.horizontalLayout_13 = QtWidgets.QHBoxLayout() + self.horizontalLayout_13.setObjectName("horizontalLayout_13") + spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_13.addItem(spacerItem15) self.resolvePairingBtn = QtWidgets.QPushButton(parent=self.pageRound) self.resolvePairingBtn.setEnabled(True) self.resolvePairingBtn.setObjectName("resolvePairingBtn") - self.horizontalLayout_16.addWidget(self.resolvePairingBtn) - self.gridLayout_5.addLayout(self.horizontalLayout_16, 2, 0, 1, 3) - self.horizontalLayout_14 = QtWidgets.QHBoxLayout() - self.horizontalLayout_14.setObjectName("horizontalLayout_14") - self.roundNb = QtWidgets.QLabel(parent=self.pageRound) - font = QtGui.QFont() - font.setPointSize(12) - self.roundNb.setFont(font) - self.roundNb.setObjectName("roundNb") - self.horizontalLayout_14.addWidget(self.roundNb) - self.gridLayout_5.addLayout(self.horizontalLayout_14, 0, 0, 1, 3) + self.horizontalLayout_13.addWidget(self.resolvePairingBtn) + self.verticalLayout_8.addLayout(self.horizontalLayout_13) + self.groupBox_6 = QtWidgets.QGroupBox(parent=self.pageRound) + self.groupBox_6.setObjectName("groupBox_6") + self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.groupBox_6) + self.horizontalLayout_12.setObjectName("horizontalLayout_12") + self.battlesTable = QtWidgets.QTableWidget(parent=self.groupBox_6) + self.battlesTable.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.battlesTable.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + self.battlesTable.setObjectName("battlesTable") + self.battlesTable.setColumnCount(3) + self.battlesTable.setRowCount(0) + item = QtWidgets.QTableWidgetItem() + self.battlesTable.setHorizontalHeaderItem(0, item) + item = QtWidgets.QTableWidgetItem() + self.battlesTable.setHorizontalHeaderItem(1, item) + item = QtWidgets.QTableWidgetItem() + self.battlesTable.setHorizontalHeaderItem(2, item) + self.battlesTable.horizontalHeader().setStretchLastSection(True) + self.horizontalLayout_12.addWidget(self.battlesTable) + self.verticalLayout_8.addWidget(self.groupBox_6) + self.horizontalLayout_9 = QtWidgets.QHBoxLayout() + self.horizontalLayout_9.setObjectName("horizontalLayout_9") + spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_9.addItem(spacerItem16) + self.endRoundBtn = QtWidgets.QPushButton(parent=self.pageRound) + self.endRoundBtn.setEnabled(True) + self.endRoundBtn.setObjectName("endRoundBtn") + self.horizontalLayout_9.addWidget(self.endRoundBtn) + self.verticalLayout_8.addLayout(self.horizontalLayout_9) self.selectedDetailsStack.addWidget(self.pageRound) self.verticalLayout_3.addWidget(self.splitter) icon2 = QtGui.QIcon() icon2.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/swords-small.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) self.tabWidget.addTab(self.warsTab, icon2, "") - self.verticalLayout.addWidget(self.tabWidget) + self.verticalLayout_9.addWidget(self.tabWidget) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(parent=MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 1288, 22)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 1235, 21)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(parent=self.menubar) self.menuFile.setObjectName("menuFile") @@ -422,13 +474,14 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.tabWidget.setCurrentIndex(1) - self.selectedDetailsStack.setCurrentIndex(1) + self.selectedDetailsStack.setCurrentIndex(3) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): _translate = QtCore.QCoreApplication.translate MainWindow.setWindowTitle(_translate("MainWindow", "WarChron")) self.addPlayerBtn.setText(_translate("MainWindow", "Add player")) + self.playersTable.setSortingEnabled(True) item = self.playersTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.playersTable.horizontalHeaderItem(1) @@ -442,6 +495,24 @@ class Ui_MainWindow(object): self.addCampaignBtn.setText(_translate("MainWindow", "Add Campaign")) self.addRoundBtn.setText(_translate("MainWindow", "Add Round")) self.labelSelect.setText(_translate("MainWindow", "Select an element within the tree to show/edit details.")) + self.warName.setText(_translate("MainWindow", "warName")) + self.warYear.setText(_translate("MainWindow", "warYear")) + self.groupBox.setTitle(_translate("MainWindow", "Objectives")) + self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective")) + self.label.setText(_translate("MainWindow", "Major objective")) + self.label_5.setText(_translate("MainWindow", "points")) + self.label_2.setText(_translate("MainWindow", "Minor opportunity")) + self.label_4.setText(_translate("MainWindow", "points")) + self.label_3.setText(_translate("MainWindow", "Influence")) + self.influenceToken.setText(_translate("MainWindow", "Token")) + self.objectivesTable.setSortingEnabled(True) + item = self.objectivesTable.horizontalHeaderItem(0) + item.setText(_translate("MainWindow", "Name")) + item = self.objectivesTable.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Description")) + self.groupBox_2.setTitle(_translate("MainWindow", "Participants")) + self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant")) + self.warParticipantsTable.setSortingEnabled(True) item = self.warParticipantsTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.warParticipantsTable.horizontalHeaderItem(1) @@ -452,37 +523,12 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Victory pts.")) item = self.warParticipantsTable.horizontalHeaderItem(4) item.setText(_translate("MainWindow", "Theme pts")) - self.addWarParticipantBtn.setText(_translate("MainWindow", "Add participant")) - self.labelObjectives.setText(_translate("MainWindow", "Objectives")) self.endWarBtn.setText(_translate("MainWindow", "End war")) - self.labelParticipants.setText(_translate("MainWindow", "Participants")) - self.warName.setText(_translate("MainWindow", "warName")) - self.warYear.setText(_translate("MainWindow", "warYear")) - item = self.objectivesTable.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Name")) - item = self.objectivesTable.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Description")) - self.addObjectiveBtn.setText(_translate("MainWindow", "Add objective")) - self.label.setText(_translate("MainWindow", "Major objective")) - self.label_5.setText(_translate("MainWindow", "points")) - self.label_2.setText(_translate("MainWindow", "Minor opportunity")) - self.label_4.setText(_translate("MainWindow", "points")) - self.label_3.setText(_translate("MainWindow", "Influence")) - self.influenceToken.setText(_translate("MainWindow", "Token")) - self.labelSectors.setText(_translate("MainWindow", "Sectors")) - self.labelParticipants_2.setText(_translate("MainWindow", "Participants")) - self.endCampaignBtn.setText(_translate("MainWindow", "End campaign")) - item = self.campaignParticipantsTable.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Name")) - item = self.campaignParticipantsTable.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Leader")) - item = self.campaignParticipantsTable.horizontalHeaderItem(2) - item.setText(_translate("MainWindow", "Theme")) - item = self.campaignParticipantsTable.horizontalHeaderItem(3) - item.setText(_translate("MainWindow", "Victory pts.")) - item = self.campaignParticipantsTable.horizontalHeaderItem(4) - item.setText(_translate("MainWindow", "Theme pts.")) - self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant")) + self.campaignName.setText(_translate("MainWindow", "campaignName")) + self.campaignMonth.setText(_translate("MainWindow", "campaignMonth")) + self.groupBox_3.setTitle(_translate("MainWindow", "Sectors")) + self.addSectorBtn.setText(_translate("MainWindow", "Add Sector")) + self.sectorsTable.setSortingEnabled(True) item = self.sectorsTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Name")) item = self.sectorsTable.horizontalHeaderItem(1) @@ -495,19 +541,23 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Influence imp.")) item = self.sectorsTable.horizontalHeaderItem(5) item.setText(_translate("MainWindow", "Description")) - self.addSectorBtn.setText(_translate("MainWindow", "Add Sector")) - self.campaignName.setText(_translate("MainWindow", "campaignName")) - self.campaignMonth.setText(_translate("MainWindow", "campaignMonth")) - self.labelChoices.setText(_translate("MainWindow", "Choices")) - self.labelBattles.setText(_translate("MainWindow", "Battles")) - self.endRoundBtn.setText(_translate("MainWindow", "End round")) - item = self.battlesTable.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Sector")) - item = self.battlesTable.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Player 1")) - item = self.battlesTable.horizontalHeaderItem(2) - item.setText(_translate("MainWindow", "Player 2")) - self.countResultBtn.setText(_translate("MainWindow", "Count results")) + self.groupBox_4.setTitle(_translate("MainWindow", "Participants")) + self.addCampaignParticipantBtn.setText(_translate("MainWindow", "Add participant")) + self.campaignParticipantsTable.setSortingEnabled(True) + item = self.campaignParticipantsTable.horizontalHeaderItem(0) + item.setText(_translate("MainWindow", "Name")) + item = self.campaignParticipantsTable.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Leader")) + item = self.campaignParticipantsTable.horizontalHeaderItem(2) + item.setText(_translate("MainWindow", "Theme")) + item = self.campaignParticipantsTable.horizontalHeaderItem(3) + item.setText(_translate("MainWindow", "Victory pts.")) + item = self.campaignParticipantsTable.horizontalHeaderItem(4) + item.setText(_translate("MainWindow", "Theme pts.")) + self.endCampaignBtn.setText(_translate("MainWindow", "End campaign")) + self.roundNb.setText(_translate("MainWindow", "Round Nb")) + self.groupBox_5.setTitle(_translate("MainWindow", "Choices")) + self.choicesTable.setSortingEnabled(True) item = self.choicesTable.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Player")) item = self.choicesTable.horizontalHeaderItem(1) @@ -515,7 +565,15 @@ class Ui_MainWindow(object): item = self.choicesTable.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Secondary")) self.resolvePairingBtn.setText(_translate("MainWindow", "Resolve pairing")) - self.roundNb.setText(_translate("MainWindow", "Round Nb")) + self.groupBox_6.setTitle(_translate("MainWindow", "Battles")) + self.battlesTable.setSortingEnabled(True) + item = self.battlesTable.horizontalHeaderItem(0) + item.setText(_translate("MainWindow", "Sector")) + item = self.battlesTable.horizontalHeaderItem(1) + item.setText(_translate("MainWindow", "Player 1")) + item = self.battlesTable.horizontalHeaderItem(2) + item.setText(_translate("MainWindow", "Player 2")) + self.endRoundBtn.setText(_translate("MainWindow", "End round")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.warsTab), _translate("MainWindow", "Wars")) self.menuFile.setTitle(_translate("MainWindow", "File")) self.menuEdit.setTitle(_translate("MainWindow", "Edit")) diff --git a/src/warchron/view/ui/ui_main_window.ui b/src/warchron/view/ui/ui_main_window.ui index 5ea7bb6..a740546 100644 --- a/src/warchron/view/ui/ui_main_window.ui +++ b/src/warchron/view/ui/ui_main_window.ui @@ -6,8 +6,8 @@ 0 0 - 1288 - 817 + 1235 + 954 @@ -18,7 +18,7 @@ ../resources/warchron_logo.png../resources/warchron_logo.png - + @@ -40,6 +40,10 @@ Add player + + + ../resources/plus.png../resources/plus.png + @@ -59,6 +63,21 @@ + + true + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SelectRows + + + true + + + true + Name @@ -99,6 +118,10 @@ Add war + + + ../resources/plus.png../resources/plus.png + @@ -109,6 +132,10 @@ Add Campaign + + + ../resources/plus.png../resources/plus.png + @@ -119,6 +146,10 @@ Add Round + + + ../resources/plus.png../resources/plus.png + @@ -197,72 +228,8 @@ - - - - - - - - Name - - - - - Faction - - - - - Campaigns - - - - - Victory pts. - - - - - Theme pts - - - - - - - - Add participant - - - - - - - - - Objectives - - - - - - - true - - - End war - - - - - - - Participants - - - - + + @@ -276,6 +243,19 @@ + + + + Qt::Horizontal + + + + 630 + 20 + + + + @@ -290,246 +270,297 @@ - - + + + + Objectives + + + + + + + + true + + + + 10 + + + + Add objective + + + + ../resources/plus.png../resources/plus.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Major objective + + + + + + + 1 + + + + + + + points + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Minor opportunity + + + + + + + 1 + + + + + + + points + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Influence + + + + + + + true + + + Token + + + true + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::SelectRows + + + true + + + true + + + + Name + + + + + Description + + + + + + + + + + + Participants + + + + + + + + Add participant + + + + ../resources/plus.png../resources/plus.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::SelectRows + + + true + + + true + + + + Name + + + + + Faction + + + + + Campaigns + + + + + Victory pts. + + + + + Theme pts + + + + + + + + + - - - - Name - - - - - Description - - - + + + Qt::Horizontal + + + + 40 + 20 + + + - + true - - - 10 - - - Add objective + End war - - - - - - Major objective - - - - - - - - - 1 - - - - - - - points - - - - - - - - - Minor opportunity - - - - - - - - - 1 - - - - - - - points - - - - - - - - - Influence - - - - - - - false - - - Token - - - true - - - true - - - - - - - - - - Sectors - - - - - - - Participants - - - - - - - true - - - End campaign - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Name - - - - - Leader - - - - - Theme - - - - - Victory pts. - - - - - Theme pts. - - - - - - - - Add participant - - - - - - - - - - - - Name - - - - - Round - - - - - Major obj. - - - - - Minor opp. - - - - - Influence imp. - - - - - Description - - - - - - - - true - - - Add Sector - - - - - - + + @@ -543,6 +574,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -557,101 +601,275 @@ - - - - - - - - Choices + + + + Sectors + + + + + + + true + + + Add Sector + + + + ../resources/plus.png../resources/plus.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SelectRows + + + true + + + true + + + + Name + + + + + Round + + + + + Major obj. + + + + + Minor opp. + + + + + Influence imp. + + + + + Description + + + + + - - - - Battles + + + + Participants + + + + + + + Add participant + + + + ../resources/plus.png../resources/plus.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SelectRows + + + true + + + true + + + + Name + + + + + Leader + + + + + Theme + + + + + Victory pts. + + + + + Theme pts. + + + + + - - - - true - - - End round - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - - - - Sector - - - - - Player 1 - - - - - Player 2 - - - + + + Qt::Horizontal + + + + 40 + 20 + + + - + - false + true - Count results + End campaign - - + + + + + + - - - - Player - - - - - Priority - - - - - Secondary - - + + + + 12 + + + + Round Nb + + + + + + + Choices + + + + + + true + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SelectRows + + + true + + + true + + + + Player + + + + + Priority + + + + + Secondary + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -664,17 +882,68 @@ - - + + + + Battles + + + + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::SelectRows + + + true + + + true + + + + Sector + + + + + Player 1 + + + + + Player 2 + + + + + + + + + - - - - 12 - + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true - Round Nb + End round @@ -696,8 +965,8 @@ 0 0 - 1288 - 22 + 1235 + 21 From 7f0d86f6dd3210b49081f3bf8c8e6540664ed4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20R=C3=A9aux?= Date: Tue, 10 Feb 2026 16:26:49 +0100 Subject: [PATCH 4/4] add objective values settings --- src/warchron/controller/app_controller.py | 3 + src/warchron/controller/war_controller.py | 26 ++++++++ src/warchron/model/model.py | 12 ++++ src/warchron/model/war.py | 22 +++++++ src/warchron/view/ui/ui_main_window.py | 78 +++++++++++++---------- src/warchron/view/view.py | 26 ++++++++ 6 files changed, 133 insertions(+), 34 deletions(-) diff --git a/src/warchron/controller/app_controller.py b/src/warchron/controller/app_controller.py index e4e65f2..fdb16d5 100644 --- a/src/warchron/controller/app_controller.py +++ b/src/warchron/controller/app_controller.py @@ -45,6 +45,9 @@ class AppController: self.view.actionSave_as.triggered.connect(self.save_as) self.view.addPlayerBtn.clicked.connect(self.players.add_player) self.view.addWarBtn.clicked.connect(self.wars.add_war) + self.view.majorValue.valueChanged.connect(self.wars.set_major_value) + self.view.minorValue.valueChanged.connect(self.wars.set_minor_value) + self.view.influenceToken.toggled.connect(self.wars.set_influence_token) self.view.addObjectiveBtn.clicked.connect(self.wars.add_objective) self.view.addWarParticipantBtn.clicked.connect(self.wars.add_war_participant) self.view.addSectorBtn.clicked.connect(self.campaigns.add_sector) diff --git a/src/warchron/controller/war_controller.py b/src/warchron/controller/war_controller.py index cef7e1a..acf786d 100644 --- a/src/warchron/controller/war_controller.py +++ b/src/warchron/controller/war_controller.py @@ -23,6 +23,11 @@ class WarController: def _fill_war_details(self, war_id: str) -> None: war = self.app.model.get_war(war_id) self.app.view.show_war_details(name=war.name, year=war.year) + self.app.view.set_war_objective_values( + major=war.major_value, + minor=war.minor_value, + influence=war.influence_token, + ) objectives = war.get_all_objectives() objectives_for_display: List[ObjectiveDTO] = [ ObjectiveDTO(id=obj.id, name=obj.name, description=obj.description) @@ -81,6 +86,27 @@ class WarController: return self.app.model.update_war(war_id, name=name, year=year) + def set_major_value(self, value: int) -> None: + war_id = self.app.navigation.selected_war_id + if not war_id: + return + self.app.model.set_major_value(war_id, value) + self.app.is_dirty = True + + def set_minor_value(self, value: int) -> None: + war_id = self.app.navigation.selected_war_id + if not war_id: + return + self.app.model.set_minor_value(war_id, value) + self.app.is_dirty = True + + def set_influence_token(self, checked: bool) -> None: + war_id = self.app.navigation.selected_war_id + if not war_id: + return + self.app.model.set_influence_token(war_id, checked) + self.app.is_dirty = True + # Objective methods def _validate_objective_inputs(self, name: str, description: str) -> bool: diff --git a/src/warchron/model/model.py b/src/warchron/model/model.py index 77abd42..874d3fa 100644 --- a/src/warchron/model/model.py +++ b/src/warchron/model/model.py @@ -162,6 +162,18 @@ class Model: war.set_name(name) war.set_year(year) + def set_major_value(self, war_id: str, value: int) -> None: + war = self.get_war(war_id) + war.set_major(value) + + def set_minor_value(self, war_id: str, value: int) -> None: + war = self.get_war(war_id) + war.set_minor(value) + + def set_influence_token(self, war_id: str, value: bool) -> None: + war = self.get_war(war_id) + war.set_influence(value) + def get_all_wars(self) -> List[War]: return list(self.wars.values()) diff --git a/src/warchron/model/war.py b/src/warchron/model/war.py index 2f1bc3e..efc16ad 100644 --- a/src/warchron/model/war.py +++ b/src/warchron/model/war.py @@ -19,6 +19,9 @@ class War: self.id: str = str(uuid4()) self.name: str = name self.year: int = year + self.major_value: int = 2 + self.minor_value: int = 1 + self.influence_token: bool = True self.participants: Dict[str, WarParticipant] = {} self.objectives: Dict[str, Objective] = {} self.campaigns: List[Campaign] = [] @@ -33,6 +36,19 @@ class War: def set_year(self, new_year: int) -> None: self.year = new_year + def set_major(self, new_value: int) -> None: + if new_value < self.minor_value: + raise ValueError("major_value cannot be < minor_value") + self.major_value = new_value + + def set_minor(self, new_value: int) -> None: + if new_value > self.major_value: + raise ValueError("minor_value cannot be > major_value") + self.minor_value = new_value + + def set_influence(self, new_state: bool) -> None: + self.influence_token = new_state + def set_state(self, new_state: bool) -> None: self.is_over = new_state @@ -41,6 +57,9 @@ class War: "id": self.id, "name": self.name, "year": self.year, + "major_value": self.major_value, + "minor_value": self.minor_value, + "influence_token": self.influence_token, "participants": [part.toDict() for part in self.participants.values()], "objectives": [obj.toDict() for obj in self.objectives.values()], "campaigns": [camp.toDict() for camp in self.campaigns], @@ -51,6 +70,9 @@ class War: def fromDict(data: Dict[str, Any]) -> War: war = War(name=data["name"], year=data["year"]) war.set_id(data["id"]) + war.set_major(data["major_value"]) + war.set_minor(data["minor_value"]) + war.set_influence(data["influence_token"]) for part_data in data.get("participants", []): part = WarParticipant.fromDict(part_data) war.participants[part.id] = part diff --git a/src/warchron/view/ui/ui_main_window.py b/src/warchron/view/ui/ui_main_window.py index c074afa..8633950 100644 --- a/src/warchron/view/ui/ui_main_window.py +++ b/src/warchron/view/ui/ui_main_window.py @@ -29,6 +29,9 @@ class Ui_MainWindow(object): self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.addPlayerBtn = QtWidgets.QPushButton(parent=self.playersTab) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/plus.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.addPlayerBtn.setIcon(icon1) self.addPlayerBtn.setObjectName("addPlayerBtn") self.horizontalLayout.addWidget(self.addPlayerBtn) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) @@ -51,9 +54,9 @@ class Ui_MainWindow(object): self.playersTable.setHorizontalHeaderItem(3, item) self.playersTable.horizontalHeader().setStretchLastSection(True) self.gridLayout.addWidget(self.playersTable, 1, 0, 1, 1) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/users.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.tabWidget.addTab(self.playersTab, icon1, "") + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/users.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.tabWidget.addTab(self.playersTab, icon2, "") self.warsTab = QtWidgets.QWidget() self.warsTab.setObjectName("warsTab") self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.warsTab) @@ -61,14 +64,17 @@ class Ui_MainWindow(object): self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.addWarBtn = QtWidgets.QPushButton(parent=self.warsTab) + self.addWarBtn.setIcon(icon1) self.addWarBtn.setObjectName("addWarBtn") self.horizontalLayout_2.addWidget(self.addWarBtn) self.addCampaignBtn = QtWidgets.QPushButton(parent=self.warsTab) self.addCampaignBtn.setEnabled(False) + self.addCampaignBtn.setIcon(icon1) self.addCampaignBtn.setObjectName("addCampaignBtn") self.horizontalLayout_2.addWidget(self.addCampaignBtn) self.addRoundBtn = QtWidgets.QPushButton(parent=self.warsTab) self.addRoundBtn.setEnabled(False) + self.addRoundBtn.setIcon(icon1) self.addRoundBtn.setObjectName("addRoundBtn") self.horizontalLayout_2.addWidget(self.addRoundBtn) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) @@ -129,6 +135,7 @@ class Ui_MainWindow(object): font = QtGui.QFont() font.setPointSize(10) self.addObjectiveBtn.setFont(font) + self.addObjectiveBtn.setIcon(icon1) self.addObjectiveBtn.setObjectName("addObjectiveBtn") self.horizontalLayout_3.addWidget(self.addObjectiveBtn) spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) @@ -190,6 +197,7 @@ class Ui_MainWindow(object): self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") self.addWarParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_2) + self.addWarParticipantBtn.setIcon(icon1) self.addWarParticipantBtn.setObjectName("addWarParticipantBtn") self.horizontalLayout_5.addWidget(self.addWarParticipantBtn) spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) @@ -254,6 +262,7 @@ class Ui_MainWindow(object): self.horizontalLayout_17.setObjectName("horizontalLayout_17") self.addSectorBtn = QtWidgets.QPushButton(parent=self.groupBox_3) self.addSectorBtn.setEnabled(True) + self.addSectorBtn.setIcon(icon1) self.addSectorBtn.setObjectName("addSectorBtn") self.horizontalLayout_17.addWidget(self.addSectorBtn) spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) @@ -287,6 +296,7 @@ class Ui_MainWindow(object): self.horizontalLayout_18 = QtWidgets.QHBoxLayout() self.horizontalLayout_18.setObjectName("horizontalLayout_18") self.addCampaignParticipantBtn = QtWidgets.QPushButton(parent=self.groupBox_4) + self.addCampaignParticipantBtn.setIcon(icon1) self.addCampaignParticipantBtn.setObjectName("addCampaignParticipantBtn") self.horizontalLayout_18.addWidget(self.addCampaignParticipantBtn) spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) @@ -393,9 +403,9 @@ class Ui_MainWindow(object): self.verticalLayout_8.addLayout(self.horizontalLayout_9) self.selectedDetailsStack.addWidget(self.pageRound) self.verticalLayout_3.addWidget(self.splitter) - icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/swords-small.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.tabWidget.addTab(self.warsTab, icon2, "") + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/swords-small.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.tabWidget.addTab(self.warsTab, icon3, "") self.verticalLayout_9.addWidget(self.tabWidget) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(parent=MainWindow) @@ -412,50 +422,50 @@ class Ui_MainWindow(object): self.statusbar.setObjectName("statusbar") MainWindow.setStatusBar(self.statusbar) self.actionNew = QtGui.QAction(parent=MainWindow) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/document.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionNew.setIcon(icon3) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/document.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionNew.setIcon(icon4) self.actionNew.setObjectName("actionNew") self.actionOpen = QtGui.QAction(parent=MainWindow) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/folder.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionOpen.setIcon(icon4) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/folder.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionOpen.setIcon(icon5) self.actionOpen.setObjectName("actionOpen") self.actionSave = QtGui.QAction(parent=MainWindow) - icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/disk.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionSave.setIcon(icon5) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/disk.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionSave.setIcon(icon6) self.actionSave.setObjectName("actionSave") self.actionExit = QtGui.QAction(parent=MainWindow) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/door--arrow.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionExit.setIcon(icon6) + icon7 = QtGui.QIcon() + icon7.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/door--arrow.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionExit.setIcon(icon7) self.actionExit.setObjectName("actionExit") self.actionUndo = QtGui.QAction(parent=MainWindow) - icon7 = QtGui.QIcon() - icon7.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/arrow-curve-180-left.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionUndo.setIcon(icon7) + icon8 = QtGui.QIcon() + icon8.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/arrow-curve-180-left.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionUndo.setIcon(icon8) self.actionUndo.setObjectName("actionUndo") self.actionRedo = QtGui.QAction(parent=MainWindow) - icon8 = QtGui.QIcon() - icon8.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/arrow-curve.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionRedo.setIcon(icon8) + icon9 = QtGui.QIcon() + icon9.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/arrow-curve.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionRedo.setIcon(icon9) self.actionRedo.setObjectName("actionRedo") self.actionAbout = QtGui.QAction(parent=MainWindow) - icon9 = QtGui.QIcon() - icon9.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/question.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionAbout.setIcon(icon9) + icon10 = QtGui.QIcon() + icon10.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/question.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionAbout.setIcon(icon10) self.actionAbout.setObjectName("actionAbout") self.actionExport = QtGui.QAction(parent=MainWindow) self.actionExport.setEnabled(False) - icon10 = QtGui.QIcon() - icon10.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/notebook--arrow.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionExport.setIcon(icon10) + icon11 = QtGui.QIcon() + icon11.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/notebook--arrow.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionExport.setIcon(icon11) self.actionExport.setObjectName("actionExport") self.actionSave_as = QtGui.QAction(parent=MainWindow) - icon11 = QtGui.QIcon() - icon11.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/disk--pencil.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - self.actionSave_as.setIcon(icon11) + icon12 = QtGui.QIcon() + icon12.addPixmap(QtGui.QPixmap(".\\src\\warchron\\view\\ui\\../resources/disk--pencil.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + self.actionSave_as.setIcon(icon12) self.actionSave_as.setObjectName("actionSave_as") self.menuFile.addAction(self.actionNew) self.menuFile.addAction(self.actionOpen) @@ -474,7 +484,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.tabWidget.setCurrentIndex(1) - self.selectedDetailsStack.setCurrentIndex(3) + self.selectedDetailsStack.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): diff --git a/src/warchron/view/view.py b/src/warchron/view/view.py index ca2afc4..527c543 100644 --- a/src/warchron/view/view.py +++ b/src/warchron/view/view.py @@ -35,6 +35,11 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow): self.on_tree_selection_changed: ( Callable[[TreeSelection | None], None] | None ) = None + self.on_major_value_changed: Callable[[int], None] | None = None + self.on_minot_value_changed: Callable[[int], None] | None = None + self.majorValue.setMinimum(0) + self.minorValue.setMinimum(0) + self.on_influence_token_changed: Callable[[int], None] | None = None self.on_add_campaign: Callable[[], None] | None = None self.on_add_round: Callable[[], None] | None = None self.on_edit_item: Callable[[str, str], None] | None = None @@ -82,6 +87,8 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow): self.battlesTable.customContextMenuRequested.connect( self._on_battles_table_context_menu ) + self.majorValue.valueChanged.connect(self._on_major_changed) + self.minorValue.valueChanged.connect(self._on_minor_changed) def _emit_selection_changed(self, current: QTreeWidgetItem | None) -> None: if not self.on_tree_selection_changed: @@ -326,6 +333,25 @@ class View(QtWidgets.QMainWindow, Ui_MainWindow): table.setItem(row, 1, fact_item) table.resizeColumnsToContents() + def _on_major_changed(self, value: int) -> None: + self.minorValue.setMaximum(value) + + def _on_minor_changed(self, value: int) -> None: + self.majorValue.setMinimum(value) + + def set_war_objective_values(self, major: int, minor: int, influence: bool) -> None: + self.majorValue.blockSignals(True) + self.minorValue.blockSignals(True) + self.influenceToken.blockSignals(True) + self.majorValue.setValue(major) + self.minorValue.setValue(minor) + self.influenceToken.setChecked(influence) + self.minorValue.setMaximum(major) + self.majorValue.setMinimum(minor) + self.majorValue.blockSignals(False) + self.minorValue.blockSignals(False) + self.influenceToken.blockSignals(False) + # Campaign page def _on_sectors_table_context_menu(self, pos: QPoint) -> None: