Cleanup of table tiles to remove duplicates and consolidate name references.

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

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
 

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