diff --git a/data/tiles/Abstract_Metallic.png b/data/tiles/Abstract_Metallic.png new file mode 100644 index 00000000..1c21528f Binary files /dev/null and b/data/tiles/Abstract_Metallic.png differ diff --git a/data/tiles/Argyle.gif b/data/tiles/Argyle.gif deleted file mode 100644 index 1162e116..00000000 Binary files a/data/tiles/Argyle.gif and /dev/null differ diff --git a/data/tiles/Argyle.png b/data/tiles/Argyle.png index f887e855..2c29fa6a 100644 Binary files a/data/tiles/Argyle.png and b/data/tiles/Argyle.png differ diff --git a/data/tiles/Baize.gif b/data/tiles/Baize.gif deleted file mode 100644 index 852bef31..00000000 Binary files a/data/tiles/Baize.gif and /dev/null differ diff --git a/data/tiles/Brown_Diamonds.gif b/data/tiles/Brown_Diamonds.gif deleted file mode 100644 index d224bc97..00000000 Binary files a/data/tiles/Brown_Diamonds.gif and /dev/null differ diff --git a/data/tiles/Chequered_Field.gif b/data/tiles/Chequered_Field.gif deleted file mode 100644 index 9c3f5377..00000000 Binary files a/data/tiles/Chequered_Field.gif and /dev/null differ diff --git a/data/tiles/Colored_Cloud.gif b/data/tiles/Colored_Cloud.gif deleted file mode 100644 index 372c50e8..00000000 Binary files a/data/tiles/Colored_Cloud.gif and /dev/null differ diff --git a/data/tiles/Colored_Cloud.png b/data/tiles/Colored_Cloud.png index 860dfb3d..e4917db6 100644 Binary files a/data/tiles/Colored_Cloud.png and b/data/tiles/Colored_Cloud.png differ diff --git a/data/tiles/Fade_Blue.gif b/data/tiles/Fade_Blue.gif deleted file mode 100644 index 87fdc04c..00000000 Binary files a/data/tiles/Fade_Blue.gif and /dev/null differ diff --git a/data/tiles/Fade_Green.gif b/data/tiles/Fade_Green.gif deleted file mode 100644 index f6409505..00000000 Binary files a/data/tiles/Fade_Green.gif and /dev/null differ diff --git a/data/tiles/Fade_Green.png b/data/tiles/Fade_Green.png index bf771022..930b57fb 100644 Binary files a/data/tiles/Fade_Green.png and b/data/tiles/Fade_Green.png differ diff --git a/data/tiles/Fade_Pink.gif b/data/tiles/Fade_Pink.gif deleted file mode 100644 index c42f966b..00000000 Binary files a/data/tiles/Fade_Pink.gif and /dev/null differ diff --git a/data/tiles/Fade_Pink.png b/data/tiles/Fade_Pink.png index 8eaa2415..8ce91246 100644 Binary files a/data/tiles/Fade_Pink.png and b/data/tiles/Fade_Pink.png differ diff --git a/data/tiles/Fade_Red.gif b/data/tiles/Fade_Red.gif deleted file mode 100644 index 79d34439..00000000 Binary files a/data/tiles/Fade_Red.gif and /dev/null differ diff --git a/data/tiles/Fade_Red.png b/data/tiles/Fade_Red.png index 131391e2..520aa91c 100644 Binary files a/data/tiles/Fade_Red.png and b/data/tiles/Fade_Red.png differ diff --git a/data/tiles/Fade_White.gif b/data/tiles/Fade_White.gif deleted file mode 100644 index 3231bec0..00000000 Binary files a/data/tiles/Fade_White.gif and /dev/null differ diff --git a/data/tiles/Fade_White.png b/data/tiles/Fade_White.png index 9a8392b5..611b95e7 100644 Binary files a/data/tiles/Fade_White.png and b/data/tiles/Fade_White.png differ diff --git a/data/tiles/Fade_Yellow.gif b/data/tiles/Fade_Yellow.gif deleted file mode 100644 index f6dd4dfa..00000000 Binary files a/data/tiles/Fade_Yellow.gif and /dev/null differ diff --git a/data/tiles/Fade_Yellow.png b/data/tiles/Fade_Yellow.png index 943e766f..30fe71f6 100644 Binary files a/data/tiles/Fade_Yellow.png and b/data/tiles/Fade_Yellow.png differ diff --git a/data/tiles/Felt_Green.gif b/data/tiles/Felt_Green.gif deleted file mode 100644 index df8af5cf..00000000 Binary files a/data/tiles/Felt_Green.gif and /dev/null differ diff --git a/data/tiles/Felt_Green.png b/data/tiles/Felt_Green.png index 85144db4..f8cc11d0 100644 Binary files a/data/tiles/Felt_Green.png and b/data/tiles/Felt_Green.png differ diff --git a/data/tiles/Felt_Red.gif b/data/tiles/Felt_Red.gif deleted file mode 100644 index 5d86495a..00000000 Binary files a/data/tiles/Felt_Red.gif and /dev/null differ diff --git a/data/tiles/Floral.gif b/data/tiles/Floral.gif deleted file mode 100644 index 6d036c7c..00000000 Binary files a/data/tiles/Floral.gif and /dev/null differ diff --git a/data/tiles/Floral.png b/data/tiles/Floral.png index 22b219d0..44f83213 100644 Binary files a/data/tiles/Floral.png and b/data/tiles/Floral.png differ diff --git a/data/tiles/Gammi.gif b/data/tiles/Gammi.gif deleted file mode 100644 index c8bdf5dd..00000000 Binary files a/data/tiles/Gammi.gif and /dev/null differ diff --git a/data/tiles/Gammi.png b/data/tiles/Gammi.png index 0d6d1f8e..b86bb078 100644 Binary files a/data/tiles/Gammi.png and b/data/tiles/Gammi.png differ diff --git a/data/tiles/Gold.gif b/data/tiles/Gold.gif deleted file mode 100644 index cb3e91bd..00000000 Binary files a/data/tiles/Gold.gif and /dev/null differ diff --git a/data/tiles/Isometric_Blocks.gif b/data/tiles/Isometric_Blocks.gif deleted file mode 100644 index af1ec2c5..00000000 Binary files a/data/tiles/Isometric_Blocks.gif and /dev/null differ diff --git a/data/tiles/Marble.gif b/data/tiles/Marble.gif deleted file mode 100644 index 00d2798c..00000000 Binary files a/data/tiles/Marble.gif and /dev/null differ diff --git a/data/tiles/Marble.png b/data/tiles/Marble.png index 0e3232e8..ecac9743 100644 Binary files a/data/tiles/Marble.png and b/data/tiles/Marble.png differ diff --git a/data/tiles/Metal_Plate.gif b/data/tiles/Metal_Plate.gif deleted file mode 100644 index 81365482..00000000 Binary files a/data/tiles/Metal_Plate.gif and /dev/null differ diff --git a/data/tiles/Metal_Plate.png b/data/tiles/Metal_Plate.png index 94a2433d..4f31a3ea 100644 Binary files a/data/tiles/Metal_Plate.png and b/data/tiles/Metal_Plate.png differ diff --git a/data/tiles/Nostalgy.gif b/data/tiles/Nostalgy.gif deleted file mode 100644 index 3c467ea8..00000000 Binary files a/data/tiles/Nostalgy.gif and /dev/null differ diff --git a/data/tiles/Olive_Fossils.gif b/data/tiles/Olive_Fossils.gif deleted file mode 100644 index 6640099a..00000000 Binary files a/data/tiles/Olive_Fossils.gif and /dev/null differ diff --git a/data/tiles/Orange_Abstract.gif b/data/tiles/Orange_Abstract.gif deleted file mode 100644 index 2e67267d..00000000 Binary files a/data/tiles/Orange_Abstract.gif and /dev/null differ diff --git a/data/tiles/Orange_Ornaments.gif b/data/tiles/Orange_Ornaments.gif deleted file mode 100644 index e3d7f37f..00000000 Binary files a/data/tiles/Orange_Ornaments.gif and /dev/null differ diff --git a/data/tiles/Pale_Satin.gif b/data/tiles/Pale_Satin.gif deleted file mode 100644 index 3e2b0360..00000000 Binary files a/data/tiles/Pale_Satin.gif and /dev/null differ diff --git a/data/tiles/Pale_Satin.png b/data/tiles/Pale_Satin.png index 804a4783..e6d3b879 100644 Binary files a/data/tiles/Pale_Satin.png and b/data/tiles/Pale_Satin.png differ diff --git a/data/tiles/Pink_Hearts.gif b/data/tiles/Pink_Hearts.gif deleted file mode 100644 index 5c687a10..00000000 Binary files a/data/tiles/Pink_Hearts.gif and /dev/null differ diff --git a/data/tiles/Pink_Hearts.png b/data/tiles/Pink_Hearts.png index 07074dfa..4acec99e 100644 Binary files a/data/tiles/Pink_Hearts.png and b/data/tiles/Pink_Hearts.png differ diff --git a/data/tiles/Purple_Mosaic.gif b/data/tiles/Purple_Mosaic.gif deleted file mode 100644 index 4b0b74e6..00000000 Binary files a/data/tiles/Purple_Mosaic.gif and /dev/null differ diff --git a/data/tiles/Purple_Mosaic.png b/data/tiles/Purple_Mosaic.png index 56ea5b73..e46b60c9 100644 Binary files a/data/tiles/Purple_Mosaic.png and b/data/tiles/Purple_Mosaic.png differ diff --git a/data/tiles/RGB.gif b/data/tiles/RGB.gif deleted file mode 100644 index 022f3517..00000000 Binary files a/data/tiles/RGB.gif and /dev/null differ diff --git a/data/tiles/RGB.png b/data/tiles/RGB.png index 82044ae8..852b9711 100644 Binary files a/data/tiles/RGB.png and b/data/tiles/RGB.png differ diff --git a/data/tiles/Rainbow.gif b/data/tiles/Rainbow.gif deleted file mode 100644 index 98ca012e..00000000 Binary files a/data/tiles/Rainbow.gif and /dev/null differ diff --git a/data/tiles/Rainbow.png b/data/tiles/Rainbow.png index 700cb42b..c68ca6cd 100644 Binary files a/data/tiles/Rainbow.png and b/data/tiles/Rainbow.png differ diff --git a/data/tiles/Stone_Wall.gif b/data/tiles/Stone_Wall.gif deleted file mode 100644 index d6f24a57..00000000 Binary files a/data/tiles/Stone_Wall.gif and /dev/null differ diff --git a/data/tiles/Wood.gif b/data/tiles/Wood.gif deleted file mode 100644 index f0c2a927..00000000 Binary files a/data/tiles/Wood.gif and /dev/null differ diff --git a/data/tiles/Wood.png b/data/tiles/Wood.png index 14c1fbe6..6dedd3c4 100644 Binary files a/data/tiles/Wood.png and b/data/tiles/Wood.png differ diff --git a/pysollib/app.py b/pysollib/app.py index eefa12b1..faffeb44 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -636,7 +636,7 @@ class Application: self.opt.colors['table'] = tile.color self.opt.tabletile_name = None else: - self.opt.tabletile_name = tile.basename + self.opt.tabletile_name = tile.name self.tabletile_index = i self.tabletile_manager.setSelected(i) return True diff --git a/pysollib/main.py b/pysollib/main.py index 3ff96b17..22d9e95b 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -364,7 +364,12 @@ Cardsets package is up to date. app.initTiles() if app.opt.tabletile_name: # and top.winfo_screendepth() > 8: for tile in manager.getAll(): - if app.opt.tabletile_name == tile.basename: + # The basename is checked in addition to the tile name + # this is to support differences in the table tile format + # from older PySol versions. + if (app.opt.tabletile_name == tile.name or + (os.path.splitext(app.opt.tabletile_name)[0] == + os.path.splitext(tile.basename)[0])): app.tabletile_index = tile.index break diff --git a/pysollib/options.py b/pysollib/options.py index 8f2779d8..a7fe48ee 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -568,7 +568,7 @@ class Options: top.winfo_screendepth()) # bg if sd > 8: - self.tabletile_name = "Felt_Green.gif" # basename + self.tabletile_name = "Felt Green" # name else: self.tabletile_name = None # cardsets