Skip to content

Commit 8c6f4e6

Browse files
committed
🐛 fix: Change defaut theme to adw for Cinnamon, GNOME and XFCE
1 parent eb180b3 commit 8c6f4e6

1 file changed

Lines changed: 42 additions & 26 deletions

File tree

biglinux-livecd/usr/share/biglinux/livecd/services.py

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -206,25 +206,32 @@ def _apply_dark_theme(self, desktop_env: str):
206206

207207
# Set GTK theme for each desktop environment
208208
if desktop_env == "Cinnamon":
209-
logger.info("Setting Cinnamon GTK theme to Big-Orange")
209+
logger.info("Setting Cinnamon GTK theme to Adw-gtk3-dark")
210210
self._run_command([
211211
"dconf", "write",
212212
"/org/cinnamon/desktop/interface/gtk-theme",
213-
"'Big-Orange'"
213+
"'Adw-gtk3-dark'"
214214
])
215215
elif desktop_env == "GNOME":
216-
logger.info("Setting GNOME GTK theme to Big-Blue")
216+
logger.info("Setting GNOME GTK theme to Adw-gtk3-dark")
217217
self._run_command([
218218
"dconf", "write",
219219
"/org/gnome/desktop/interface/gtk-theme",
220+
"'Adw-gtk3-dark'"
221+
])
222+
# Set GNOME Shell theme
223+
logger.info("Setting GNOME Shell theme to Big-Blue")
224+
self._run_command([
225+
"dconf", "write",
226+
"/org/gnome/shell/extensions/user-theme/name",
220227
"'Big-Blue'"
221228
])
222229
elif desktop_env == "XFCE":
223-
logger.info("Setting XFCE GTK theme to Big-Blue")
230+
logger.info("Setting XFCE GTK theme to Adw-gtk3-dark")
224231
self._run_command([
225232
"xfconf-query", "-c", "xsettings",
226233
"-p", "/Net/ThemeName",
227-
"-s", "Big-Blue"
234+
"-s", "Adw-gtk3-dark"
228235
])
229236

230237
# Configure Kvantum theme
@@ -260,25 +267,32 @@ def _apply_light_theme(self, desktop_env: str):
260267

261268
# Set GTK theme for each desktop environment
262269
if desktop_env == "Cinnamon":
263-
logger.info("Setting Cinnamon GTK theme to Big-Orange-Light")
270+
logger.info("Setting Cinnamon GTK theme to Adw-gtk3")
264271
self._run_command([
265272
"dconf", "write",
266273
"/org/cinnamon/desktop/interface/gtk-theme",
267-
"'Big-Orange-Light'"
274+
"'Adw-gtk3'"
268275
])
269276
elif desktop_env == "GNOME":
270-
logger.info("Setting GNOME GTK theme to Big-Blue-Light")
277+
logger.info("Setting GNOME GTK theme to Adw-gtk3")
271278
self._run_command([
272279
"dconf", "write",
273280
"/org/gnome/desktop/interface/gtk-theme",
274-
"'Big-Blue-Light'"
281+
"'Adw-gtk3'"
282+
])
283+
# Set GNOME Shell theme
284+
logger.info("Setting GNOME Shell theme to Big-Blue")
285+
self._run_command([
286+
"dconf", "write",
287+
"/org/gnome/shell/extensions/user-theme/name",
288+
"'Big-Blue'"
275289
])
276290
elif desktop_env == "XFCE":
277-
logger.info("Setting XFCE GTK theme to Big-Blue-Light")
291+
logger.info("Setting XFCE GTK theme to Adw-gtk3")
278292
self._run_command([
279293
"xfconf-query", "-c", "xsettings",
280294
"-p", "/Net/ThemeName",
281-
"-s", "Big-Blue-Light"
295+
"-s", "Adw-gtk3"
282296
])
283297

284298
# Configure Kvantum theme
@@ -302,9 +316,19 @@ def _apply_light_theme(self, desktop_env: str):
302316

303317
def _apply_icon_theme_variant(self, desktop_env: str, dark: bool):
304318
"""Applies appropriate icon theme variant (dark or light)."""
305-
logger.debug(f"Applying {'dark' if dark else 'light'} icon theme variant")
319+
logger.debug(f"Applying {'dark' if dark else 'light'} icon theme variant for {desktop_env}")
306320

307-
# Get current icon theme
321+
# GNOME: sempre usa bigicons-papient-dark no escuro, bigicons-papient no claro
322+
if desktop_env == "GNOME":
323+
if dark:
324+
new_theme = "bigicons-papient-dark"
325+
else:
326+
new_theme = "bigicons-papient"
327+
logger.info(f"Setting GNOME icon theme to: {new_theme}")
328+
self._set_icon_theme(desktop_env, new_theme)
329+
return
330+
331+
# Para outros desktops, detectar tema atual e modificar
308332
icon_theme = ""
309333
if desktop_env == "XFCE":
310334
success, icon_theme = self._run_command([
@@ -313,19 +337,11 @@ def _apply_icon_theme_variant(self, desktop_env: str, dark: bool):
313337
], read_only=True)
314338
if success:
315339
icon_theme = icon_theme.strip()
316-
else:
317-
# GNOME or Cinnamon
318-
if desktop_env == "Cinnamon":
319-
success, icon_theme = self._run_command([
320-
"dconf", "read",
321-
"/org/cinnamon/desktop/interface/icon-theme"
322-
], read_only=True)
323-
else:
324-
success, icon_theme = self._run_command([
325-
"dconf", "read",
326-
"/org/gnome/desktop/interface/icon-theme"
327-
], read_only=True)
328-
340+
elif desktop_env == "Cinnamon":
341+
success, icon_theme = self._run_command([
342+
"dconf", "read",
343+
"/org/cinnamon/desktop/interface/icon-theme"
344+
], read_only=True)
329345
if success:
330346
icon_theme = icon_theme.strip("'\"")
331347

0 commit comments

Comments
 (0)