misc: make code more readable

This commit is contained in:
tfuxu 2022-12-02 23:37:41 +01:00
parent 5e42501691
commit df73f3d006
No known key found for this signature in database
GPG key ID: 79CFC3B9B31C098A
7 changed files with 27 additions and 32 deletions

4
.gitignore vendored
View file

@ -431,5 +431,5 @@ $RECYCLE.BIN/
# The flatpak pip generator (needed for GH-Actions)
flatpak-pip-generator
# Don't include constants.py in VCS since that's a generated file
gradience/constants.py
# Don't include constants.py in VCS since that's a generated file
gradience/backend/constants.py

View file

@ -20,7 +20,7 @@ import re
# Adwaita named palette colors dict
COLORS = [
adw_colors = [
"blue_",
"green_",
"yellow_",
@ -41,7 +41,7 @@ def parse_css(path):
variables = {}
palette = {}
for color in COLORS:
for color in adw_colors:
palette[color] = {}
with open(path, "r", encoding="utf-8") as sheet:
@ -51,7 +51,7 @@ def parse_css(path):
if cdefine_match != None: # If @define-color variable declarations were found
palette_part = cdefine_match.__getitem__(1) # Get the second item of the re.Match object
name, color = palette_part.split(" ", 1)[1].split(" ", 1)
for color_name in COLORS:
for color_name in adw_colors:
if name.startswith(color_name): # Palette colors
palette[name[:-1]][name[-1:]] = color[:-1]
break

View file

@ -16,9 +16,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
import os
from gradience.backend.utils.common import to_slug_case
from gradience.backend.models.preset import Preset, presets_dir
import os
class Repo:

View file

@ -23,29 +23,23 @@ import threading
from pathlib import Path
from material_color_utilities_python import *
from gi.repository import Gtk, Gdk, Gio, Adw, GLib, Xdp, XdpGtk4
from gradience.backend.css_parser import parse_css
from gradience.backend.models.preset import Preset, presets_dir
from gradience.backend.utils.common import to_slug_case, buglog, run_command
from gradience.backend.constants import *
from gradience.frontend.views.main_window import GradienceMainWindow
from gradience.frontend.views.plugins_list import GradiencePluginsList
from gradience.frontend.views.welcome_window import GradienceWelcomeWindow
from gradience.frontend.dialogs.app_type_dialog import GradienceAppTypeDialog
from gradience.frontend.widgets.custom_css_group import GradienceCustomCSSGroup
from gradience.frontend.views.presets_manager_window import GradiencePresetWindow
from gradience.frontend.views.preferences_window import GradiencePreferencesWindow
from gradience.backend.css_parser import parse_css
from gradience.backend.utils.common import to_slug_case, buglog, run_command
from gradience.backend.models.preset import Preset, presets_dir
from gradience.frontend.dialogs.app_type_dialog import GradienceAppTypeDialog
from gradience.frontend.widgets.custom_css_group import GradienceCustomCSSGroup
from gradience.frontend.settings_schema import settings_schema
from gradience.frontend.views.plugins_list import GradiencePluginsList
from gradience.backend.constants import (
rootdir,
app_id,
rel_ver,
version,
bugtracker_url,
help_url,
project_url,
)
class GradienceApplication(Adw.Application):

View file

@ -18,18 +18,18 @@
import os
from gi.repository import Gtk, Adw, Gio
from svglib.svglib import svg2rlg
from reportlab.graphics import renderPM
from material_color_utilities_python import *
from gi.repository import Gtk, Adw, Gio
from gradience.backend.utils.common import buglog
from gradience.backend.constants import rootdir, app_id, build_type
from gradience.frontend.widgets.error_list_row import GradienceErrorListRow
from gradience.frontend.widgets.palette_shades import GradiencePaletteShades
from gradience.frontend.widgets.option_row import GradienceOptionRow
from gradience.backend.utils.common import buglog
from gradience.frontend.settings_schema import settings_schema
from gradience.backend.constants import rootdir, app_id, build_type
@Gtk.Template(resource_path=f"{rootdir}/ui/window.ui")

View file

@ -22,17 +22,18 @@ import json
from collections import OrderedDict
from pathlib import Path
from gi.repository import Gtk, Adw, GLib
from gradience.backend.preset_downloader import fetch_presets
from gradience.backend.models.preset import presets_dir
from gradience.backend.utils.common import buglog
from gradience.backend.constants import rootdir
from gradience.frontend.widgets.preset_row import GradiencePresetRow
from gradience.frontend.widgets.builtin_preset_row import GradienceBuiltinPresetRow
from gradience.frontend.widgets.explore_preset_row import GradienceExplorePresetRow
from gradience.frontend.widgets.repo_row import GradienceRepoRow
from gradience.backend.preset_downloader import fetch_presets
from gradience.backend.models.preset import presets_dir
from gradience.backend.utils.common import buglog
from gradience.backend.constants import rootdir
@Gtk.Template(resource_path=f"{rootdir}/ui/presets_manager_window.ui")
class GradiencePresetWindow(Adw.Window):

View file

@ -26,7 +26,6 @@ from gradience.backend.utils.common import buglog
from gradience.backend.constants import rootdir
USER_PLUGIN_DIR = Path(
os.path.join(
os.environ.get("XDG_DATA_HOME", os.environ["HOME"] + "/.local/share"),