From 4f11708a3530bf0a0ae210ddbc33b379f689a59f Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sat, 20 Mar 2021 20:41:14 -0500 Subject: [PATCH] Make dark images be created on its own directory --- images/dark/.keep | 1 + qdarkstyle/darkpalette.py | 3 +++ qdarkstyle/utils/images.py | 16 +++++++++++++--- qdarkstyle/utils/palette.py | 2 ++ scripts/process_qrc.py | 3 ++- 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 images/dark/.keep diff --git a/images/dark/.keep b/images/dark/.keep new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/images/dark/.keep @@ -0,0 +1 @@ + diff --git a/qdarkstyle/darkpalette.py b/qdarkstyle/darkpalette.py index 37c491b..bf790b1 100644 --- a/qdarkstyle/darkpalette.py +++ b/qdarkstyle/darkpalette.py @@ -11,6 +11,9 @@ from qdarkstyle.utils.palette import PaletteMixin class DarkPalette(PaletteMixin): """Theme variables.""" + # Identifier + ID = 'dark' + # Color COLOR_BACKGROUND_1 = Gray.B10 COLOR_BACKGROUND_2 = Gray.B20 diff --git a/qdarkstyle/utils/images.py b/qdarkstyle/utils/images.py index 934fd0b..c752299 100755 --- a/qdarkstyle/utils/images.py +++ b/qdarkstyle/utils/images.py @@ -10,6 +10,7 @@ from __future__ import absolute_import, division, print_function import logging import os import re +import sys import tempfile # Third party imports @@ -88,16 +89,25 @@ def convert_svg_to_png(svg_path, png_path, height, width): def create_palette_image(base_svg_path=SVG_PATH, path=IMAGES_PATH, - palette=DarkPalette): + palette=None): """ Create palette image svg and png image on specified path. """ # Needed to use QPixmap _ = QApplication([]) + if palette is None: + print("Please pass a palette class in order to create its " + "associaciated images") + sys.exit(1) + + if palette.ID is None: + print("A QDarkStyle palette requires and ID!") + sys.exit(1) + base_palette_svg_path = os.path.join(base_svg_path, 'base_palette.svg') - palette_svg_path = os.path.join(path, 'palette.svg') - palette_png_path = os.path.join(path, 'palette.png') + palette_svg_path = os.path.join(path, palette.ID, 'palette.svg') + palette_png_path = os.path.join(path, palette.ID, 'palette.png') _logger.info("Creating palette image ...") _logger.info("Base SVG: %s" % base_palette_svg_path) diff --git a/qdarkstyle/utils/palette.py b/qdarkstyle/utils/palette.py index 79c405c..beef2d0 100644 --- a/qdarkstyle/utils/palette.py +++ b/qdarkstyle/utils/palette.py @@ -9,6 +9,8 @@ from collections import OrderedDict class PaletteMixin(object): + ID = None + @classmethod def to_dict(cls, colors_only=False): """Convert variables to dictionary.""" diff --git a/scripts/process_qrc.py b/scripts/process_qrc.py index f7aaa06..0ead157 100755 --- a/scripts/process_qrc.py +++ b/scripts/process_qrc.py @@ -38,6 +38,7 @@ from watchdog.observers import Observer # Local imports from qdarkstyle import PACKAGE_PATH +from qdarkstyle.darkpalette import DarkPalette from qdarkstyle.utils.images import create_images, create_palette_image, generate_qrc_file from qdarkstyle.utils.scss import create_qss @@ -97,7 +98,7 @@ def run_process(args): # Create palette and resources png images print('Generating palette image ...') - create_palette_image() + create_palette_image(palette=DarkPalette) print('Generating images ...') create_images()