Skip to content

Commit 8f048e6

Browse files
committed
Massive GUI overhaul
1 parent 6750171 commit 8f048e6

File tree

1 file changed

+47
-85
lines changed

1 file changed

+47
-85
lines changed

Python/gui/gui_layout.py

Lines changed: 47 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -8,98 +8,60 @@ def get_layout():
88
return [
99
[
1010
[
11-
sg.Frame(
12-
layout=[
13-
[
14-
sg.Text(
15-
"CCCP folder:",
16-
pad=(
17-
(13, 12),
18-
(0, 0),
19-
)
20-
),
21-
sg.In(
22-
sg.user_settings_get_entry("cccp_folder"),
23-
size=(34, 1),
24-
tooltip=" Location of your CCCP folder ",
25-
enable_events = True,
26-
key="CCCP_FOLDER",
27-
background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("cccp_folder") else cfg.NO_PATH_SET_COLOR,
28-
pad=(
29-
(0, 0),
30-
(3, 0),
31-
)
32-
),
33-
sg.FolderBrowse(
34-
size=(7, 1),
35-
pad=(
36-
(15, 15),
37-
(3, 0),
38-
)
39-
)
40-
]
41-
],
42-
title=""
11+
sg.FolderBrowse(
12+
"CCCP folder",
13+
# size=(7, 1),
14+
# pad=(
15+
# (15, 15),
16+
# (3, 0),
17+
# )
18+
),
19+
sg.In(
20+
sg.user_settings_get_entry("cccp_folder"),
21+
size=(43, 1),
22+
tooltip=" Location of your CCCP folder ",
23+
enable_events = True,
24+
key="CCCP_FOLDER",
25+
background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("cccp_folder") else cfg.NO_PATH_SET_COLOR,
26+
pad=(
27+
(0, 0),
28+
(3, 0),
29+
)
4330
)
4431
],
4532
[
46-
sg.Frame(
47-
layout=[
48-
[
49-
sg.Image(
50-
utils.path("Media/github-icon.png"),
51-
enable_events=True,
52-
key="GITHUB",
53-
tooltip=" Visit this program's GitHub page ",
54-
size=(56, 47)
55-
),
56-
sg.Image(
57-
utils.path("Media/discord-icon.png"),
58-
enable_events=True,
59-
key="DISCORD",
60-
tooltip=" Visit the CCCP Discord server for help ",
61-
)
62-
]
63-
],
64-
title="",
33+
sg.ButtonMenu('Options', ['_', ['Edit Me', 'Exit']]),
34+
sg.Button(
35+
"Convert",
36+
key="CONVERT",
37+
size=(7, 1),
38+
pad=(
39+
(15, 0),
40+
(15, 15)
41+
)
42+
),
43+
sg.ProgressBar(
44+
999,
45+
size=(30, 40),
46+
key="PROGRESS_BAR",
6547
pad=(
66-
(9, 0),
67-
(12, 0)
48+
(15, 0),
49+
(0, 0)
6850
)
6951
),
70-
sg.Frame(
71-
layout=[
72-
[
73-
sg.ButtonMenu('Options', ['_', ['Edit Me', 'Exit']])
74-
]
75-
],
76-
title=""
52+
sg.Image(
53+
utils.path("Media/github-icon.png"),
54+
enable_events=True,
55+
key="GITHUB",
56+
tooltip=" Visit this program's GitHub page ",
57+
size=(56, 47)
58+
),
59+
sg.Image(
60+
utils.path("Media/discord-icon.png"),
61+
enable_events=True,
62+
key="DISCORD",
63+
tooltip=" Visit the CCCP Discord server for help ",
7764
),
78-
sg.Frame(
79-
layout=[
80-
[
81-
sg.ProgressBar(
82-
999,
83-
size=(30, 40),
84-
key="PROGRESS_BAR",
85-
pad=(
86-
(15, 0),
87-
(0, 0)
88-
)
89-
),
90-
sg.Button(
91-
"Convert",
92-
key="CONVERT",
93-
size=(7, 1),
94-
pad=(
95-
(15, 0),
96-
(15, 15)
97-
)
98-
)
99-
]
100-
],
101-
title=""
102-
)
10365
]
10466
]
10567
]

0 commit comments

Comments
 (0)