From 81db3573445b8095f577d1b4f098aa152411a8da Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 15:52:34 +0000 Subject: [PATCH 1/2] Remove commented out code --- src/app_type_dialog.py | 7 ------- src/main.py | 30 ------------------------------ src/plugin.py | 1 - src/plugin_row.py | 18 ------------------ src/preferences.py | 9 --------- src/preset_row.py | 1 - src/window.py | 2 -- 7 files changed, 68 deletions(-) diff --git a/src/app_type_dialog.py b/src/app_type_dialog.py index 744e84e0..2490f750 100644 --- a/src/app_type_dialog.py +++ b/src/app_type_dialog.py @@ -27,8 +27,6 @@ class GradienceAppTypeDialog(Adw.MessageDialog): gtk4_app_type = Gtk.Template.Child("gtk4-app-type") gtk3_app_type = Gtk.Template.Child("gtk3-app-type") - # dark = Gtk.Template.Child("dark") - # light = Gtk.Template.Child("light") def __init__( self, @@ -55,8 +53,3 @@ class GradienceAppTypeDialog(Adw.MessageDialog): "gtk3": self.gtk3_app_type.get_active(), } - # def get_color_mode(self): - # return { - # "dark": self.dark.get_active(), - # "light": self.light.get_active(), - # } diff --git a/src/main.py b/src/main.py index 91948f20..cc0b19e0 100644 --- a/src/main.py +++ b/src/main.py @@ -552,36 +552,6 @@ class GradienceApplication(Adw.Application): def apply_color_scheme(self, widget, response): if response == "apply": - # if widget.get_color_mode()["dark"]: - # if widget.get_app_types()["gtk4"]: - # gtk4_dir = os.path.join( - # os.environ.get( - # "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" - # ), - # "gtk-4.0", - # ) - # if not os.path.exists(gtk4_dir): - # os.makedirs(gtk4_dir) - # gtk4_css = self.generate_gtk_css("gtk4") - # with open( - # os.path.join(gtk4_dir, "gtk-dark.css"), "w", encoding="utf-8" - # ) as file: - # file.write(gtk4_css) - # if widget.get_app_types()["gtk3"]: - # gtk3_dir = os.path.join( - # os.environ.get( - # "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" - # ), - # "gtk-3.0", - # ) - # if not os.path.exists(gtk3_dir): - # os.makedirs(gtk3_dir) - # gtk3_css = self.generate_gtk_css("gtk3") - # with open( - # os.path.join(gtk3_dir, "gtk-dark.css"), "w", encoding="utf-8" - # ) as file: - # file.write(gtk3_css) - # if widget.get_color_mode()["light"]: if widget.get_app_types()["gtk4"]: gtk4_dir = os.path.join( os.environ.get( diff --git a/src/plugin.py b/src/plugin.py index 9172163c..9201fd1d 100644 --- a/src/plugin.py +++ b/src/plugin.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -#from .setting import GradienceSetting class GradiencePluginCore(): def __init__(self): diff --git a/src/plugin_row.py b/src/plugin_row.py index 6ef0d7d5..7217ac2e 100644 --- a/src/plugin_row.py +++ b/src/plugin_row.py @@ -45,24 +45,6 @@ class GradiencePluginRow(Adw.ActionRow): @Gtk.Template.Callback() def on_remove_plugin_clicked(self, *_args): - # try: - # os.remove(os.path.join( - # os.environ.get("XDG_CONFIG_HOME", - # os.environ["HOME"] + "/.config"), - # "gradience_plugins", - # self.plugin_object.plugin_id + "." - # )) - # except Exception as exception: - # print(exception.with_traceback()) - # self.toast_overlay.add_toast( - # Adw.Toast(title=_("Unable to delete preset")) - # ) - # else: - # self.toast_overlay.add_toast( - # Adw.Toast(title=_("Preset removed")) - # ) - # finally: - # self.win.reload_pref_group() print("delete") @Gtk.Template.Callback() diff --git a/src/preferences.py b/src/preferences.py index e4558ecf..be48f202 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -45,20 +45,15 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): self.setup() def setup(self): - # self.set_search_enabled(False) self.setup_flatpak_group() def setup_flatpak_group(self): user_flatpak_theming_gtk4 = self.settings.get_boolean( "user-flatpak-theming-gtk4") - # global_flatpak_theming_gtk4 = self.settings.get_boolean( - # "global-flatpak-theming-gtk4") user_flatpak_theming_gtk3 = self.settings.get_boolean( "user-flatpak-theming-gtk3") - # global_flatpak_theming_gtk3 = self.settings.get_boolean( - # "global-flatpak-theming-gtk3") self.allow_gtk4_flatpak_theming_user.set_state( user_flatpak_theming_gtk4) @@ -70,13 +65,9 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): self.allow_gtk4_flatpak_theming_user.connect( "state-set", self.on_allow_gtk4_flatpak_theming_user_toggled) - # self.allow_gtk4_flatpak_theming_global.connect( - # "state-set", self.on_allow_gtk4_flatpak_theming_global_toggled) self.allow_gtk3_flatpak_theming_user.connect( "state-set", self.on_allow_gtk3_flatpak_theming_user_toggled) - # self.allow_gtk3_flatpak_theming_global.connect( - # "state-set", self.on_allow_gtk3_flatpak_theming_global_toggled) def on_allow_gtk4_flatpak_theming_user_toggled(self, *args): state = self.allow_gtk4_flatpak_theming_user.props.state diff --git a/src/preset_row.py b/src/preset_row.py index 3c573b8c..2fe0551a 100644 --- a/src/preset_row.py +++ b/src/preset_row.py @@ -85,7 +85,6 @@ class GradiencePresetRow(Adw.ActionRow): def on_remove_button_clicked(self, *_args): self.delete_preset = True self.delete_toast = Adw.Toast(title=_("Preset removed")) - # self.delete_toast.set_action_name("on_undo_button_clicked") self.delete_toast.set_button_label(_("Undo")) self.delete_toast.connect("dismissed", self.on_delete_toast_dismissed) self.delete_toast.connect( diff --git a/src/window.py b/src/window.py index db6a4256..125fe268 100644 --- a/src/window.py +++ b/src/window.py @@ -173,8 +173,6 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.monet_file_chooser_button.set_child(child_button) - # self.monet_file_chooser_button.set_margin_top(5) - # self.monet_file_chooser_button.set_margin_bottom(5) self.monet_file_chooser_button.connect( "clicked", self.on_file_picker_button_clicked From 77f79cc19bdc13c6b0ed34aace99644faac2e621 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 15:52:50 +0000 Subject: [PATCH 2/2] Format code with black and autopep8 --- src/app_type_dialog.py | 3 +- src/main.py | 181 +++++++++++++++++++++-------------------- src/plugin.py | 2 +- src/preferences.py | 34 +++++--- src/preset_row.py | 125 +++++++++++++++------------- src/window.py | 62 +++++++------- 6 files changed, 213 insertions(+), 194 deletions(-) diff --git a/src/app_type_dialog.py b/src/app_type_dialog.py index 2490f750..ffa198d0 100644 --- a/src/app_type_dialog.py +++ b/src/app_type_dialog.py @@ -35,7 +35,7 @@ class GradienceAppTypeDialog(Adw.MessageDialog): ok_response_name, ok_response_label, ok_response_appearance, - **kwargs + **kwargs, ): super().__init__(**kwargs) self.set_heading(heading) @@ -52,4 +52,3 @@ class GradienceAppTypeDialog(Adw.MessageDialog): "gtk4": self.gtk4_app_type.get_active(), "gtk3": self.gtk3_app_type.get_active(), } - diff --git a/src/main.py b/src/main.py index cc0b19e0..6e7acb80 100644 --- a/src/main.py +++ b/src/main.py @@ -31,7 +31,15 @@ from .palette_shades import GradiencePaletteShades from .option import GradienceOption from .app_type_dialog import GradienceAppTypeDialog from .custom_css_group import GradienceCustomCSSGroup -from .constants import rootdir, app_id, rel_ver, version, bugtracker_url, help_url, project_url +from .constants import ( + rootdir, + app_id, + rel_ver, + version, + bugtracker_url, + help_url, + project_url, +) from .welcome import GradienceWelcomeWindow from .preferences import GradiencePreferencesWindow from .modules.utils import to_slug_case, buglog @@ -40,15 +48,13 @@ from .plugins_list import GradiencePluginsList class GradienceApplication(Adw.Application): """The main application singleton class.""" + __gtype_name__ = "GradienceApplication" settings = Gio.Settings.new(app_id) def __init__(self): - super().__init__( - application_id=app_id, - flags=Gio.ApplicationFlags.FLAGS_NONE - ) + super().__init__(application_id=app_id, flags=Gio.ApplicationFlags.FLAGS_NONE) self.set_resource_base_path(rootdir) self.portal = Xdp.Portal() @@ -95,41 +101,31 @@ class GradienceApplication(Adw.Application): GLib.Variant("s", "adwaita"), self.load_preset_action, ) - self.create_action( - "apply_color_scheme", - self.show_apply_color_scheme_dialog) + self.create_action("apply_color_scheme", + self.show_apply_color_scheme_dialog) + + self.create_action("show_adwaita_demo", self.show_adwaita_demo) + + self.create_action("show_gtk4_widget_factory", + self.show_gtk4_widget_factory) + + self.create_action("show_gtk4_demo", self.show_gtk4_demo) self.create_action( - "show_adwaita_demo", - self.show_adwaita_demo) + "restore_color_scheme", self.show_restore_color_scheme_dialog + ) - self.create_action( - "show_gtk4_widget_factory", - self.show_gtk4_widget_factory) - - self.create_action( - "show_gtk4_demo", - self.show_gtk4_demo) - - self.create_action( - "restore_color_scheme", - self.show_restore_color_scheme_dialog) - - self.create_action( - "reset_color_scheme", - self.show_reset_color_scheme_dialog) + self.create_action("reset_color_scheme", + self.show_reset_color_scheme_dialog) self.create_action("preferences", self.show_preferences) self.create_action("save_preset", self.show_save_preset_dialog) self.create_action("about", self.show_about_window) if self.style_manager.get_dark(): self.load_preset_from_resource( - f"{rootdir}/presets/adwaita-dark.json" - ) + f"{rootdir}/presets/adwaita-dark.json") else: - self.load_preset_from_resource( - f"{rootdir}/presets/adwaita.json" - ) + self.load_preset_from_resource(f"{rootdir}/presets/adwaita.json") if self.first_run: buglog("first run") @@ -147,12 +143,10 @@ class GradienceApplication(Adw.Application): self.portal.open_uri( parent, - "file://" + - os.path.join( - os.environ.get( - "XDG_CONFIG_HOME", - os.environ["HOME"] + - "/.config"), + "file://" + + os.path.join( + os.environ.get("XDG_CONFIG_HOME", + os.environ["HOME"] + "/.config"), "presets", ), Xdp.OpenUriFlags.NONE, @@ -286,13 +280,17 @@ class GradienceApplication(Adw.Application): "window_fg_color": self.rgba_from_argb(light_theme.onSurface), "view_bg_color": self.rgba_from_argb(light_theme.secondaryContainer), "view_fg_color": self.rgba_from_argb(light_theme.onSurface), - "headerbar_bg_color": self.rgba_from_argb(light_theme.secondaryContainer), + "headerbar_bg_color": self.rgba_from_argb( + light_theme.secondaryContainer + ), "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": self.rgba_from_argb(light_theme.secondaryContainer), + "headerbar_shade_color": self.rgba_from_argb( + light_theme.secondaryContainer + ), "card_bg_color": self.rgba_from_argb(light_theme.primary, "0.05"), "card_fg_color": self.rgba_from_argb(light_theme.onSecondaryContainer), "card_shade_color": self.rgba_from_argb(light_theme.shadow), @@ -331,8 +329,9 @@ class GradienceApplication(Adw.Application): ) self.props.active_window.save_preset_button.add_css_class("warning") - self.props.active_window.save_preset_button.get_child( - ).set_tooltip_text(_("Unsaved changes")) + self.props.active_window.save_preset_button.get_child().set_tooltip_text( + _("Unsaved changes") + ) def clear_dirty(self): self.is_dirty = False @@ -341,8 +340,9 @@ class GradienceApplication(Adw.Application): ) self.props.active_window.save_preset_button.remove_css_class("warning") self.props.active_window.save_preset_button.get_child().set_label("") - self.props.active_window.save_preset_button.get_child( - ).set_tooltip_text(_("Save changes")) + self.props.active_window.save_preset_button.get_child().set_tooltip_text( + _("Save changes") + ) def reload_variables(self): parsing_errors = [] @@ -385,29 +385,24 @@ class GradienceApplication(Adw.Application): if args[0].get_string().startswith("custom-"): self.load_preset_from_file( os.path.join( - os.environ.get( - "XDG_CONFIG_HOME", - os.environ["HOME"] + - "/.config"), + os.environ.get("XDG_CONFIG_HOME", + os.environ["HOME"] + "/.config"), "presets", - args[0].get_string().replace( - "custom-", - "", - 1) + - ".json", - )) + args[0].get_string().replace("custom-", "", 1) + ".json", + ) + ) else: self.load_preset_from_resource( - f"{rootdir}/presets/" - + args[0].get_string() - + ".json" + f"{rootdir}/presets/" + args[0].get_string() + ".json" ) Gio.SimpleAction.set_state(self.lookup_action("load_preset"), args[0]) def show_apply_color_scheme_dialog(self, *_args): dialog = GradienceAppTypeDialog( _("Apply this color scheme?"), - _("Warning: any custom CSS files for those app types will be irreversibly overwritten!"), + _( + "Warning: any custom CSS files for those app types will be irreversibly overwritten!" + ), "apply", _("Apply"), Adw.ResponseAppearance.SUGGESTED, @@ -513,18 +508,23 @@ class GradienceApplication(Adw.Application): def save_preset(self, _unused, response, entry): if response == "save": - if not os.path.exists(os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - "user", - )): - os.makedirs(os.path.join( + if not os.path.exists( + os.path.join( os.environ.get("XDG_CONFIG_HOME", os.environ["HOME"] + "/.config"), "presets", "user", - )) + ) + ): + os.makedirs( + os.path.join( + os.environ.get( + "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" + ), + "presets", + "user", + ) + ) with open( os.path.join( @@ -547,16 +547,14 @@ class GradienceApplication(Adw.Application): file.write(json.dumps(object_to_write, indent=4)) self.clear_dirty() self.win.toast_overlay.add_toast( - Adw.Toast(title=_("Preset saved")) - ) + Adw.Toast(title=_("Preset saved"))) def apply_color_scheme(self, widget, response): if response == "apply": if widget.get_app_types()["gtk4"]: gtk4_dir = os.path.join( - os.environ.get( - "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" - ), + os.environ.get("XDG_CONFIG_HOME", + os.environ["HOME"] + "/.config"), "gtk-4.0", ) if not os.path.exists(gtk4_dir): @@ -565,14 +563,14 @@ class GradienceApplication(Adw.Application): contents = "" try: with open( - os.path.join(gtk4_dir, "gtk.css"), "r", encoding="utf-8" + os.path.join(gtk4_dir, "gtk.css"), "r", encoding="utf-8" ) as file: contents = file.read() except FileNotFoundError: # first run pass else: with open( - os.path.join(gtk4_dir, "gtk.css.bak"), "w", encoding="utf-8" + os.path.join(gtk4_dir, "gtk.css.bak"), "w", encoding="utf-8" ) as file: file.write(contents) finally: @@ -582,9 +580,8 @@ class GradienceApplication(Adw.Application): file.write(gtk4_css) if widget.get_app_types()["gtk3"]: gtk3_dir = os.path.join( - os.environ.get( - "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" - ), + os.environ.get("XDG_CONFIG_HOME", + os.environ["HOME"] + "/.config"), "gtk-3.0", ) if not os.path.exists(gtk3_dir): @@ -593,14 +590,14 @@ class GradienceApplication(Adw.Application): contents = "" try: with open( - os.path.join(gtk3_dir, "gtk.css"), "r", encoding="utf-8" + os.path.join(gtk3_dir, "gtk.css"), "r", encoding="utf-8" ) as file: contents = file.read() except FileNotFoundError: # first run pass else: with open( - os.path.join(gtk3_dir, "gtk.css.bak"), "w", encoding="utf-8" + os.path.join(gtk3_dir, "gtk.css.bak"), "w", encoding="utf-8" ) as file: file.write(contents) finally: @@ -627,9 +624,9 @@ class GradienceApplication(Adw.Application): backup = open( os.path.join( os.environ.get( - "XDG_CONFIG_HOME", - os.environ["HOME"] + - "/.config"), + "XDG_CONFIG_HOME", os.environ["HOME"] + + "/.config" + ), "gtk-4.0/gtk.css.bak", ), "r", @@ -640,9 +637,9 @@ class GradienceApplication(Adw.Application): gtk4css = open( os.path.join( os.environ.get( - "XDG_CONFIG_HOME", - os.environ["HOME"] + - "/.config"), + "XDG_CONFIG_HOME", os.environ["HOME"] + + "/.config" + ), "gtk-4.0/gtk.css", ), "w", @@ -707,9 +704,8 @@ class GradienceApplication(Adw.Application): "0xMRTT https://github.com/0xMRTT", "Verantor https://github.com/Verantor", ], - artists=['David Lapshin https://github.com/daudix-UFO'], - designers=[ - 'David Lapshin https://github.com/daudix-UFO'], + artists=["David Lapshin https://github.com/daudix-UFO"], + designers=["David Lapshin https://github.com/daudix-UFO"], # Translators: This is a place to put your credits (formats: "Name # https://example.com" or "Name ", no quotes) # and is not meant to be translated literally. @@ -730,7 +726,8 @@ class GradienceApplication(Adw.Application): license_type=Gtk.License.GPL_3_0, version=version, release_notes_version=rel_ver, - release_notes=_(""" + release_notes=_( + """ - """), - comments=_(""" + """ + ), + comments=_( + """ Gradience is a tool for customizing Libadwaita applications and the adw-gtk3 theme. With Gradience you can: @@ -759,7 +758,8 @@ With Gradience you can: - Extend functionality using plugins This app is written in Python and uses GTK 4 and libadwaita. - """) + """ + ), ) about.present() @@ -822,7 +822,8 @@ This app is written in Python and uses GTK 4 and libadwaita. def show_gtk4_widget_factory(self, *_args): GLib.spawn_command_line_async( - 'sh -c "/bin/gtk4-widget-factory > /dev/null 2>&1"') + 'sh -c "/bin/gtk4-widget-factory > /dev/null 2>&1"' + ) def main(): diff --git a/src/plugin.py b/src/plugin.py index 9201fd1d..0547f140 100644 --- a/src/plugin.py +++ b/src/plugin.py @@ -17,7 +17,7 @@ # along with this program. If not, see . -class GradiencePluginCore(): +class GradiencePluginCore: def __init__(self): self.title = None self.author = None diff --git a/src/preferences.py b/src/preferences.py index be48f202..eefd5cba 100644 --- a/src/preferences.py +++ b/src/preferences.py @@ -21,8 +21,14 @@ import os from gi.repository import GLib, Gio, Gtk, Adw from .constants import rootdir, app_id -from .modules.flatpak_overrides import create_gtk_user_override, remove_gtk_user_override -from .modules.flatpak_overrides import create_gtk_global_override, remove_gtk_global_override +from .modules.flatpak_overrides import ( + create_gtk_user_override, + remove_gtk_user_override, +) +from .modules.flatpak_overrides import ( + create_gtk_global_override, + remove_gtk_global_override, +) from .modules.utils import buglog @@ -50,10 +56,12 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): def setup_flatpak_group(self): user_flatpak_theming_gtk4 = self.settings.get_boolean( - "user-flatpak-theming-gtk4") + "user-flatpak-theming-gtk4" + ) user_flatpak_theming_gtk3 = self.settings.get_boolean( - "user-flatpak-theming-gtk3") + "user-flatpak-theming-gtk3" + ) self.allow_gtk4_flatpak_theming_user.set_state( user_flatpak_theming_gtk4) @@ -64,10 +72,12 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): # self.allow_gtk3_flatpak_theming_global.set_state(global_flatpak_theming_gtk3) self.allow_gtk4_flatpak_theming_user.connect( - "state-set", self.on_allow_gtk4_flatpak_theming_user_toggled) + "state-set", self.on_allow_gtk4_flatpak_theming_user_toggled + ) self.allow_gtk3_flatpak_theming_user.connect( - "state-set", self.on_allow_gtk3_flatpak_theming_user_toggled) + "state-set", self.on_allow_gtk3_flatpak_theming_user_toggled + ) def on_allow_gtk4_flatpak_theming_user_toggled(self, *args): state = self.allow_gtk4_flatpak_theming_user.props.state @@ -78,7 +88,8 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): remove_gtk_user_override(self, self.settings, "gtk4") buglog( - f"user-flatpak-theming-gtk4: {self.settings.get_boolean('user-flatpak-theming-gtk4')}") + f"user-flatpak-theming-gtk4: {self.settings.get_boolean('user-flatpak-theming-gtk4')}" + ) def on_allow_gtk3_flatpak_theming_user_toggled(self, *args): state = self.allow_gtk3_flatpak_theming_user.props.state @@ -89,7 +100,8 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): remove_gtk_user_override(self, self.settings, "gtk3") buglog( - f"user-flatpak-theming-gtk3: {self.settings.get_boolean('user-flatpak-theming-gtk3')}") + f"user-flatpak-theming-gtk3: {self.settings.get_boolean('user-flatpak-theming-gtk3')}" + ) def on_allow_gtk4_flatpak_theming_global_toggled(self, *args): state = self.allow_gtk4_flatpak_theming_global.props.state @@ -100,7 +112,8 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): remove_gtk_global_override(self, self.settings, "gtk4") buglog( - f"global-flatpak-theming-gtk4: {self.settings.get_boolean('global-flatpak-theming-gtk4')}") + f"global-flatpak-theming-gtk4: {self.settings.get_boolean('global-flatpak-theming-gtk4')}" + ) def on_allow_gtk3_flatpak_theming_global_toggled(self, *args): state = self.allow_gtk3_flatpak_theming_global.props.state @@ -111,4 +124,5 @@ class GradiencePreferencesWindow(Adw.PreferencesWindow): remove_gtk_global_override(self, self.settings, "gtk3") buglog( - f"global-flatpak-theming-gtk3: {self.settings.get_boolean('global-flatpak-theming-gtk3')}") + f"global-flatpak-theming-gtk3: {self.settings.get_boolean('global-flatpak-theming-gtk3')}" + ) diff --git a/src/preset_row.py b/src/preset_row.py index 2fe0551a..0a8fc318 100644 --- a/src/preset_row.py +++ b/src/preset_row.py @@ -59,13 +59,15 @@ class GradiencePresetRow(Adw.ActionRow): def on_apply_button_clicked(self, *_args): buglog("apply") - self.app.load_preset_from_file(os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.name) + ".json", - )) + self.app.load_preset_from_file( + os.path.join( + os.environ.get("XDG_CONFIG_HOME", + os.environ["HOME"] + "/.config"), + "presets", + self.prefix, + to_slug_case(self.name) + ".json", + ) + ) @Gtk.Template.Callback() def on_name_entry_changed(self, *_args): @@ -88,12 +90,9 @@ class GradiencePresetRow(Adw.ActionRow): self.delete_toast.set_button_label(_("Undo")) self.delete_toast.connect("dismissed", self.on_delete_toast_dismissed) self.delete_toast.connect( - "button-clicked", - self.on_undo_button_clicked) + "button-clicked", self.on_undo_button_clicked) - self.toast_overlay.add_toast( - self.delete_toast - ) + self.toast_overlay.add_toast(self.delete_toast) self.win.old_name = self.name @@ -102,13 +101,15 @@ class GradiencePresetRow(Adw.ActionRow): self.win.reload_pref_group() def update_value(self): - os.remove(os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.old_name) + ".json", - )) + os.remove( + os.path.join( + os.environ.get("XDG_CONFIG_HOME", + os.environ["HOME"] + "/.config"), + "presets", + self.prefix, + to_slug_case(self.old_name) + ".json", + ) + ) with open( os.path.join( os.environ.get("XDG_CONFIG_HOME", @@ -128,27 +129,30 @@ class GradiencePresetRow(Adw.ActionRow): } file.write(json.dumps(object_to_write, indent=4)) self.app.clear_dirty() - self.toast_overlay.add_toast( - Adw.Toast(title=_("Preset renamed")) - ) + self.toast_overlay.add_toast(Adw.Toast(title=_("Preset renamed"))) self.old_name = self.name def do_delete_preset(self): if self.delete_preset: try: - os.rename(os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.old_name) + ".json", - ), os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.old_name) + ".json.to_delete", - )) + os.rename( + os.path.join( + os.environ.get( + "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" + ), + "presets", + self.prefix, + to_slug_case(self.old_name) + ".json", + ), + os.path.join( + os.environ.get( + "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" + ), + "presets", + self.prefix, + to_slug_case(self.old_name) + ".json.to_delete", + ), + ) except Exception as exception: print(exception.with_traceback()) finally: @@ -159,13 +163,16 @@ class GradiencePresetRow(Adw.ActionRow): def on_delete_toast_dismissed(self, widget): if self.delete_preset: try: - os.remove(os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.old_name) + ".json.to_delete", - )) + os.remove( + os.path.join( + os.environ.get( + "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" + ), + "presets", + self.prefix, + to_slug_case(self.old_name) + ".json.to_delete", + ) + ) except Exception as exception: print(exception.with_traceback()) self.toast_overlay.add_toast( @@ -173,25 +180,29 @@ class GradiencePresetRow(Adw.ActionRow): ) else: self.toast_overlay.add_toast( - Adw.Toast(title=_("Preset removed")) - ) + Adw.Toast(title=_("Preset removed"))) finally: self.win.reload_pref_group() else: try: - os.rename(os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.old_name) + ".json.to_delete", - ), os.path.join( - os.environ.get("XDG_CONFIG_HOME", - os.environ["HOME"] + "/.config"), - "presets", - self.prefix, - to_slug_case(self.old_name) + ".json", - )) + os.rename( + os.path.join( + os.environ.get( + "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" + ), + "presets", + self.prefix, + to_slug_case(self.old_name) + ".json.to_delete", + ), + os.path.join( + os.environ.get( + "XDG_CONFIG_HOME", os.environ["HOME"] + "/.config" + ), + "presets", + self.prefix, + to_slug_case(self.old_name) + ".json", + ), + ) except Exception as exception: print(exception.with_traceback()) finally: diff --git a/src/window.py b/src/window.py index 125fe268..ad68d81f 100644 --- a/src/window.py +++ b/src/window.py @@ -64,27 +64,19 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.settings = Gio.Settings(app_id) self.settings.bind( - "window-width", - self, - "default-width", - Gio.SettingsBindFlags.DEFAULT) + "window-width", self, "default-width", Gio.SettingsBindFlags.DEFAULT + ) self.settings.bind( - "window-height", - self, - "default-height", - Gio.SettingsBindFlags.DEFAULT) + "window-height", self, "default-height", Gio.SettingsBindFlags.DEFAULT + ) self.settings.bind( - "window-maximized", - self, - "maximized", - Gio.SettingsBindFlags.DEFAULT) + "window-maximized", self, "maximized", Gio.SettingsBindFlags.DEFAULT + ) self.settings.bind( - "window-fullscreen", - self, - "fullscreened", - Gio.SettingsBindFlags.DEFAULT) + "window-fullscreen", self, "fullscreened", Gio.SettingsBindFlags.DEFAULT + ) self.connect("close-request", self.__close_window) self.style_manager = self.get_application().style_manager @@ -97,11 +89,9 @@ class GradienceMainWindow(Adw.ApplicationWindow): def get_default_wallpaper(self): background_settings = Gio.Settings("org.gnome.desktop.background") if self.style_manager.get_dark(): - picture_uri = background_settings.get_string( - "picture-uri-dark") + picture_uri = background_settings.get_string("picture-uri-dark") else: - picture_uri = background_settings.get_string( - "picture-uri") + picture_uri = background_settings.get_string("picture-uri") buglog(picture_uri) if picture_uri.startswith("file://"): self.monet_image_file = Gio.File.new_for_uri(picture_uri) @@ -128,8 +118,7 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.monet_image_file = self.monet_file_chooser_dialog.get_file() image_basename = self.monet_image_file.get_basename() self.monet_file_chooser_button.set_label(image_basename) - self.monet_file_chooser_button.set_tooltip_text( - image_basename) + self.monet_file_chooser_button.set_tooltip_text(image_basename) self.monet_file_chooser_dialog.hide() if response == Gtk.ResponseType.ACCEPT: @@ -142,7 +131,10 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.monet_pref_group.set_name("monet") self.monet_pref_group.set_title(_("Monet Engine")) self.monet_pref_group.set_description( - _("Monet is an engine that generates a Material Design 3 palette from an image's color.")) + _( + "Monet is an engine that generates a Material Design 3 palette from an image's color." + ) + ) self.apply_button = Gtk.Button() self.apply_button.set_label(_("Apply")) @@ -158,7 +150,7 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.monet_file_chooser_button = Gtk.Button() self.monet_file_chooser_button.set_valign(Gtk.Align.CENTER) - #self.monet_file_chooser_button.set_label(_("Choose a file")) + # self.monet_file_chooser_button.set_label(_("Choose a file")) # self.monet_file_chooser_button.set_icon_name("folder-pictures-symbolic") child_button = Gtk.Box() @@ -173,7 +165,6 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.monet_file_chooser_button.set_child(child_button) - self.monet_file_chooser_button.connect( "clicked", self.on_file_picker_button_clicked ) @@ -219,8 +210,9 @@ class GradienceMainWindow(Adw.ApplicationWindow): if self.monet_image_file.endswith(".svg"): drawing = svg2rlg(self.monet_image_file) self.monet_image_file = os.path.join( - os.environ.get("XDG_RUNTIME_DIR"), "gradience_bg.png") - renderPM.drawToFile(drawing, self.monet_image_file, fmt='PNG') + os.environ.get("XDG_RUNTIME_DIR"), "gradience_bg.png" + ) + renderPM.drawToFile(drawing, self.monet_image_file, fmt="PNG") if self.monet_image_file.endswith(".xml"): buglog("XML WIP") @@ -233,10 +225,11 @@ class GradienceMainWindow(Adw.ApplicationWindow): ) else: basewidth = 64 - wpercent = (basewidth / float(self.monet_img.size[0])) + wpercent = basewidth / float(self.monet_img.size[0]) hsize = int((float(self.monet_img.size[1]) * float(wpercent))) self.monet_img = self.monet_img.resize( - (basewidth, hsize), Image.Resampling.LANCZOS) + (basewidth, hsize), Image.Resampling.LANCZOS + ) self.theme = themeFromImage(self.monet_img) self.tone = self.tone_row.get_selected_item() self.monet_theme = self.monet_theme_row.get_selected_item() @@ -276,7 +269,10 @@ class GradienceMainWindow(Adw.ApplicationWindow): palette_pref_group.set_name("palette_colors") palette_pref_group.set_title(_("Palette Colors")) palette_pref_group.set_description( - _('Named palette colors used by some applications. Default colors follow the GNOME Human Interface Guidelines.')) + _( + 'Named palette colors used by some applications. Default colors follow the GNOME Human Interface Guidelines.' + ) + ) for color in settings_schema["palette"]: palette_shades = GradiencePaletteShades( color["prefix"], color["title"], color["n_shades"] @@ -294,10 +290,8 @@ class GradienceMainWindow(Adw.ApplicationWindow): self.errors_button.set_visible(len(errors) > 0) for error in errors: self.errors_list.append( - GradienceError( - error["error"], - error["element"], - error["line"])) + GradienceError(error["error"], error["element"], error["line"]) + ) @Gtk.Template.Callback() def on_presets_button_clicked(self, *args):