From 8246c8e94b4292c492fe1e9101902fdfe9de000d Mon Sep 17 00:00:00 2001 From: Khopa Date: Fri, 5 Jul 2019 21:02:18 +0200 Subject: [PATCH] Top bar layout, added some icons and possible to pass turn --- qt_ui/stylesheets/style.css | 16 ++++++------ qt_ui/uiconstants.py | 2 ++ qt_ui/widgets/QTopPanel.py | 43 ++++++++++++++++++++++++++----- resources/ui/misc/pass_turn.png | Bin 0 -> 334 bytes resources/ui/misc/settings.png | Bin 0 -> 799 bytes resources/ui/misc/statistics.png | Bin 0 -> 665 bytes 6 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 resources/ui/misc/pass_turn.png create mode 100644 resources/ui/misc/settings.png create mode 100644 resources/ui/misc/statistics.png 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 0000000000000000000000000000000000000000..1908418d9bfe52e70afb5a80cc213d632a071d0a GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WSkfJR9T^xl_H+M9WCij$3p^r= z85sBufiR<}hF1enP@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qc&+M-s=L?{kGoCJv zAs*g$CmrNGn+k_^w<*KUj-g@%YNS?p$$E78Xvs*42dp4Wh-1OJy(gNRa zIhK=6GA4VkneQpJ zh_77^v_vg>+Y%7vet8B^`{GO=sV!51EG+i_D_r)HP57RUpd0(SYM{RuJYD@<);T3K F0RY6+gUkQ` literal 0 HcmV?d00001 diff --git a/resources/ui/misc/settings.png b/resources/ui/misc/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..3caf5ba318cedb5ad5f95552f95563d0276dc216 GIT binary patch literal 799 zcmV+)1K|9LP)N2bZe?^J zG%hhNHvLWs=l}o$ok>JNR7gwJl*><3Q4q!(6OC@%`u8b{inyVrEmoo^)D6T1NzEztZ0#yYl;;uvT|guH#c9qA=5 zAg2Cw9TGVer#1*k>w5foOLE;d|a+9b2{6;GC-xY^%=;Q`)5 z4|*xNl>d#{cNmOnbHqEg?^Zg=M5`S> zh^ecLFm%2IUomzbkv5#|!RR?gcO9;vlNBv;CY+}8H**JtLYYomI(-X09py2^wa{Wk zi>#cO4&0-AJYPenZcN4yth~T(RF*a$_ziFl`>Pc#GEq7+6EPGWyGnC^^BkuGwRh6PiWW(z zw-a}7^FvQlmKD(V?Mr?k>ZOwvEu!DFd*c`Q`UqV-_r5_oS-v@Y&P=rxEi%z#Z8+0~zR*^0lZO>8awZz?iDgBLtXxy9 d=>J?k-ybfqLzc~+R&q9iy!t)x7$D3zfgF*C13FE6!3!9>qc&+M-s=L-e~CUH*} z#}E(iyHiekM<)s#-CQUr{x>>%Vpew$i>8v6muBuur(G91I3F#x`{3xZBr_^X*O4{X z_4VR~CV?R$y@LJoUK;e6>*c*$X8T9%`|q@8Pwu?uHvhJN#lrWAPdZGWW=&MMHf6PI zQ$+AOG0r64olzM=-S4B?XZ_TAb?( zUI{fo%ii5vYW|mP@^bOzJKv^;D>Z&}eA~QZhx4|COix=|E9*x#Q_g(Z+2-}p(RYvA z9mVJkPwMI(8?=6ZA(g+GSE@eMJpFqk(6Me4rXRj=u&|N;_tCr04j#|h@Nu{LtMcHC>wHQR*`9qXF;-zosFiQw^`EVeFF2|_wxgVw|-oI zcuvcktC>$`+h4u^nzIKexQX@1LGg))f9Ty3@{=z=5VSMqnKQ)gj|#qVSL(-}j%fa)*Z{dv{W?@^7mt9RP3iwDeCTwy*k>(RB