Skip to content

Commit 6750171

Browse files
committed
Experimenting with new GUI layout
1 parent 89cceef commit 6750171

File tree

1 file changed

+224
-135
lines changed

1 file changed

+224
-135
lines changed

Python/gui/gui_layout.py

Lines changed: 224 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -7,148 +7,237 @@
77
def get_layout():
88
return [
99
[
10-
sg.Column(get_paths_column()),
11-
],
12-
[
13-
sg.Column(get_options_column()),
14-
sg.Column(get_info_column())
15-
]
16-
]
17-
18-
19-
def get_paths_column():
20-
return [
21-
[
22-
sg.Frame(
23-
layout=[
24-
[
25-
sg.Text(
26-
"CCCP folder:",
27-
pad=(
28-
(13, 12),
29-
(0, 0),
10+
[
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+
)
3039
)
31-
),
32-
sg.In(
33-
sg.user_settings_get_entry("cccp_folder"),
34-
size=(34, 1),
35-
tooltip=" Location of your CCCP folder ",
36-
enable_events = True,
37-
key="CCCP_FOLDER",
38-
background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("cccp_folder") else cfg.NO_PATH_SET_COLOR,
39-
pad=(
40-
(0, 0),
41-
(3, 0),
42-
)
43-
),
44-
sg.FolderBrowse(
45-
size=(7, 1),
46-
pad=(
47-
(15, 15),
48-
(3, 0),
49-
)
50-
)
40+
]
5141
],
52-
[
53-
sg.ProgressBar(
54-
999,
55-
size=(49.9, 40),
56-
key="PROGRESS_BAR",
57-
pad=(
58-
(15, 0),
59-
(0, 0)
42+
title=""
43+
)
44+
],
45+
[
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 ",
6061
)
61-
),
62-
sg.Button(
63-
"Convert",
64-
key="CONVERT",
65-
size=(7, 1),
66-
pad=(
67-
(15, 0),
68-
(15, 15)
62+
]
63+
],
64+
title="",
65+
pad=(
66+
(9, 0),
67+
(12, 0)
68+
)
69+
),
70+
sg.Frame(
71+
layout=[
72+
[
73+
sg.ButtonMenu('Options', ['_', ['Edit Me', 'Exit']])
74+
]
75+
],
76+
title=""
77+
),
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+
)
6998
)
70-
)
71-
]
72-
],
73-
title="Convert Mods"
74-
)
99+
]
100+
],
101+
title=""
102+
)
103+
]
75104
]
76105
]
77106

78107

79-
def get_options_column():
80-
return [
81-
[
82-
sg.Frame(
83-
layout=[
84-
[
85-
sg.Checkbox(
86-
"Skip conversion",
87-
tooltip=" For previously converted mods, does not skip case matching ",
88-
key="SKIP_CONVERSION",
89-
default=sg.user_settings_get_entry("skip_conversion"),
90-
enable_events=True,
91-
pad=(
92-
(11, 0),
93-
(5, 4)
94-
)
95-
),
96-
sg.Checkbox(
97-
"Output zips",
98-
tooltip=" Zipping is slow ",
99-
key="OUTPUT_ZIPS",
100-
default=sg.user_settings_get_entry("output_zips"),
101-
enable_events=True,
102-
pad=(
103-
(6, 0),
104-
(1, 0)
105-
)
106-
),
107-
sg.Checkbox(
108-
"Play finish sound",
109-
tooltip=" Notifies you when the conversion has finished ",
110-
key="PLAY_FINISH_SOUND",
111-
default=sg.user_settings_get_entry("play_finish_sound"),
112-
enable_events=True,
113-
pad=(
114-
(7, 10),
115-
(1, 0)
116-
)
117-
)
118-
]
119-
],
120-
title="Options"
121-
)
122-
],
123-
]
108+
# def get_paths_column():
109+
# return [
110+
# [
111+
# sg.Frame(
112+
# layout=[
113+
# [
114+
# sg.Text(
115+
# "CCCP folder:",
116+
# pad=(
117+
# (13, 12),
118+
# (0, 0),
119+
# )
120+
# ),
121+
# sg.In(
122+
# sg.user_settings_get_entry("cccp_folder"),
123+
# size=(34, 1),
124+
# tooltip=" Location of your CCCP folder ",
125+
# enable_events = True,
126+
# key="CCCP_FOLDER",
127+
# background_color=sg.theme_input_background_color() if sg.user_settings_get_entry("cccp_folder") else cfg.NO_PATH_SET_COLOR,
128+
# pad=(
129+
# (0, 0),
130+
# (3, 0),
131+
# )
132+
# ),
133+
# sg.FolderBrowse(
134+
# size=(7, 1),
135+
# pad=(
136+
# (15, 15),
137+
# (3, 0),
138+
# )
139+
# )
140+
# ],
141+
# [
142+
# sg.ProgressBar(
143+
# 999,
144+
# size=(15, 40),
145+
# key="PROGRESS_BAR",
146+
# pad=(
147+
# (15, 0),
148+
# (0, 0)
149+
# )
150+
# ),
151+
# sg.Button(
152+
# "Convert",
153+
# key="CONVERT",
154+
# size=(7, 1),
155+
# pad=(
156+
# (15, 0),
157+
# (15, 15)
158+
# )
159+
# )
160+
# ]
161+
# ],
162+
# title="Convert Mods"
163+
# )
164+
# ]
165+
# ]
124166

125167

126-
def get_info_column():
127-
return [
128-
[
129-
sg.Frame(
130-
layout=[
131-
[
132-
sg.Image(
133-
utils.path("Media/github-icon.png"),
134-
enable_events=True,
135-
key="GITHUB",
136-
tooltip=" Visit this program's GitHub page ",
137-
size=(56, 47)
138-
),
139-
sg.Image(
140-
utils.path("Media/discord-icon.png"),
141-
enable_events=True,
142-
key="DISCORD",
143-
tooltip=" Visit the CCCP Discord server for help ",
144-
)
145-
]
146-
],
147-
title="",
148-
pad=(
149-
(9, 0),
150-
(12, 0)
151-
)
152-
)
153-
]
154-
]
168+
# def get_options_column():
169+
# return [
170+
# [
171+
# sg.Frame(
172+
# layout=[
173+
# [
174+
# sg.Checkbox(
175+
# "Skip conversion",
176+
# tooltip=" For previously converted mods, does not skip case matching ",
177+
# key="SKIP_CONVERSION",
178+
# default=sg.user_settings_get_entry("skip_conversion"),
179+
# enable_events=True,
180+
# pad=(
181+
# (11, 0),
182+
# (5, 4)
183+
# )
184+
# ),
185+
# sg.Checkbox(
186+
# "Output zips",
187+
# tooltip=" Zipping is slow ",
188+
# key="OUTPUT_ZIPS",
189+
# default=sg.user_settings_get_entry("output_zips"),
190+
# enable_events=True,
191+
# pad=(
192+
# (6, 0),
193+
# (1, 0)
194+
# )
195+
# ),
196+
# sg.Checkbox(
197+
# "Play finish sound",
198+
# tooltip=" Notifies you when the conversion has finished ",
199+
# key="PLAY_FINISH_SOUND",
200+
# default=sg.user_settings_get_entry("play_finish_sound"),
201+
# enable_events=True,
202+
# pad=(
203+
# (7, 10),
204+
# (1, 0)
205+
# )
206+
# )
207+
# ]
208+
# ],
209+
# title="Options"
210+
# )
211+
# ],
212+
# ]
213+
214+
215+
# def get_info_column():
216+
# return [
217+
# [
218+
# sg.Frame(
219+
# layout=[
220+
# [
221+
# sg.Image(
222+
# utils.path("Media/github-icon.png"),
223+
# enable_events=True,
224+
# key="GITHUB",
225+
# tooltip=" Visit this program's GitHub page ",
226+
# size=(56, 47)
227+
# ),
228+
# sg.Image(
229+
# utils.path("Media/discord-icon.png"),
230+
# enable_events=True,
231+
# key="DISCORD",
232+
# tooltip=" Visit the CCCP Discord server for help ",
233+
# )
234+
# ]
235+
# ],
236+
# title="",
237+
# pad=(
238+
# (9, 0),
239+
# (12, 0)
240+
# )
241+
# )
242+
# ]
243+
# ]

0 commit comments

Comments
 (0)