Icon order in topbar

This commit is contained in:
Khopa 2019-06-30 01:11:46 +02:00
parent 00b9ba0f32
commit 96ee14bf08

View File

@ -114,15 +114,15 @@ class OverviewCanvas:
self.budget_label.grid(column=col, row=0, sticky=NW) self.budget_label.grid(column=col, row=0, sticky=NW)
col += 1 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.current_turn = StringVar()
self.turn_label = Label(self.options, textvariable=self.current_turn, **STYLES["widget-big"]) self.turn_label = Label(self.options, textvariable=self.current_turn, **STYLES["widget-big"])
self.turn_label.grid(column=col, row=0, sticky=NE) self.turn_label.grid(column=col, row=0, sticky=NE)
col += 1 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, Button(self.options, text="Pass turn", command=self.parent.pass_turn,
**{**STYLES["btn-primary"],**{ "pady": 4}}).grid(column=col, row=0, sticky=NE) **{**STYLES["btn-primary"],**{ "pady": 4}}).grid(column=col, row=0, sticky=NE)
col += 1 col += 1
@ -641,8 +641,7 @@ class OverviewCanvas:
return action return action
def updateOptions(self): def updateOptions(self):
self.current_turn.set("Turn : {} [{} {}]".format(self.game.turn, self.game.current_day.strftime("%d %b %Y"), self.current_turn.set("Turn : {} - {}".format(self.game.turn, self.game.current_day.strftime("%d %b %Y")))
self.game.current_turn_daytime))
self.current_budget.set("{}M $ (+{}M $)".format(self.game.budget, self.game.budget_reward_amount)) self.current_budget.set("{}M $ (+{}M $)".format(self.game.budget, self.game.budget_reward_amount))
daytime = self.game.current_turn_daytime daytime = self.game.current_turn_daytime