diaojiaolou
/
Deep-Live-Cam
mirror of https://github.com/hacksider/Deep-Live-Cam.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the button position and bugs

pull/746/head
KRSHH 2024-10-14 19:11:44 +05:30
parent 75decc5838
commit b58ffffd37
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modules/ui.py
View File

@ -202,7 +202,7 @@ class TargetLabel(DragDropLabel):
def init(start: Callable[[], None], destroy: Callable[[], None]) -> tkdnd.TkinterDnD.Tk: def init(start: Callable[[], None], destroy: Callable[[], None]) -> tkdnd.TkinterDnD.Tk:
global ROOT, PREVIEW global ROOT, PREVIEW, donate_frame
ROOT = create_root(start, destroy) ROOT = create_root(start, destroy)
PREVIEW = create_preview(ROOT) PREVIEW = create_preview(ROOT)
@ -213,7 +213,7 @@ def init(start: Callable[[], None], destroy: Callable[[], None]) -> tkdnd.Tkinte
def create_root( def create_root(
start: Callable[[], None], destroy: Callable[[], None] start: Callable[[], None], destroy: Callable[[], None]
) -> tkdnd.TkinterDnD.Tk: ) -> tkdnd.TkinterDnD.Tk:
global source_label, target_label, status_label global source_label, target_label, status_label, donate_frame
ctk.set_appearance_mode("dark") ctk.set_appearance_mode("dark")
ctk.set_default_color_theme("blue") ctk.set_default_color_theme("blue")
@ -390,7 +390,14 @@ def create_root(
button_frame, button_frame,
text="Start", text="Start",
cursor="hand2", cursor="hand2",
command=lambda: analyze_target(start, root), command=lambda: [
(
donate_frame.destroy()
if "donate_frame" in globals() and donate_frame.winfo_exists()
else None
),
analyze_target(start, root),
],
fg_color="#4CAF50", fg_color="#4CAF50",
hover_color="#45a049", hover_color="#45a049",
) )
@ -405,10 +412,15 @@ def create_root(
preview_button.pack(side="left", padx=10, expand=True) preview_button.pack(side="left", padx=10, expand=True)
# --- Camera Selection --- # --- Camera Selection ---
camera_label = ctk.CTkLabel(root, text="Select Camera:") camera_frame = ctk.CTkFrame(main_frame, fg_color="#2a2d2e", corner_radius=15)
camera_label.place(relx=0.4, rely=0.86, relwidth=0.2, relheight=0.05) camera_frame.grid(row=3, column=0, columnspan=3, padx=10, pady=(0, 10), sticky="ew")
camera_label = ctk.CTkLabel(
camera_frame, text="Select Camera:", font=("Roboto", 14)
)
camera_label.pack(side="left", padx=(20, 10), pady=10)
available_cameras = get_available_cameras() available_cameras = get_available_cameras()
# Convert camera indices to strings for CTkOptionMenu
available_camera_indices, available_camera_strings = available_cameras available_camera_indices, available_camera_strings = available_cameras
camera_variable = ctk.StringVar( camera_variable = ctk.StringVar(
value=( value=(
@ -418,23 +430,34 @@ def create_root(
) )
) )
camera_optionmenu = ctk.CTkOptionMenu( camera_optionmenu = ctk.CTkOptionMenu(
root, variable=camera_variable, values=available_camera_strings camera_frame,
variable=camera_variable,
values=available_camera_strings,
width=200,
font=("Roboto", 14),
) )
camera_optionmenu.place(relx=0.65, rely=0.86, relwidth=0.2, relheight=0.05) camera_optionmenu.pack(side="left", padx=10, pady=10)
# --- End Camera Selection ---
live_button = ModernButton( live_button = ModernButton(
button_frame, camera_frame,
text="Live", text="Live",
cursor="hand2", cursor="hand2",
command=lambda: webcam_preview( command=lambda: [
root, (
available_camera_indices[ donate_frame.destroy()
available_camera_strings.index(camera_variable.get()) if "donate_frame" in globals() and donate_frame.winfo_exists()
], else None
), ),
webcam_preview(
root,
available_camera_indices[
available_camera_strings.index(camera_variable.get())
],
),
],
) )
live_button.pack(side="left", padx=10, expand=True) live_button.pack(side="left", padx=10, pady=10)
# --- End Camera Selection ---
stop_button = ModernButton( stop_button = ModernButton(
button_frame, button_frame,
@ -449,7 +472,7 @@ def create_root(
status_label = ModernLabel( status_label = ModernLabel(
main_frame, text=None, justify="center", fg_color="#1a1a1a" main_frame, text=None, justify="center", fg_color="#1a1a1a"
) )
status_label.grid(row=3, column=0, columnspan=3, pady=10, sticky="ew") status_label.grid(row=4, column=0, columnspan=3, pady=10, sticky="ew")
donate_frame = ctk.CTkFrame(main_frame, fg_color="#1a1a1a") donate_frame = ctk.CTkFrame(main_frame, fg_color="#1a1a1a")
donate_frame.grid(row=4, column=0, columnspan=3, pady=5, sticky="ew") donate_frame.grid(row=4, column=0, columnspan=3, pady=5, sticky="ew")