From 96ee14bf08f7cf1eaa4e4c67f478c9282c97dd89 Mon Sep 17 00:00:00 2001 From: Khopa Date: Sun, 30 Jun 2019 01:11:46 +0200 Subject: [PATCH] Icon order in topbar --- ui/overviewcanvas.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ui/overviewcanvas.py b/ui/overviewcanvas.py index 6363d164..f17ecaa1 100644 --- a/ui/overviewcanvas.py +++ b/ui/overviewcanvas.py @@ -114,15 +114,15 @@ class OverviewCanvas: self.budget_label.grid(column=col, row=0, sticky=NW) col += 1 + self.daytime_icon = Label(self.options, image=self.DAWN_ICON, **STYLES["widget-big"]) + self.daytime_icon.grid(column=col, row=0, sticky=NE) + col += 1 + self.current_turn = StringVar() self.turn_label = Label(self.options, textvariable=self.current_turn, **STYLES["widget-big"]) self.turn_label.grid(column=col, row=0, sticky=NE) col += 1 - self.daytime_icon = Label(self.options, image=self.DAWN_ICON, **STYLES["widget-big"]) - self.daytime_icon.grid(column=col, row=0, sticky=NE) - col += 1 - Button(self.options, text="Pass turn", command=self.parent.pass_turn, **{**STYLES["btn-primary"],**{ "pady": 4}}).grid(column=col, row=0, sticky=NE) col += 1 @@ -641,8 +641,7 @@ class OverviewCanvas: return action def updateOptions(self): - self.current_turn.set("Turn : {} [{} {}]".format(self.game.turn, self.game.current_day.strftime("%d %b %Y"), - self.game.current_turn_daytime)) + self.current_turn.set("Turn : {} - {}".format(self.game.turn, self.game.current_day.strftime("%d %b %Y"))) self.current_budget.set("{}M $ (+{}M $)".format(self.game.budget, self.game.budget_reward_amount)) daytime = self.game.current_turn_daytime