Add basic intel window.

Currently only shows the enemy's economic information.

https://github.com/Khopa/dcs_liberation/issues/658

qt_ui/windows/finances/QFinancesMenu.py

@@ -1,19 +1,68 @@
-from PySide2.QtWidgets import QDialog, QGridLayout, QLabel, QFrame, QSizePolicy
+from PySide2.QtWidgets import (
+    QDialog,
+    QFrame,
+    QGridLayout,
+    QLabel,
+    QSizePolicy,
+)
 
 import qt_ui.uiconstants as CONST
-from game.db import REWARDS, PLAYER_BUDGET_BASE
 from game.game import Game
+from game.income import Income
 
 
 class QHorizontalSeparationLine(QFrame):
 
-  def __init__(self):
-    super().__init__()
-    self.setMinimumWidth(1)
-    self.setFixedHeight(20)
-    self.setFrameShape(QFrame.HLine)
-    self.setFrameShadow(QFrame.Sunken)
-    self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Minimum)
+    def __init__(self):
+        super().__init__()
+        self.setMinimumWidth(1)
+        self.setFixedHeight(20)
+        self.setFrameShape(QFrame.HLine)
+        self.setFrameShadow(QFrame.Sunken)
+        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Minimum)
+
+
+class FinancesLayout(QGridLayout):
+    def __init__(self, game: Game, player: bool) -> None:
+        super().__init__()
+
+        income = Income(game, player)
+
+        self.addWidget(QLabel("<b>Control Points</b>"), 0, 0)
+        self.addWidget(QLabel(
+            f"{len(income.control_points)} bases x {income.income_per_base}M"),
+            0, 1)
+        self.addWidget(QLabel(f"{income.from_bases}M"), 0, 2)
+
+        self.addWidget(QHorizontalSeparationLine(), 1, 0, 1, 3)
+
+        buildings = reversed(sorted(income.buildings, key=lambda b: b.income))
+        row = 2
+        for row, building in enumerate(buildings, row):
+            self.addWidget(
+                QLabel(f"<b>{building.category.upper()} [{building.name}]</b>"),
+                row, 0)
+            self.addWidget(QLabel(
+                f"{building.number} buildings x {building.income_per_building}M"),
+                row, 1)
+            rlabel = QLabel(f"{building.income}M")
+            rlabel.setProperty("style", "green")
+            self.addWidget(rlabel, row, 2)
+
+        self.addWidget(QHorizontalSeparationLine(), row + 1, 0, 1, 3)
+        self.addWidget(QLabel(
+            f"Income multiplier: {income.multiplier:.1f}"),
+            row + 2, 1
+        )
+        self.addWidget(QLabel(f"<b>{income.total}M</b>"), row + 2, 2)
+
+        if player:
+            budget = game.budget
+        else:
+            budget = game.enemy_budget
+        self.addWidget(QLabel(f"Balance"), row + 3, 1)
+        self.addWidget(QLabel(f"<b>{budget}M</b>"), row + 3, 2)
+
 
 class QFinancesMenu(QDialog):
 
@@ -26,49 +75,4 @@ class QFinancesMenu(QDialog):
         self.setWindowIcon(CONST.ICONS["Money"])
         self.setMinimumSize(450, 200)
 
-        reward = PLAYER_BUDGET_BASE * len(self.game.theater.player_points())
-        layout = QGridLayout()
-        layout.addWidget(QLabel("<b>Control Points</b>"), 0, 0)
-        layout.addWidget(QLabel(str(len(self.game.theater.player_points())) + " bases x " + str(PLAYER_BUDGET_BASE) + "M"), 0, 1)
-        layout.addWidget(QLabel(str(reward) + "M"), 0, 2)
-
-        layout.addWidget(QHorizontalSeparationLine(), 1, 0, 1, 3)
-
-        i = 2
-        for cp in self.game.theater.player_points():
-            obj_names = []
-            [obj_names.append(ground_object.obj_name) for ground_object in cp.ground_objects if ground_object.obj_name not in obj_names]
-            for obj_name in obj_names:
-                reward = 0
-                g = None
-                cat = None
-                number = 0
-                for ground_object in cp.ground_objects:
-                    if ground_object.obj_name != obj_name or ground_object.is_dead:
-                        continue
-                    else:
-                        if g is None:
-                            g = ground_object
-                            cat = g.category
-                        if cat in REWARDS.keys():
-                            number = number + 1
-                            reward += REWARDS[cat]
-
-                if g is not None and cat in REWARDS.keys():
-                    layout.addWidget(QLabel("<b>" + g.category.upper() + " [" + obj_name + "]</b>"), i, 0)
-                    layout.addWidget(QLabel(str(number) + " buildings x " + str(REWARDS[cat]) + "M"), i, 1)
-                    rlabel = QLabel(str(reward) + "M")
-                    rlabel.setProperty("style", "green")
-                    layout.addWidget(rlabel, i, 2)
-                    i = i + 1
-
-        self.setLayout(layout)
-
-        layout.addWidget(QHorizontalSeparationLine(), i + 1, 0, 1, 3)
-        layout.addWidget(QLabel(
-            f"Income multiplier: {game.settings.player_income_multiplier:.1f}"),
-            i + 2, 1
-        )
-        layout.addWidget(
-            QLabel("<b>" + str(self.game.budget_reward_amount) + "M </b>"),
-            i + 2, 2)
+        self.setLayout(FinancesLayout(game, player=True))

qt_ui/windows/intel.py

@@ -0,0 +1,44 @@
+from PySide2.QtWidgets import (
+    QDialog,
+    QGroupBox,
+    QScrollArea, QVBoxLayout, QWidget,
+)
+
+from game.game import Game
+from qt_ui.uiconstants import ICONS
+from qt_ui.windows.finances.QFinancesMenu import FinancesLayout
+
+
+class EconomyIntelBox(QGroupBox):
+    def __init__(self, game: Game) -> None:
+        super().__init__("Economy")
+
+        widget = QWidget()
+        scroll_area = QScrollArea()
+        scroll_area.setWidgetResizable(True)
+        scroll_area.setWidget(widget)
+
+        scrolling_layout = QVBoxLayout()
+        widget.setLayout(scrolling_layout)
+
+        self.setLayout(QVBoxLayout())
+        self.layout().addWidget(scroll_area)
+
+        scrolling_layout.addLayout(FinancesLayout(game, player=False))
+
+
+class IntelWindow(QDialog):
+
+    def __init__(self, game: Game):
+        super().__init__()
+
+        self.game = game
+        self.setModal(True)
+        self.setWindowTitle("Intelligence")
+        self.setWindowIcon(ICONS["Statistics"])
+        self.setMinimumSize(600, 250)
+
+        layout = QVBoxLayout()
+        self.setLayout(layout)
+
+        layout.addWidget(EconomyIntelBox(game))