Skip to content

Commit

Permalink
1.1.1: fix text colors, add resource files
Browse files Browse the repository at this point in the history
  • Loading branch information
@jojoe77777
jojoe77777 committed May 28, 2024
1 parent b38dccf commit 864ba07
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def getResourcePath(name):

home = os.path.expanduser("~")
cwd = home + "/PaceClipper"
version = "1.1.0"
version = "1.1.1"

nvenc = False
downloaded = False
Expand Down Expand Up @@ -96,7 +96,7 @@ def __init__(self):
self.bgImageLabel.place(x=0, y=0, relwidth=1, relheight=1)

customtkinter.CTkLabel(self, text="Settings",
font=("Minecraftia", 16), fg_color="#3E3548",
font=("Minecraftia", 16), fg_color="#3E3548", text_color="#FFFFFF",
bg_color="#3E3548").place(x=425, y=10)

self.obsFolder = customtkinter.CTkButton(self, text="OBS Folder", font=("Minecraftia", 16),
Expand Down Expand Up @@ -147,7 +147,7 @@ def __init__(self):

vcmd = (self.register(self.setName), '%P')
self.nameInput = customtkinter.CTkEntry(self, font=("Minecraftia", 16), textvariable=self.name, width=220,
height=36, fg_color="#3E3548", bg_color="#3E3548",
height=36, fg_color="#3E3548", bg_color="#3E3548", text_color="#FFFFFF",
border_color="#867396", border_width=1,
corner_radius=0, validatecommand=vcmd, validate="key")
self.nameInput.place(x=130, y=106)
Expand All @@ -174,7 +174,7 @@ def __init__(self):
customtkinter.CTkButton(self, text="", width=465, height=1, bg_color="#796d82").place(x=26, y=155)

customtkinter.CTkLabel(self, text="Trimming",
font=("Minecraftia", 16), fg_color="#3E3548",
font=("Minecraftia", 16), fg_color="#3E3548", text_color="#FFFFFF",
bg_color="#3E3548").place(x=425, y=158)

self.fetchButton = customtkinter.CTkButton(
Expand All @@ -187,15 +187,15 @@ def __init__(self):
customtkinter.CTkButton(self, text="", width=465, height=1, bg_color="#796d82").place(x=26, y=315)

customtkinter.CTkLabel(self, text="Clipping",
font=("Minecraftia", 16), fg_color="#3E3548",
font=("Minecraftia", 16), fg_color="#3E3548", text_color="#FFFFFF",
bg_color="#3E3548").place(x=425, y=318)

self.outButton = customtkinter.CTkButton(self, text="Open output folder", font=("Arial", 16),
command=self.openOut)

self.loadingLabel = customtkinter.CTkLabel(
self, text="Loading...",
font=("Minecraftia", 16), fg_color="#3E3548",
font=("Minecraftia", 16), fg_color="#3E3548", text_color="#FFFFFF",
bg_color="#3E3548")
self.loadingLabel.place(x=155, y=166)

Expand Down Expand Up @@ -237,11 +237,11 @@ def __init__(self):
self.endSplitButton.lower(self.startSplit)

self.startLabel = customtkinter.CTkLabel(
self, text="Start: ", font=("Minecraftia", 16), width=60, height=30, fg_color="#3E3548", bg_color="#3E3548")
self, text="Start: ", font=("Minecraftia", 16), width=60, height=30, fg_color="#3E3548", bg_color="#3E3548", text_color="#FFFFFF")
self.endLabel = customtkinter.CTkLabel(
self, text="End: ", font=("Minecraftia", 16), width=60, fg_color="#3E3548", bg_color="#3E3548")
self, text="End: ", font=("Minecraftia", 16), width=60, fg_color="#3E3548", bg_color="#3E3548", text_color="#FFFFFF")
self.runLabel = customtkinter.CTkLabel(
self, text="Run: ", font=("Minecraftia", 16), height=30, width=60, fg_color="#3E3548", bg_color="#3E3548")
self, text="Run: ", font=("Minecraftia", 16), height=30, width=60, fg_color="#3E3548", bg_color="#3E3548", text_color="#FFFFFF")

self.watchBtn = customtkinter.CTkButton(
self, text="Watch", font=("Minecraftia", 18), width=100, height=45, corner_radius=0,
Expand All @@ -255,36 +255,36 @@ def __init__(self):

self.smoothButton = customtkinter.CTkCheckBox(self, text="Blend down to 60 fps", font=("Minecraftia", 16),
command=self.update_smoothing, variable=self.smoothing,
onvalue="on", offvalue="off", bg_color="#3E3548",
fg_color="#555577", hover_color="#b2a6bf")
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
fg_color="#555577", hover_color="#493e54", text_color="#FFFFFF")

self.trackLabel = customtkinter.CTkLabel(
self, text="Audio tracks:", font=("Minecraftia", 16), width=0, height=0, fg_color="#3E3548", bg_color="#3E3548")
self, text="Audio tracks:", font=("Minecraftia", 16), width=0, height=0, fg_color="#3E3548", bg_color="#3E3548", text_color="#FFFFFF")


self.trackOpt1 = customtkinter.CTkCheckBox(self, text="1", font=("Minecraftia", 16),
command=self.updateTracks, variable=self.track1,
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf", text_color="#FFFFFF",
fg_color="#555577", hover_color="#493e54", width=0)
self.trackOpt2 = customtkinter.CTkCheckBox(self, text="2", font=("Minecraftia", 16),
command=self.updateTracks, variable=self.track2,
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf", text_color="#FFFFFF",
fg_color="#555577", hover_color="#493e54", width=0)
self.trackOpt3 = customtkinter.CTkCheckBox(self, text="3", font=("Minecraftia", 16),
command=self.updateTracks, variable=self.track3,
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf", text_color="#FFFFFF",
fg_color="#555577", hover_color="#493e54", width=0)
self.trackOpt4 = customtkinter.CTkCheckBox(self, text="4", font=("Minecraftia", 16),
command=self.updateTracks, variable=self.track4,
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf", text_color="#FFFFFF",
fg_color="#555577", hover_color="#493e54", width=0)
self.trackOpt5 = customtkinter.CTkCheckBox(self, text="5", font=("Minecraftia", 16),
command=self.updateTracks, variable=self.track5,
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf", text_color="#FFFFFF",
fg_color="#555577", hover_color="#493e54", width=0)
self.trackOpt6 = customtkinter.CTkCheckBox(self, text="6", font=("Minecraftia", 16),
command=self.updateTracks, variable=self.track6,
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf",
onvalue="on", offvalue="off", bg_color="#3E3548", border_color="#b2a6bf", text_color="#FFFFFF",
fg_color="#555577", hover_color="#493e54", width=0)

self.pacemanButton = customtkinter.CTkButton(
Expand Down
Binary file added resources/bg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/font.ttf
View file
Binary file not shown.
Binary file added resources/icon.ico
View file
Binary file not shown.

0 comments on commit 864ba07

Please sign in to comment.