Skip to content
This repository was archived by the owner on Jul 23, 2024. It is now read-only.

Commit df73f3d

Browse files
committed
misc: make code more readable
1 parent 5e42501 commit df73f3d

File tree

7 files changed

+27
-32
lines changed

7 files changed

+27
-32
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,5 +431,5 @@ $RECYCLE.BIN/
431431
# The flatpak pip generator (needed for GH-Actions)
432432
flatpak-pip-generator
433433

434-
# Don't include constants.py in VCS since that's a generated file
435-
gradience/constants.py
434+
# Don't include constants.py in VCS since that's a generated file
435+
gradience/backend/constants.py

gradience/backend/css_parser.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
# Adwaita named palette colors dict
23-
COLORS = [
23+
adw_colors = [
2424
"blue_",
2525
"green_",
2626
"yellow_",
@@ -41,7 +41,7 @@ def parse_css(path):
4141
variables = {}
4242
palette = {}
4343

44-
for color in COLORS:
44+
for color in adw_colors:
4545
palette[color] = {}
4646

4747
with open(path, "r", encoding="utf-8") as sheet:
@@ -51,7 +51,7 @@ def parse_css(path):
5151
if cdefine_match != None: # If @define-color variable declarations were found
5252
palette_part = cdefine_match.__getitem__(1) # Get the second item of the re.Match object
5353
name, color = palette_part.split(" ", 1)[1].split(" ", 1)
54-
for color_name in COLORS:
54+
for color_name in adw_colors:
5555
if name.startswith(color_name): # Palette colors
5656
palette[name[:-1]][name[-1:]] = color[:-1]
5757
break

gradience/backend/models/repo.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
# You should have received a copy of the GNU General Public License
1717
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1818

19+
import os
20+
1921
from gradience.backend.utils.common import to_slug_case
2022
from gradience.backend.models.preset import Preset, presets_dir
21-
import os
2223

2324

2425
class Repo:

gradience/frontend/main.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,23 @@
2323

2424
from pathlib import Path
2525
from material_color_utilities_python import *
26-
2726
from gi.repository import Gtk, Gdk, Gio, Adw, GLib, Xdp, XdpGtk4
2827

28+
from gradience.backend.css_parser import parse_css
29+
from gradience.backend.models.preset import Preset, presets_dir
30+
from gradience.backend.utils.common import to_slug_case, buglog, run_command
31+
from gradience.backend.constants import *
32+
2933
from gradience.frontend.views.main_window import GradienceMainWindow
34+
from gradience.frontend.views.plugins_list import GradiencePluginsList
3035
from gradience.frontend.views.welcome_window import GradienceWelcomeWindow
31-
from gradience.frontend.dialogs.app_type_dialog import GradienceAppTypeDialog
32-
from gradience.frontend.widgets.custom_css_group import GradienceCustomCSSGroup
3336
from gradience.frontend.views.presets_manager_window import GradiencePresetWindow
3437
from gradience.frontend.views.preferences_window import GradiencePreferencesWindow
35-
from gradience.backend.css_parser import parse_css
36-
from gradience.backend.utils.common import to_slug_case, buglog, run_command
37-
from gradience.backend.models.preset import Preset, presets_dir
38+
39+
from gradience.frontend.dialogs.app_type_dialog import GradienceAppTypeDialog
40+
from gradience.frontend.widgets.custom_css_group import GradienceCustomCSSGroup
41+
3842
from gradience.frontend.settings_schema import settings_schema
39-
from gradience.frontend.views.plugins_list import GradiencePluginsList
40-
from gradience.backend.constants import (
41-
rootdir,
42-
app_id,
43-
rel_ver,
44-
version,
45-
bugtracker_url,
46-
help_url,
47-
project_url,
48-
)
4943

5044

5145
class GradienceApplication(Adw.Application):

gradience/frontend/views/main_window.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818

1919
import os
2020

21-
from gi.repository import Gtk, Adw, Gio
22-
2321
from svglib.svglib import svg2rlg
2422
from reportlab.graphics import renderPM
2523
from material_color_utilities_python import *
24+
from gi.repository import Gtk, Adw, Gio
25+
26+
from gradience.backend.utils.common import buglog
27+
from gradience.backend.constants import rootdir, app_id, build_type
2628

2729
from gradience.frontend.widgets.error_list_row import GradienceErrorListRow
2830
from gradience.frontend.widgets.palette_shades import GradiencePaletteShades
2931
from gradience.frontend.widgets.option_row import GradienceOptionRow
30-
from gradience.backend.utils.common import buglog
3132
from gradience.frontend.settings_schema import settings_schema
32-
from gradience.backend.constants import rootdir, app_id, build_type
3333

3434

3535
@Gtk.Template(resource_path=f"{rootdir}/ui/window.ui")

gradience/frontend/views/presets_manager_window.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,19 @@
2222

2323
from collections import OrderedDict
2424
from pathlib import Path
25-
2625
from gi.repository import Gtk, Adw, GLib
2726

28-
from gradience.frontend.widgets.preset_row import GradiencePresetRow
29-
from gradience.frontend.widgets.builtin_preset_row import GradienceBuiltinPresetRow
30-
from gradience.frontend.widgets.explore_preset_row import GradienceExplorePresetRow
31-
from gradience.frontend.widgets.repo_row import GradienceRepoRow
3227
from gradience.backend.preset_downloader import fetch_presets
3328
from gradience.backend.models.preset import presets_dir
3429
from gradience.backend.utils.common import buglog
3530
from gradience.backend.constants import rootdir
3631

32+
from gradience.frontend.widgets.preset_row import GradiencePresetRow
33+
from gradience.frontend.widgets.builtin_preset_row import GradienceBuiltinPresetRow
34+
from gradience.frontend.widgets.explore_preset_row import GradienceExplorePresetRow
35+
from gradience.frontend.widgets.repo_row import GradienceRepoRow
36+
37+
3738
@Gtk.Template(resource_path=f"{rootdir}/ui/presets_manager_window.ui")
3839
class GradiencePresetWindow(Adw.Window):
3940
__gtype_name__ = "GradiencePresetWindow"

gradience/frontend/widgets/plugin_row.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from gradience.backend.constants import rootdir
2727

2828

29-
3029
USER_PLUGIN_DIR = Path(
3130
os.path.join(
3231
os.environ.get("XDG_DATA_HOME", os.environ["HOME"] + "/.local/share"),

0 commit comments

Comments
 (0)