diff --git a/data/tiles/Fade_White.gif b/data/tiles/Fade_White.gif new file mode 100644 index 00000000..3231bec0 Binary files /dev/null and b/data/tiles/Fade_White.gif differ diff --git a/data/tiles/Fade_White.png b/data/tiles/Fade_White.png new file mode 100644 index 00000000..f81ed50b Binary files /dev/null and b/data/tiles/Fade_White.png differ diff --git a/data/tiles/Floral.gif b/data/tiles/Floral.gif new file mode 100644 index 00000000..de803d37 Binary files /dev/null and b/data/tiles/Floral.gif differ diff --git a/data/tiles/Floral.png b/data/tiles/Floral.png new file mode 100644 index 00000000..4951dfb6 Binary files /dev/null and b/data/tiles/Floral.png differ diff --git a/data/tiles/Gold.gif b/data/tiles/Gold.gif new file mode 100644 index 00000000..cb3e91bd Binary files /dev/null and b/data/tiles/Gold.gif differ diff --git a/data/tiles/Gold.png b/data/tiles/Gold.png new file mode 100644 index 00000000..d2a82bdd Binary files /dev/null and b/data/tiles/Gold.png differ diff --git a/data/tiles/save-aspect-4k/4K_Green_Felt.jpg b/data/tiles/save-aspect-4k/4K_Green_Felt.jpg new file mode 100644 index 00000000..a792c71f Binary files /dev/null and b/data/tiles/save-aspect-4k/4K_Green_Felt.jpg differ diff --git a/data/tiles/save-aspect-4k/4K_Red_Felt.jpg b/data/tiles/save-aspect-4k/4K_Red_Felt.jpg new file mode 100644 index 00000000..9beb0645 Binary files /dev/null and b/data/tiles/save-aspect-4k/4K_Red_Felt.jpg differ diff --git a/data/tiles/save-aspect-4k/Golden_Ratio.jpg b/data/tiles/save-aspect-4k/Golden_Ratio.jpg new file mode 100644 index 00000000..41a8bede Binary files /dev/null and b/data/tiles/save-aspect-4k/Golden_Ratio.jpg differ diff --git a/data/tiles/save-aspect-4k/Wood_Gloss.jpg b/data/tiles/save-aspect-4k/Wood_Gloss.jpg new file mode 100644 index 00000000..2d42effe Binary files /dev/null and b/data/tiles/save-aspect-4k/Wood_Gloss.jpg differ diff --git a/data/tiles/save-aspect/4K_Green_Felt.jpg b/data/tiles/save-aspect/4K_Green_Felt.jpg deleted file mode 100644 index 9400e816..00000000 Binary files a/data/tiles/save-aspect/4K_Green_Felt.jpg and /dev/null differ diff --git a/data/tiles/save-aspect/4K_Red_Felt.jpg b/data/tiles/save-aspect/4K_Red_Felt.jpg deleted file mode 100644 index 00ede129..00000000 Binary files a/data/tiles/save-aspect/4K_Red_Felt.jpg and /dev/null differ diff --git a/data/tiles/save-aspect/Taj_Mahal.jpg b/data/tiles/save-aspect/Taj_Mahal.jpg new file mode 100644 index 00000000..2bcc0ab6 Binary files /dev/null and b/data/tiles/save-aspect/Taj_Mahal.jpg differ diff --git a/data/tiles/save-aspect/Wood_Gloss.jpg b/data/tiles/save-aspect/Wood_Gloss.jpg deleted file mode 100644 index 84a744c0..00000000 Binary files a/data/tiles/save-aspect/Wood_Gloss.jpg and /dev/null differ diff --git a/pysollib/app.py b/pysollib/app.py index 52941829..ea49a84a 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1210,9 +1210,10 @@ class Application: tile = Tile() tile.filename = f n = image_ext_re.sub("", name) - if os.path.split(dirname)[-1] == 'stretch': + subdir = os.path.split(dirname)[-1] + if subdir == 'stretch' or subdir == 'stretch-4k': tile.stretch = 1 - if os.path.split(dirname)[-1] == 'save-aspect': + if subdir == 'save-aspect' or subdir == 'save-aspect-4k': tile.stretch = 1 tile.save_aspect = 1 # n = re.sub("[-_]", " ", n) @@ -1230,7 +1231,9 @@ class Application: self, ("tiles-*", os.path.join("tiles", "stretch"), - os.path.join("tiles", "save-aspect")), + os.path.join("tiles", "stretch-4k"), + os.path.join("tiles", "save-aspect"), + os.path.join("tiles", "save-aspect-4k")), "PYSOL_TILES") # print dirs found, t = [], set() diff --git a/pysollib/main.py b/pysollib/main.py index a3691014..48dcab69 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -184,6 +184,8 @@ def pysol_init(app, args): os.path.join(app.dn.config, "tiles"), os.path.join(app.dn.config, "tiles", "stretch"), os.path.join(app.dn.config, "tiles", "save-aspect"), + os.path.join(app.dn.config, "tiles", "stretch-4k"), + os.path.join(app.dn.config, "tiles", "save-aspect-4k"), os.path.join(app.dn.config, "cardsets"), os.path.join(app.dn.config, "plugins"), ): diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index 85a60e8a..248d4803 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -84,7 +84,8 @@ class SelectTileData(SelectDialogTreeData): None, _("Images"), lambda tile: (os.path.basename( os.path.dirname(tile.filename)) in - ('stretch', 'save-aspect')), expanded=0), + ('stretch', 'save-aspect', 'stretch-4k', + 'save-aspect-4k')), expanded=0), SelectTileNode(None, _("Solid Colors"), ( SelectTileLeaf(None, None, _("Azure"), key="#0082df"), SelectTileLeaf(None, None, _("Black"), key="#000000"), @@ -320,7 +321,8 @@ class SelectTileDialogWithPreview(MfxDialog): if (self.criteria.type == "Images" and os.path.basename( os.path.dirname(tile.filename)) not in - ('stretch', 'save-aspect')): + ('stretch', 'save-aspect', 'stretch-4k', + 'save-aspect-4k')): continue if (self.criteria.type == "Tiles" and os.path.basename(