From 74dae1e115e352becdbcd0d02ed474aaf9ddc5ea Mon Sep 17 00:00:00 2001
From: Brett Williams <blw1138@mac.com>
Date: Sat, 27 May 2023 23:44:36 -0500
Subject: [PATCH] Misc scheduler_gui.py improvements

---
 scheduler_gui.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/scheduler_gui.py b/scheduler_gui.py
index 930f011..33c00ad 100755
--- a/scheduler_gui.py
+++ b/scheduler_gui.py
@@ -80,10 +80,12 @@ class ScheduleJob(Frame):
         self.server_button.pack(fill=X, padx=5, expand=False)
 
         # project frame
-        project_frame = Frame(self)
-        project_frame.pack(fill=X)
+        job_frame = LabelFrame(self, text="Job Settings")
+        job_frame.pack(fill=X, padx=5, pady=5)
 
-        Label(project_frame, text="Project Settings").pack(side=TOP, pady=header_padding)
+        # project frame
+        project_frame = Frame(job_frame)
+        project_frame.pack(fill=X)
 
         project_label = Label(project_frame, text="Project", width=label_width)
         project_label.pack(side=LEFT, padx=5, pady=5)
@@ -92,7 +94,7 @@ class ScheduleJob(Frame):
         self.project_button.pack(fill=X, padx=5, expand=True)
 
         # client frame
-        client_frame = Frame(self)
+        client_frame = Frame(job_frame)
         client_frame.pack(fill=X)
 
         Label(client_frame, text="Client", width=label_width).pack(side=LEFT, padx=5, pady=5)
@@ -101,7 +103,7 @@ class ScheduleJob(Frame):
         self.client_combo.pack(fill=X, padx=5, expand=True)
 
         # renderer frame
-        renderer_frame = Frame(self)
+        renderer_frame = Frame(job_frame)
         renderer_frame.pack(fill=X)
 
         Label(renderer_frame, text="Renderer", width=label_width).pack(side=LEFT, padx=5, pady=5)
@@ -110,7 +112,7 @@ class ScheduleJob(Frame):
         self.renderer_combo.bind('<<ComboboxSelected>>', self.refresh_renderer_settings)
 
         # priority frame
-        priority_frame = Frame(self)
+        priority_frame = Frame(job_frame)
         priority_frame.pack(fill=X)
 
         Label(priority_frame, text="Priority", width=label_width).pack(side=LEFT, padx=5, pady=5)
@@ -119,7 +121,7 @@ class ScheduleJob(Frame):
         Radiobutton(priority_frame, text="3", value=3, variable=self.priority).pack(anchor=W, side=LEFT, padx=5)
 
         # presets
-        presets_frame = Frame(self)
+        presets_frame = Frame(job_frame)
         presets_frame.pack(fill=X)
 
         Label(presets_frame, text="Presets", width=label_width).pack(side=LEFT, padx=5, pady=5)
@@ -128,7 +130,7 @@ class ScheduleJob(Frame):
         self.presets_combo.bind('<<ComboboxSelected>>', self.chose_preset)
 
         # output frame
-        output_frame = Frame(self)
+        output_frame = Frame(job_frame)
         output_frame.pack(fill=X)
 
         Label(output_frame, text="Output", width=label_width).pack(side=LEFT, padx=5, pady=5)
@@ -236,7 +238,6 @@ class ScheduleJob(Frame):
             self.custom_args_entry.delete(0, END)
             self.custom_args_entry.insert(0, matching_dict['args'])
 
-
     def refresh_renderer_settings(self, event=None):
         renderer = self.renderer_combo.get()
 
@@ -266,8 +267,8 @@ class ScheduleJob(Frame):
     def draw_custom_args(self):
         if hasattr(self, 'custom_args_frame') and self.custom_args_frame:
             self.custom_args_frame.forget()
-        self.custom_args_frame = Frame(self)
-        self.custom_args_frame.pack(side=TOP, fill=X, expand=False)
+        self.custom_args_frame = LabelFrame(self, text="Advanced")
+        self.custom_args_frame.pack(side=TOP, fill=X, expand=False, padx=5, pady=5)
         Label(self.custom_args_frame, text="Custom Args", width=label_width).pack(side=LEFT, padx=5, pady=5)
         self.custom_args_entry = Entry(self.custom_args_frame)
         self.custom_args_entry.pack(side=TOP, padx=5, expand=True, fill=X)
@@ -290,10 +291,9 @@ class ScheduleJob(Frame):
             scene_data = Blender.get_scene_info(self.chosen_file)
 
         # blender settings
-        self.blender_frame = Frame(self)
-        self.blender_frame.pack(fill=X)
+        self.blender_frame = LabelFrame(self, text="Blender Settings")
+        self.blender_frame.pack(fill=X, padx=5, pady=5)
 
-        Label(self.blender_frame, text="Blender Settings").pack(side=TOP, pady=header_padding)
 
         blender_engine_frame = Frame(self.blender_frame)
         blender_engine_frame.pack(fill=X)
@@ -327,6 +327,7 @@ class ScheduleJob(Frame):
                     Label(self.blender_cameras_frame, text="Cameras", width=label_width).pack(side=LEFT, padx=5, pady=5)
 
                     choices = [f"{x['name']} - {int(float(x['lens']))}mm" for x in scene_data['cameras']]
+                    choices.sort()
                     self.blender_cameras_list = ChecklistBox(self.blender_cameras_frame, choices, relief="sunken")
                     self.blender_cameras_list.pack(padx=5, fill=X)
                 elif self.blender_cameras_frame:
@@ -402,7 +403,7 @@ def main():
 
     root = Tk()
     root.geometry("500x600+300+300")
-    root.maxsize(width=1000, height=800)
+    root.maxsize(width=1000, height=2000)
     root.minsize(width=600, height=600)
     app = ScheduleJob()
     root.mainloop()