From 52c0be63ea0d35837eb7b7c8fec6d9a97f9388b4 Mon Sep 17 00:00:00 2001
From: Raffson <Raffson@users.noreply.github.com>
Date: Tue, 19 Jul 2022 00:14:17 +0200
Subject: [PATCH] Fix 'Accept' button in AirWingConfigurationDialog (#2318)

* Fix 'Accept' button in AirWingConfigurationDialog

- Fixes 'Accept' not saving changes
- Adds 'Reset' button (non-confirming)
- Adds confirmation pop-up when pressing [X]
---
 qt_ui/windows/AirWingConfigurationDialog.py | 67 +++++++++++++++++++--
 resources/stylesheets/style-dcs.css         | 13 ++++
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/qt_ui/windows/AirWingConfigurationDialog.py b/qt_ui/windows/AirWingConfigurationDialog.py
index 8dc8c2c2..4b99e815 100644
--- a/qt_ui/windows/AirWingConfigurationDialog.py
+++ b/qt_ui/windows/AirWingConfigurationDialog.py
@@ -26,6 +26,7 @@ from PySide2.QtWidgets import (
     QPushButton,
     QGridLayout,
     QToolButton,
+    QMessageBox,
 )
 from game import Game
 from game.ato.flighttype import FlightType
@@ -315,6 +316,7 @@ class AircraftSquadronsPage(QWidget):
 
 class AircraftSquadronsPanel(QStackedLayout):
     page_removed = Signal(AircraftType)
+    squadrons_changed = Signal()
 
     def __init__(self, air_wing: AirWing, theater: ConflictTheater) -> None:
         super().__init__()
@@ -331,6 +333,7 @@ class AircraftSquadronsPanel(QStackedLayout):
         self.squadrons_pages.pop(aircraft_type)
         self.page_removed.emit(aircraft_type)
         self.update()
+        self.squadrons_changed.emit()
 
     def new_page_for_type(
         self, aircraft_type: AircraftType, squadrons: list[Squadron]
@@ -349,18 +352,28 @@ class AircraftSquadronsPanel(QStackedLayout):
             self.new_page_for_type(squadron.aircraft, [squadron])
 
         self.update()
+        self.squadrons_changed.emit()
 
     def apply(self) -> None:
         self.air_wing.squadrons = {}
         for aircraft, page in self.squadrons_pages.items():
             self.air_wing.squadrons[aircraft] = page.apply()
 
+    def revert(self) -> None:
+        for _, page in self.squadrons_pages.items():
+            self.removeWidget(page)
+        self.squadrons_pages: dict[AircraftType, AircraftSquadronsPage] = {}
+        for aircraft, squadrons in self.air_wing.squadrons.items():
+            self.new_page_for_type(aircraft, squadrons)
+        self.update()
+
 
 class AircraftTypeList(QListView):
     page_index_changed = Signal(int)
 
     def __init__(self, air_wing: AirWing) -> None:
         super().__init__()
+        self.air_wing = air_wing
         self.setIconSize(QSize(91, 24))
         self.setMinimumWidth(300)
 
@@ -405,6 +418,12 @@ class AircraftTypeList(QListView):
             return QIcon(AIRCRAFT_ICONS[name])
         return None
 
+    def revert(self) -> None:
+        self.item_model.clear()
+        for aircraft in self.air_wing.squadrons:
+            self.add_aircraft_type(aircraft)
+        self.update()
+
 
 class AirWingConfigurationTab(QWidget):
     def __init__(self, coalition: Coalition, game: Game) -> None:
@@ -480,6 +499,11 @@ class AirWingConfigurationTab(QWidget):
     def apply(self) -> None:
         self.squadrons_panel.apply()
 
+    def revert(self) -> None:
+        self.type_list.revert()
+        self.squadrons_panel.revert()
+        self.update()
+
 
 class AirWingConfigurationDialog(QDialog):
     """Dialog window for air wing configuration."""
@@ -502,23 +526,54 @@ class AirWingConfigurationDialog(QDialog):
 
         layout.addWidget(doc_label)
 
-        tab_widget = QTabWidget()
-        layout.addWidget(tab_widget)
+        self.tab_widget = QTabWidget()
+        layout.addWidget(self.tab_widget)
 
         self.tabs = []
         for coalition in game.coalitions:
             coalition_tab = AirWingConfigurationTab(coalition, game)
             name = "Blue" if coalition.player else "Red"
-            tab_widget.addTab(coalition_tab, name)
+            self.tab_widget.addTab(coalition_tab, name)
             self.tabs.append(coalition_tab)
+            coalition_tab.squadrons_panel.squadrons_changed.connect(self.changed)
 
-        apply_button = QPushButton("Accept")
+        buttons_layout = QHBoxLayout()
+        apply_button = QPushButton("Accept Changes && Start Campaign")
+        apply_button.setProperty("style", "btn-accept")
         apply_button.clicked.connect(lambda state: self.accept())
-        layout.addWidget(apply_button)
+        discard_button = QPushButton("Reset Changes")
+        discard_button.setProperty("style", "btn-danger")
+        discard_button.clicked.connect(lambda state: self.revert())
+        buttons_layout.addWidget(discard_button)
+        buttons_layout.addWidget(apply_button)
+        layout.addLayout(buttons_layout)
 
-    def reject(self) -> None:
+        self.has_changed = False
+
+    def changed(self) -> None:
+        self.has_changed = True
+
+    def revert(self) -> None:
+        for tab in self.tabs:
+            tab.revert()
+        self.has_changed = False
+
+    def accept(self) -> None:
         for tab in self.tabs:
             tab.apply()
+        super().accept()
+
+    def reject(self) -> None:
+        if self.has_changed:
+            result = QMessageBox.information(
+                None,
+                "Discard changes?",
+                "Are you sure you want to discard your changes and start the campaign?",
+                QMessageBox.Yes,
+                QMessageBox.No,
+            )
+            if result == QMessageBox.No:
+                return
         super().reject()
 
 
diff --git a/resources/stylesheets/style-dcs.css b/resources/stylesheets/style-dcs.css
index 43aabda5..1dc01e71 100644
--- a/resources/stylesheets/style-dcs.css
+++ b/resources/stylesheets/style-dcs.css
@@ -208,6 +208,19 @@ QPushButton[style="btn-danger"]:hover{
     background-color:#D84545;
 }
 
+
+QPushButton[style="btn-accept"] {
+    background-color:#82A466;
+    color: white;
+    padding: 6px;
+    border-radius:2px;
+    border: 1px solid #82A466;
+}
+
+QPushButton[style="btn-accept"]:hover {
+    background-color:#5C863F;
+}
+
 QPushButton:disabled{
 
     background:#d6d6d6;