Merge branch 'develop' into frontline_vector

This commit is contained in:
walterroach
2020-11-27 13:47:10 -06:00
26 changed files with 3269 additions and 902 deletions

View File

@@ -18,6 +18,7 @@ class QBudgetBox(QGroupBox):
self.money_amount = QLabel()
self.finances = QPushButton("Details")
self.finances.setDisabled(True)
self.finances.setProperty("style", "btn-primary")
self.finances.clicked.connect(self.openFinances)
@@ -36,8 +37,12 @@ class QBudgetBox(QGroupBox):
self.money_amount.setText(str(budget) + "M (+" + str(reward) + "M)")
def setGame(self, game):
if game is None:
return
self.game = game
self.setBudget(self.game.budget, self.game.budget_reward_amount)
self.finances.setEnabled(True)
def openFinances(self):
self.subwindow = QFinancesMenu(self.game)

View File

@@ -60,11 +60,13 @@ class QTopPanel(QFrame):
self.factionsInfos = QFactionsInfos(self.game)
self.settings = QPushButton("Settings")
self.settings.setDisabled(True)
self.settings.setIcon(CONST.ICONS["Settings"])
self.settings.setProperty("style", "btn-primary")
self.settings.clicked.connect(self.openSettings)
self.statistics = QPushButton("Statistics")
self.statistics.setDisabled(True)
self.statistics.setIcon(CONST.ICONS["Statistics"])
self.statistics.setProperty("style", "btn-primary")
self.statistics.clicked.connect(self.openStatisticsWindow)
@@ -100,6 +102,9 @@ class QTopPanel(QFrame):
if game is None:
return
self.settings.setEnabled(True)
self.statistics.setEnabled(True)
self.conditionsWidget.setCurrentTurn(game.turn, game.conditions)
self.budgetBox.setGame(game)
self.factionsInfos.setGame(game)