diff --git a/qt_ui/stylesheets/style.css b/qt_ui/stylesheets/style.css index 825a3853..203cca28 100644 --- a/qt_ui/stylesheets/style.css +++ b/qt_ui/stylesheets/style.css @@ -3,17 +3,17 @@ QLiberationWindow{ } -/*QTopPanel, +QTopPanel, QTopPanel *{ - background-color: #4E5760; - color: white; + /*background-color: #4E5760;*/ + /*color: white;*/ font-size: 12px; font-weight: bold; } QPushButton[style="btn-primary"]{ - background-color:#699245; - color:white; - padding: 21px 5px 21px 5px; - margin-top: 6px; -}*/ \ No newline at end of file + /*background-color:#699245;*/ + /*color:white;*/ + /*padding: 21px 5px 21px 5px; + margin-top: 6px;*/ +} \ No newline at end of file diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 15d2653a..75907f34 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -51,6 +51,8 @@ def load_icons(): ICONS["Money"] = QPixmap("./resources/ui/misc/money_icon.png") ICONS["PassTurn"] = QPixmap("./resources/ui/misc/pass_turn.png") + ICONS["Settings"] = QPixmap("./resources/ui/misc/settings.png") + ICONS["Statistics"] = QPixmap("./resources/ui/misc/statistics.png") ICONS["Ordnance"] = QPixmap("./resources/ui/misc/ordnance_icon.png") ICONS["target"] = QPixmap("./resources/ui/ground_assets/target.png") diff --git a/qt_ui/widgets/QTopPanel.py b/qt_ui/widgets/QTopPanel.py index 366e47a1..5b9bc9a8 100644 --- a/qt_ui/widgets/QTopPanel.py +++ b/qt_ui/widgets/QTopPanel.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QHBoxLayout, QPushButton +from PySide2.QtWidgets import QFrame, QHBoxLayout, QPushButton, QVBoxLayout, QMessageBox from game import Game from qt_ui.widgets.QBudgetBox import QBudgetBox @@ -21,13 +21,44 @@ class QTopPanel(QFrame): self.budgetBox = QBudgetBox() self.budgetBox.setBudget(self.game.budget, self.game.budget_reward_amount) - self.passTurn = QPushButton("Pass Turn") - self.passTurn.setIcon(CONST.ICONS["PassTurn"]) - self.passTurn.setProperty("style", "btn-primary") + self.passTurnButton = QPushButton("Pass Turn") + self.passTurnButton.setIcon(CONST.ICONS["PassTurn"]) + self.passTurnButton.setProperty("style", "btn-primary") + self.passTurnButton.clicked.connect(self.passTurn) + + self.submenus = QVBoxLayout() + self.settings = QPushButton("Settings") + self.settings.setIcon(CONST.ICONS["Settings"]) + self.settings.setProperty("style", "btn-primary") + self.settings.clicked.connect(self.openSettings) + + self.statistics = QPushButton("Statistics") + self.statistics.setIcon(CONST.ICONS["Statistics"]) + self.statistics.setProperty("style", "btn-primary") + self.statistics.clicked.connect(self.openStatisticsWindow) + + self.submenus.addWidget(self.settings) + self.submenus.addWidget(self.statistics) self.layout = QHBoxLayout() self.layout.addStretch(1) + self.layout.addLayout(self.submenus) self.layout.addWidget(self.turnCounter) self.layout.addWidget(self.budgetBox) - self.layout.addWidget(self.passTurn) - self.setLayout(self.layout) \ No newline at end of file + self.layout.addWidget(self.passTurnButton) + self.setLayout(self.layout) + + def setGame(self, game:Game): + self.game = game + self.turnCounter.setCurrentTurn(self.game.turn, self.game.current_day) + self.budgetBox.setBudget(self.game.budget, self.game.budget_reward_amount) + + def openSettings(self): + QMessageBox.information(self, "Settings", "Todo open game settings") + + def openStatisticsWindow(self): + QMessageBox.information(self, "Stats", "Todo open stats window") + + def passTurn(self): + self.game.pass_turn() + self.setGame(self.game) \ No newline at end of file diff --git a/resources/ui/misc/pass_turn.png b/resources/ui/misc/pass_turn.png new file mode 100644 index 00000000..1908418d Binary files /dev/null and b/resources/ui/misc/pass_turn.png differ diff --git a/resources/ui/misc/settings.png b/resources/ui/misc/settings.png new file mode 100644 index 00000000..3caf5ba3 Binary files /dev/null and b/resources/ui/misc/settings.png differ diff --git a/resources/ui/misc/statistics.png b/resources/ui/misc/statistics.png new file mode 100644 index 00000000..fdbcee65 Binary files /dev/null and b/resources/ui/misc/statistics.png differ