0xmrtt/Gradience
1
0
Fork 0
mirror of https://github.com/GradienceTeam/Gradience.git synced 2024-07-08 03:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/AdwCustomizerTeam/AdwCustomizer into next

Browse source
This commit is contained in:
David Lapshin 2022-08-11 17:51:18 +03:00
commit 4deb4a72db
2 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/main.py
View file

@ -98,11 +98,7 @@ class AdwcustomizerApplication(Adw.Application):
self.reload_user_defined_presets()
self.style_manager = Adw.StyleManager.get_default()
print(dir(self.style_manager))
print(dir(self.style_manager.get_default()))
print(self.style_manager.get_color_scheme())
print(dir(self.style_manager.get_color_scheme()))
if self.style_manager.get_default() == Adw.ColorScheme.PREFER_DARK:
if self.style_manager.get_dark():
self.load_preset_from_resource(
"/com/github/AdwCustomizerTeam/AdwCustomizer/presets/adwaita-dark.json"
)
@ -247,7 +243,12 @@ class AdwcustomizerApplication(Adw.Application):
print(monet_theme)
print(theme)
if monet_theme == "automatic":
if self.style_manager.get_dark():
monet_theme = "dark"
else:
monet_theme = "light"
if monet_theme == "dark":
dark_theme = theme["schemes"]["dark"]
variable = {
@ -299,50 +300,50 @@ class AdwcustomizerApplication(Adw.Application):
else: # light
light_theme = theme["schemes"]["light"]
variable = {
"accent_color": light_theme["primary"],
"accent_bg_color": light_theme["primaryContainer"],
"accent_fg_color": light_theme["onPrimaryContainer"],
"accent_color": self.rgba_from_argb(light_theme.primary),
"accent_bg_color": self.rgba_from_argb(light_theme.primaryContainer),
"accent_fg_color": self.rgba_from_argb(light_theme.onPrimaryContainer),
"destructive_color": light_theme["error"],
"destructive_bg_color": light_theme["errorContainer"],
"destructive_fg_color": light_theme["onError"],
"destructive_color": self.rgba_from_argb(light_theme.error),
"destructive_bg_color": self.rgba_from_argb(light_theme.errorContainer),
"destructive_fg_color": self.rgba_from_argb(light_theme.onError),
"success_color": light_theme["tertiary"],
"success_bg_color": light_theme["onTertiary"],
"success_fg_color": light_theme["tertiaryContainer"],
"success_color": self.rgba_from_argb(light_theme.tertiary),
"success_bg_color": self.rgba_from_argb(light_theme.onTertiary),
"success_fg_color": self.rgba_from_argb(light_theme.tertiaryContainer),
"warning_color": light_theme["secondaryContainer"],
"warning_bg_color": light_theme["inversePrimary"],
"warning_fg_color": self.rgba_from_argb(light_theme["primary"], "0.8"),
"warning_color": self.rgba_from_argb(light_theme.secondaryContainer),
"warning_bg_color": self.rgba_from_argb(light_theme.inversePrimary),
"warning_fg_color": self.rgba_from_argb(light_theme.primary, "0.8"),
"error_color": light_theme["error"],
"error_bg_color": light_theme["errorContainer"],
"error_fg_color": light_theme["onError"],
"error_color": self.rgba_from_argb(light_theme.error),
"error_bg_color": self.rgba_from_argb(light_theme.errorContainer),
"error_fg_color": self.rgba_from_argb(light_theme.onError),
"window_bg_color": light_theme["surface"],
"window_fg_color": light_theme["onSurface"],
"window_bg_color": self.rgba_from_argb(light_theme.surface),
"window_fg_color": self.rgba_from_argb(light_theme.onSurface),
"view_bg_color": light_theme["surface"],
"view_fg_color": light_theme["onSurface"],
"view_bg_color": self.rgba_from_argb(light_theme.surface),
"view_fg_color": self.rgba_from_argb(light_theme.onSurface),
"headerbar_bg_color": light_theme["surface"],
"headerbar_fg_color": light_theme["onSurface"],
"headerbar_border_color": self.rgba_from_argb(light_theme["primary"], "0.8"),
"headerbar_bg_color": self.rgba_from_argb(light_theme.surface),
"headerbar_fg_color": self.rgba_from_argb(light_theme.onSurface),
"headerbar_border_color": self.rgba_from_argb(light_theme.primary, "0.8"),
"headerbar_backdrop_color": "@window_bg_color",
"headerbar_shade_color": light_theme["shadow"],
"headerbar_shade_color": self.rgba_from_argb(light_theme.shadow),
"card_bg_color": self.rgba_from_argb(light_theme["primary"], "0.05"),
"card_fg_color": light_theme["surfaceVariant"],
"card_shade_color": light_theme["shadow"],
"card_bg_color": self.rgba_from_argb(light_theme.primary, "0.05"),
"card_fg_color": self.rgba_from_argb(light_theme.surfaceVariant),
"card_shade_color": self.rgba_from_argb(light_theme.shadow),
"dialog_bg_color": light_theme["secondaryContainer"],
"dialog_fg_color": light_theme["onSecondaryContainer"],
"dialog_bg_color": self.rgba_from_argb(light_theme.secondaryContainer),
"dialog_fg_color": self.rgba_from_argb(light_theme.onSecondaryContainer),
"popover_bg_color": light_theme["secondaryContainer"],
"popover_fg_color": light_theme["onSecondaryContainer"],
"popover_bg_color": self.rgba_from_argb(light_theme.secondaryContainer),
"popover_fg_color": self.rgba_from_argb(light_theme.onSecondaryContainer),
"shade_color": light_theme["shadow"],
"scrollbar_outline_color": light_theme["outline"]
"shade_color": self.rgba_from_argb(light_theme.shadow),
"scrollbar_outline_color": self.rgba_from_argb(light_theme.outline)
}
for key in variable.keys():

1
src/window.py
View file

@ -144,6 +144,7 @@ class AdwcustomizerMainWindow(Adw.ApplicationWindow):
self.monet_theme_row.set_title(_("Theme"))
store = Gtk.StringList()
store.append("Automatic")
store.append("Dark")
store.append("Light")
self.monet_theme_row.set_model(store)