Skip to content

Commit 5b5f73f

Browse files
authored
fix gtk, xfwm and Yellow variation (#8)
- gtk3: Update assets - gtk4: Update assets - build-themes: Update build script for gtk4 for default colour - generate-themes: fix copying the whole default theme directory and update build script for gtk4 - update-variations: fix inkscape segfault - Yellow: update gtk3 and gtk4 assets - xfwm: remove rendering scripts
1 parent dd6b9f7 commit 5b5f73f

File tree

315 files changed

+14951
-14837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

315 files changed

+14951
-14837
lines changed

generate-themes.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def generate_theme(color):
3838
# Copy theme
3939
theme = "usr/share/themes/%s-%s" % (original_name, color)
4040
theme_index = os.path.join(theme, "index.theme")
41-
os.system("cp -R usr/share/themes/%s %s" % (original_name, theme))
41+
os.system("mkdir -p %s" % theme)
42+
os.system("cp -R usr/share/themes/%s/* %s" % (original_name, theme))
4243

4344
# Theme name
4445
for key in ["Name", "GtkTheme"]:
@@ -58,16 +59,14 @@ def generate_theme(color):
5859
os.system("cp -R src/Mint-Y/gtk-4.0/sass %s/gtk-4.0/" % theme)
5960
y_colorize_directory("%s/gtk-4.0/sass" % theme, color)
6061
os.chdir("%s/gtk-4.0" % theme)
61-
6262
if (variant == "-Dark"):
6363
os.system("cp sass/gtk-dark.scss sass/gtk.scss")
64-
os.system("sassc ./sass/gtk.scss gtk.css")
6564
elif (variant == "-Darker"):
6665
os.system("cp sass/gtk-darker.scss sass/gtk.scss")
6766
else:
68-
os.system("sassc ./sass/gtk-dark.scss gtk-dark.css")
69-
os.system("sassc ./sass/gtk.scss gtk.css")
70-
67+
os.system("rm sass/gtk-dark.scss sass/gtk-darker.scss")
68+
69+
os.system("sassc ./sass/gtk.scss gtk.css")
7170
os.system("rm -rf sass .sass-cache")
7271
os.chdir(curdir)
7372

src/Mint-Y/build-themes.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
os.chdir("gtk-4.0/")
1515
os.system("sassc ./sass/gtk.scss gtk.css")
1616
os.system("sassc ./sass/gtk-dark.scss gtk-dark.css")
17+
os.system("sassc ./sass/gtk-darker.scss gtk-darker.css")
1718
os.system("./render-assets.sh")
1819
print("Gtk4 assets updated")
1920

@@ -82,7 +83,7 @@
8283
os.system("mkdir -p %s" % version_folder)
8384
os.system("cp -R gtk-4.0/assets %s" % version_folder)
8485
os.system("cp gtk-4.0/gtk.css %s" % version_folder)
85-
os.system("cp gtk-4.0/gtk-dark.css %s" % version_folder)
86+
# os.system("cp gtk-3.0/thumbnail.png %s" % version_folder)
8687
# Metacity
8788
os.system("cp -R metacity-1 %s" % dest_folder)
8889
os.system("rm %s/*-dark*" % (os.path.join(dest_folder, "metacity-1")))
@@ -115,9 +116,14 @@
115116
os.system("mkdir -p %s" % version_folder)
116117
os.system("cp -R gtk-3.0/assets %s" % version_folder)
117118
os.system("cp gtk-3.0/gtk-darker.css %s" % os.path.join(version_folder, "gtk.css"))
118-
# os.system("cp gtk-3.0/gtk-dark.css %s" % version_folder)
119119
os.system("cp gtk-3.0/thumbnail.png %s" % version_folder)
120-
120+
# Gtk4
121+
version_folder = os.path.join(dest_folder, "gtk-4.0")
122+
os.system("mkdir -p %s" % version_folder)
123+
os.system("cp -R gtk-4.0/assets %s" % version_folder)
124+
os.system("cp gtk-4.0/gtk-darker.css %s" % os.path.join(version_folder, "gtk.css"))
125+
# os.system("cp gtk-4.0/thumbnail.png %s" % version_folder)
126+
# XFWM
121127
version_folder = os.path.join(dest_folder, "xfwm4")
122128
os.system("mkdir -p %s" % version_folder)
123129
os.system("cp -R xfwm4/*.png %s" % version_folder)
@@ -146,6 +152,7 @@
146152
os.system("mkdir -p %s" % version_folder)
147153
os.system("cp -R gtk-4.0/assets %s" % version_folder)
148154
os.system("cp gtk-4.0/gtk-dark.css %s" % os.path.join(version_folder, "gtk.css"))
155+
# os.system("cp gtk-3.0/thumbnail-dark.png %s" % os.path.join(version_folder, "thumbnail.png"))
149156
# Metacity
150157
os.system("cp -R metacity-1 %s" % dest_folder)
151158
os.system("mv %s %s" % (os.path.join(dest_folder, "metacity-1", "metacity-theme-1-dark.xml"), os.path.join(dest_folder, "metacity-1", "metacity-theme-1.xml")))

0 commit comments

Comments
 (0)