From 6b96410ea4e4609ff47cf63c461acfd70ddaee19 Mon Sep 17 00:00:00 2001 From: Vasyl Horbachenko Date: Fri, 12 Oct 2018 22:29:37 +0300 Subject: [PATCH] updated config menu --- ui/configurationmenu.py | 58 +++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/ui/configurationmenu.py b/ui/configurationmenu.py index d8b80140..f43fdc36 100644 --- a/ui/configurationmenu.py +++ b/ui/configurationmenu.py @@ -44,49 +44,61 @@ class ConfigurationMenu(Menu): # Header head = Frame(self.frame, **STYLES["header"]) - head.grid(row=0, column=0, columnspan=2, sticky=NSEW) - Label(head, text="Configuration", **STYLES["title"]).grid() + head.grid(row=0, column=0, sticky=NSEW) + head.grid_columnconfigure(0, weight=100) + Label(head, text="Configuration", **STYLES["title"]).grid(row=0, sticky=W) + Button(head, text="Back", command=self.dismiss, **STYLES["btn-primary"]).grid(row=0, column=1, sticky=E) # Body body = Frame(self.frame, **STYLES["body"]) body.grid(row=1, column=0, sticky=NSEW) + row = 0 - Label(body, text="Player coalition skill", **STYLES["widget"]).grid(row=0, column=0, sticky=W) - Label(body, text="Enemy coalition skill", **STYLES["widget"]).grid(row=1, column=0, sticky=W) - Label(body, text="Enemy AA and vehicle skill", **STYLES["widget"]).grid(row=2, column=0, sticky=W) - + Label(body, text="Player coalition skill", **STYLES["widget"]).grid(row=row, column=0, sticky=W) p_skill = OptionMenu(body, self.player_skill_var, "Average", "Good", "High", "Excellent") - p_skill.grid(row=0, column=1, sticky=E, pady=5) + p_skill.grid(row=row, column=1, sticky=E, pady=5) p_skill.configure(**STYLES["btn-primary"]) + row += 1 + Label(body, text="Enemy coalition skill", **STYLES["widget"]).grid(row=row, column=0, sticky=W) e_skill = OptionMenu(body, self.enemy_skill_var, "Average", "Good", "High", "Excellent") - e_skill.grid(row=1, column=1, sticky=E) + e_skill.grid(row=row, column=1, sticky=E) e_skill.configure(**STYLES["btn-primary"]) + row += 1 + Label(body, text="Enemy AA and vehicle skill", **STYLES["widget"]).grid(row=row, column=0, sticky=W) e_skill = OptionMenu(body, self.enemy_vehicle_var, "Average", "Good", "High", "Excellent") - e_skill.grid(row=2, column=1, sticky=E) + e_skill.grid(row=row, column=1, sticky=E) e_skill.configure(**STYLES["btn-primary"]) + row += 1 - Label(body, text="Aircraft cold start", **STYLES["widget"]).grid(row=3, column=0, sticky=W) - Label(body, text="Takeoff only for player group", **STYLES["widget"]).grid(row=4, column=0, sticky=W) - Label(body, text="Disable night missions", **STYLES["widget"]).grid(row=5, column=0, sticky=W) + Label(body, text="Aircraft cold start", **STYLES["widget"]).grid(row=row, column=0, sticky=W) + Checkbutton(body, variable=self.cold_start_var, **STYLES["radiobutton"]).grid(row=row, column=1, sticky=E) + row += 1 - Checkbutton(body, variable=self.cold_start_var, **STYLES["radiobutton"]).grid(row=3, column=1, sticky=E) - Checkbutton(body, variable=self.takeoff_var, **STYLES["radiobutton"]).grid(row=4, column=1, sticky=E) - Checkbutton(body, variable=self.night_var, **STYLES["radiobutton"]).grid(row=5, column=1, sticky=E) + Label(body, text="Takeoff only for player group", **STYLES["widget"]).grid(row=row, column=0, sticky=W) + Checkbutton(body, variable=self.takeoff_var, **STYLES["radiobutton"]).grid(row=row, column=1, sticky=E) + row += 1 - Button(body, text="Display logs", command=self.display_logs, **STYLES["btn-primary"]).grid(row=6, column=0, sticky=E, pady=30) - Button(body, text="Back", command=self.dismiss, **STYLES["btn-primary"]).grid(row=6, column=1, sticky=E, pady=30) + Label(body, text="Disable night missions", **STYLES["widget"]).grid(row=row, column=0, sticky=W) + Checkbutton(body, variable=self.night_var, **STYLES["radiobutton"]).grid(row=row, column=1, sticky=E) + row += 1 - Label(body, text="Contributors: ", **STYLES["widget"]).grid(row=7, column=0, sticky=W) + Button(body, text="Display logs", command=self.display_logs, **STYLES["btn-primary"]).grid(row=row, column=1, sticky=E, pady=30) + row += 1 - Label(body, text="shdwp - author, maintainer", **STYLES["widget"]).grid(row=8, column=0, sticky=W) - Button(body, text="[github]", command=lambda: webbrowser.open_new_tab("http://github.com/shdwp"), **STYLES["widget"]).grid(row=9, column=1, sticky=E) + Label(body, text="Contributors: ", **STYLES["strong"]).grid(row=row, column=0, columnspan=2, sticky=EW) + row += 1 - Label(body, text="Khopa - contributions", **STYLES["widget"]).grid(row=9, column=0, sticky=W) - Button(body, text="[github]", command=lambda: webbrowser.open_new_tab("http://github.com/Khopa"), **STYLES["widget"]).grid(row=9, column=1, sticky=E) + Label(body, text="shdwp - author, maintainer", **STYLES["widget"]).grid(row=row, column=0, sticky=W) + Button(body, text="[github]", command=lambda: webbrowser.open_new_tab("http://github.com/shdwp"), **STYLES["widget"]).grid(row=row, column=1, sticky=E) + row += 1 - Button(body, text="Cheat +200m", command=self.cheat_money, **STYLES["btn-danger"]).grid(row=11, column=1, pady=30) + Label(body, text="Khopa - contributions", **STYLES["widget"]).grid(row=row, column=0, sticky=W) + Button(body, text="[github]", command=lambda: webbrowser.open_new_tab("http://github.com/Khopa"), **STYLES["widget"]).grid(row=row, column=1, sticky=E) + row += 1 + + Button(body, text="Cheat +200m", command=self.cheat_money, **STYLES["btn-danger"]).grid(row=row, column=1, pady=30) def display_logs(self): raise ShowLogsException()