Update timer.py

Author: simon-milata

timer.py

@@ -740,6 +740,10 @@ def change_focus(event):
 subject_btn.place(anchor="s", relx=0.5, rely=0.9)
 pomodoro_frame = ctk.CTkFrame(subject_pomodoro_frame, fg_color=frame_color, corner_radius=10, width=frame_width, height=220)
 pomodoro_frame.pack(padx=frame_padding, pady=frame_padding)
+pomodoro_label = ctk.CTkLabel(pomodoro_frame, text="Pomodoro", font=(font_family, int(font_size)), text_color=font_color)
+pomodoro_label.place(anchor="nw", relx=0.05, rely=0.05)
+pomodoro_checkbox = ctk.CTkCheckBox(pomodoro_frame, text="On/Off", onvalue="On", offvalue="Off", fg_color=button_color, hover=False)
+pomodoro_checkbox.place(anchor="s", relx=0.5, rely=0.9)
 
 #DATA UI ROW
 data_frame = ctk.CTkFrame(main_frame, fg_color=frame_color, corner_radius=10, width=WIDTH-10, height=button_height*2)
@@ -776,48 +780,51 @@ def change_focus(event):
 
 
 history_frame_frame = ctk.CTkFrame(history_frame, fg_color=frame_color, corner_radius=10, height=(HEIGHT+((widget_padding_x)*2)), width=WIDTH-frame_padding*2)
-history_frame_frame.grid(row=0, column=0, padx=frame_padding, pady=frame_padding)
+history_frame_frame.grid(row=0, column=0, padx=frame_padding, pady=(frame_padding, 0))
 history_frame_frame.pack_propagate(False)
 
-history_label_frame = ctk.CTkFrame(history_frame_frame, fg_color="transparent", width=WIDTH-(frame_padding*4))
-history_label_frame.pack()
+history_label_frame = ctk.CTkFrame(history_frame_frame, fg_color="transparent", width=WIDTH-(frame_padding*4), height=35)
+history_label_frame.pack(pady=(frame_padding, 0))
+history_label_frame.grid_propagate(False)
 
 history_data_frame = ctk.CTkScrollableFrame(history_frame_frame, fg_color="transparent", width=WIDTH-(frame_padding*4), height=520+frame_padding*2)
-history_data_frame.pack(padx=frame_padding, pady=frame_padding)
+history_data_frame.pack(padx=frame_padding)
 
 start_label = ctk.CTkLabel(history_label_frame, text="Start", font=(font_family, int(font_size*1.25)), text_color=font_color, fg_color="transparent")
-start_label.grid(row=0, column=0, padx=widget_padding_x, pady=widget_padding_y)
+start_label.grid(row=0, column=0, padx=(WIDTH-(frame_padding*4))/11)
 end_label = ctk.CTkLabel(history_label_frame, text="End", font=(font_family, int(font_size*1.25)), text_color=font_color, fg_color="transparent")
-end_label.grid(row=0, column=1, padx=widget_padding_x, pady=widget_padding_y)
+end_label.grid(row=0, column=1, padx=(WIDTH-(frame_padding*4))/11)
 duration_label = ctk.CTkLabel(history_label_frame, text="Duration", font=(font_family, int(font_size*1.25)), text_color=font_color, fg_color="transparent")
-duration_label.grid(row=0, column=2, padx=widget_padding_x, pady=widget_padding_y)
+duration_label.grid(row=0, column=2, padx=widget_padding_x)
 break_label = ctk.CTkLabel(history_label_frame, text="Break", font=(font_family, int(font_size*1.25)), text_color=font_color, fg_color="transparent")
-break_label.grid(row=0, column=3, padx=widget_padding_x, pady=widget_padding_y)
+break_label.grid(row=0, column=3, padx=(WIDTH-(frame_padding*4))/37)
+subject_label = ctk.CTkLabel(history_label_frame, text="Subject", font=(font_family, int(font_size*1.25)), text_color=font_color, fg_color="transparent")
+subject_label.grid(row=0, column=4, padx=(WIDTH-(frame_padding*4))/17)
 
 start_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent")
-start_frame.grid(row=1, column=0, padx=frame_padding, pady=frame_padding)
+start_frame.grid(row=1, column=0, padx=frame_padding)
 start_text = ctk.CTkLabel(start_frame, font=(font_family, font_size), text_color=font_color)
-start_text.pack(padx=widget_padding_x*3, pady=widget_padding_y)
+start_text.pack(padx=widget_padding_x*3)
 
 end_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent")
-end_frame.grid(row=1, column=1, padx=frame_padding, pady=frame_padding)
+end_frame.grid(row=1, column=1, padx=frame_padding)
 end_text = ctk.CTkLabel(end_frame, text="", font=(font_family, font_size), text_color=font_color)
-end_text.pack(padx=widget_padding_x*3, pady=widget_padding_y)
+end_text.pack(padx=widget_padding_x*3)
 
 duration_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent")
-duration_frame.grid(row=1, column=2, padx=frame_padding, pady=frame_padding)
+duration_frame.grid(row=1, column=2, padx=frame_padding)
 duration_text = ctk.CTkLabel(duration_frame, text="", font=(font_family, font_size), text_color=font_color)
-duration_text.pack(padx=widget_padding_x*3, pady=widget_padding_y)
+duration_text.pack(padx=widget_padding_x*3)
 
 break_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent")
-break_frame.grid(row=1, column=3, padx=frame_padding, pady=frame_padding)
+break_frame.grid(row=1, column=3, padx=frame_padding)
 break_text = ctk.CTkLabel(break_frame, text="", font=(font_family, font_size), text_color=font_color)
-break_text.pack(padx=widget_padding_x*3, pady=widget_padding_y)
+break_text.pack(padx=widget_padding_x*3)
 
 subject_frame = ctk.CTkFrame(history_data_frame, fg_color="transparent")
-subject_frame.grid(row=1, column=4, padx=frame_padding, pady=frame_padding)
+subject_frame.grid(row=1, column=4, padx=frame_padding)
 subject_text = ctk.CTkLabel(subject_frame, text="", font=(font_family, font_size), text_color=font_color)
-subject_text.pack(padx=widget_padding_x*3, pady=widget_padding_y)
+subject_text.pack(padx=widget_padding_x*3)
 
 settings_tab = ctk.CTkFrame(tab_frame, width=tab_frame_width, height=tab_height*0.8, fg_color=tab_color)
 settings_tab.place(relx=0.5, rely=1, anchor="s")