DocRock3r/custom-install
1
0
Fork 0
mirror of https://github.com/ihaveamac/custom-install.git synced 2025-12-06 06:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci-gui: make InstallResults transient, adjust listbox frame height based on item count

Browse Source
This commit is contained in:
Ian Burgwin
2021-02-08 21:27:55 -08:00
parent 1b2b0d06db
commit 7b121f5212
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ci-gui.py
View File

@@ -52,6 +52,10 @@ except KeyError:
seeddb_paths.insert(0, join(file_parent, 'seeddb.bin')) seeddb_paths.insert(0, join(file_parent, 'seeddb.bin'))
def clamp(n, smallest, largest):
return max(smallest, min(n, largest))
def find_first_file(paths): def find_first_file(paths):
for p in paths: for p in paths:
if isfile(p): if isfile(p):
@@ -99,8 +103,18 @@ class InstallResults(tk.Toplevel):
super().__init__(parent) super().__init__(parent)
self.parent = parent self.parent = parent
self.wm_withdraw()
self.wm_transient(self.parent)
self.grab_set()
self.wm_title('Install results')
self.rowconfigure(0, weight=1)
self.columnconfigure(0, weight=1)
outer_container = ttk.Frame(self) outer_container = ttk.Frame(self)
outer_container.pack(fill=tk.BOTH, expand=True) outer_container.grid(sticky=tk.NSEW)
outer_container.rowconfigure(0, weight=0)
outer_container.columnconfigure(0, weight=1)
if install_state['failed'] and install_state['installed']: if install_state['failed'] and install_state['installed']:
# some failed and some worked # some failed and some worked
@@ -122,13 +136,17 @@ class InstallResults(tk.Toplevel):
message_label.grid(row=0, column=0, sticky=tk.NSEW, padx=10, pady=10) message_label.grid(row=0, column=0, sticky=tk.NSEW, padx=10, pady=10)
if install_state['installed']: if install_state['installed']:
outer_container.rowconfigure(1, weight=1)
frame = self.simple_listbox_frame(outer_container, 'Installed', install_state['installed']) frame = self.simple_listbox_frame(outer_container, 'Installed', install_state['installed'])
frame.grid(row=1, column=0, sticky=tk.NSEW, padx=10, pady=(0, 10)) frame.grid(row=1, column=0, sticky=tk.NSEW, padx=10, pady=(0, 10))
if install_state['failed']: if install_state['failed']:
outer_container.rowconfigure(2, weight=1)
frame = self.simple_listbox_frame(outer_container, 'Failed', install_state['failed']) frame = self.simple_listbox_frame(outer_container, 'Failed', install_state['failed'])
frame.grid(row=2, column=0, sticky=tk.NSEW, padx=10, pady=(0, 10)) frame.grid(row=2, column=0, sticky=tk.NSEW, padx=10, pady=(0, 10))
self.wm_deiconify()
def simple_listbox_frame(self, parent, title: 'str', items: 'List[str]'): def simple_listbox_frame(self, parent, title: 'str', items: 'List[str]'):
frame = ttk.LabelFrame(parent, text=title) frame = ttk.LabelFrame(parent, text=title)
frame.rowconfigure(0, weight=1) frame.rowconfigure(0, weight=1)
@@ -143,6 +161,8 @@ class InstallResults(tk.Toplevel):
box.insert(tk.END, *items) box.insert(tk.END, *items)
box.config(height=clamp(len(items), 3, 10))
return frame return frame
@@ -481,7 +501,6 @@ class CustomInstallGUI(ttk.Frame):
def install(): def install():
try: try:
result, copied_3dsx = installer.start() result, copied_3dsx = installer.start()
print(result)
if result: if result:
result_window = InstallResults(self.parent, install_state=result, copied_3dsx=copied_3dsx) result_window = InstallResults(self.parent, install_state=result, copied_3dsx=copied_3dsx)
result_window.focus() result_window.focus()