New default look and feel, and prep for Cardsets 2.1 release.

.appveyor.yml

@@ -36,7 +36,7 @@ test_script:
     - gmake mo
     - pyinstaller pysol.py --windowed --icon=data\pysol.ico
     - python3 setup.py install_data -d dist\pysol
-    - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.2.tar.xz/download -FileName cardsets.tar.xz
+    - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0RC.tar.xz/download -FileName cardsets.tar.xz
     - 7z x cardsets.tar.xz -so | 7z x -si -ttar
     - mv PySolFC-Cardsets--Minimal-2.0.2/cardset-* dist/pysol/data
     - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz/download -FileName music.tar.xz

.github/workflows/macos-package.yml

@@ -28,9 +28,9 @@ jobs:
         brew install create-dmg
     - name: Get cardsets
       run: |
-        wget --content-disposition https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.2.tar.xz
+        wget --content-disposition https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0RC.tar.xz
-        tar xJf PySolFC-Cardsets--Minimal-2.0.2.tar.xz
+        tar xJf PySolFC-Cardsets--Minimal-2.1.0RC.tar.xz
-        mv PySolFC-Cardsets--Minimal-2.0.2/cardset-* data
+        mv PySolFC-Cardsets--Minimal-2.1.0RC/cardset-* data
     - name: Prepare game rules (process the HTML) and translations
       run: |
         make rules mo

MANIFEST.in

@@ -85,6 +85,14 @@ graft data/cardset-standard
 graft data/cardset-tuxedo
 graft data/cardset-vienna-2k
 graft data/cardset-dondorf
+graft data/cardset-neo
+graft data/cardset-neo-hex
+graft data/cardset-neo-tarock
+graft data/cardset-uni-mahjongg
+graft data/cardset-louie-mantia-hanafuda
+graft data/cardset-mughal-ganjifa-xl
+graft data/cardset-dashavatara-ganjifa-xl
+graft data/cardset-next-matrix
 ##
 ## exclude dirs
 ##

pysollib/gamedb.py

@@ -528,7 +528,7 @@ class GI:
         ('fc-2.12',   tuple(range(774, 811)) + (16681,) +
          tuple(range(22217, 22219))),
         ('fc-2.14', tuple(range(811, 827))),
-        ('fc-2.16', tuple(range(827, 855)) + tuple(range(22400, 22407)))
+        ('fc-2.15', tuple(range(827, 855)) + tuple(range(22400, 22407)))
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag

pysollib/options.py

@@ -28,7 +28,7 @@ import traceback
 import configobj
 
 import pysollib.settings
-from pysollib.mfxutil import print_err
+from pysollib.mfxutil import USE_PIL, print_err
 from pysollib.mygettext import _
 from pysollib.mygettext import myGettext
 from pysollib.pysoltk import TOOLBAR_BUTTONS, TOOLKIT
@@ -338,7 +338,7 @@ class Options:
         # self.toolbar_style = 'default'
         if TOOLKIT == 'kivy':
             self.toolbar = 4  # 0 == hide, 1,2,3,4 == top, bottom, lef, right
-        self.toolbar_style = 'bluecurve'
+        self.toolbar_style = 'remix'
         self.toolbar_relief = 'flat'
         self.toolbar_compound = 'none'  # icons only
         self.toolbar_size = 0
@@ -435,7 +435,7 @@ class Options:
                                     11004, 14405, 14410, 15411, 22225]
         self.last_gameid = 0            # last game played
         self.game_holded = 0            # gameid or 0
-        self.wm_maximized = 0
+        self.wm_maximized = 1
         self.save_games_geometry = False
         # saved games geometry (gameid: (width, height))
         self.games_geometry = {}
@@ -450,7 +450,7 @@ class Options:
         self.scale_cards = False
         self.scale_x = 1.0
         self.scale_y = 1.0
-        self.auto_scale = False
+        self.auto_scale = True
         self.spread_stacks = False
         self.center_layout = True
         self.preserve_aspect_ratio = True
@@ -509,7 +509,7 @@ class Options:
                           top.winfo_screendepth())
         # bg
         if sd > 8:
-            self.tabletile_name = "Nostalgy.gif"  # basename
+            self.tabletile_name = "Felt_Green.gif"  # basename
         else:
             self.tabletile_name = None
         # cardsets
@@ -521,20 +521,35 @@ class Options:
 
         # if sw > 1024 and sh > 768:
         #    c = 'Dondorf'
-        self.cardset = {
+        if USE_PIL:
-            # game_type:        (cardset_name, back_file)
+            self.cardset = {
-            0:                  (c, ""),
+                0:                  ("Neo", ""),
-            CSI.TYPE_FRENCH:    (c, ""),
+                CSI.TYPE_FRENCH:    ("Neo", ""),
-            CSI.TYPE_HANAFUDA:  ("Kintengu", ""),
+                CSI.TYPE_HANAFUDA:  ("Louie Mantia Hanafuda", ""),
-            CSI.TYPE_MAHJONGG:  ("Crystal Mahjongg", ""),
+                CSI.TYPE_MAHJONGG:  ("Uni Mahjongg", ""),
-            CSI.TYPE_TAROCK:    ("Vienna 2K", ""),
+                CSI.TYPE_TAROCK:    ("Neo Tarock", ""),
-            CSI.TYPE_HEXADECK:  ("Hex A Deck", ""),
+                CSI.TYPE_HEXADECK:  ("Neo Hex", ""),
-            CSI.TYPE_MUGHAL_GANJIFA: ("Mughal Ganjifa", ""),
+                CSI.TYPE_MUGHAL_GANJIFA: ("Mughal Ganjifa XL", ""),
-            # CSI.TYPE_NAVAGRAHA_GANJIFA: ("Navagraha Ganjifa", ""),
+                # CSI.TYPE_NAVAGRAHA_GANJIFA: ("Navagraha Ganjifa", ""),
-            CSI.TYPE_NAVAGRAHA_GANJIFA: ("Dashavatara Ganjifa", ""),
+                CSI.TYPE_NAVAGRAHA_GANJIFA: ("Dashavatara Ganjifa XL", ""),
-            CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa", ""),
+                CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa XL", ""),
-            CSI.TYPE_TRUMP_ONLY: ("Matrix", ""),
+                CSI.TYPE_TRUMP_ONLY: ("Next Matrix", ""),
-        }
+            }
+        else:
+            self.cardset = {
+                # game_type:        (cardset_name, back_file)
+                0:                  (c, ""),
+                CSI.TYPE_FRENCH:    (c, ""),
+                CSI.TYPE_HANAFUDA:  ("Kintengu", ""),
+                CSI.TYPE_MAHJONGG:  ("Crystal Mahjongg", ""),
+                CSI.TYPE_TAROCK:    ("Vienna 2K", ""),
+                CSI.TYPE_HEXADECK:  ("Hex A Deck", ""),
+                CSI.TYPE_MUGHAL_GANJIFA: ("Mughal Ganjifa", ""),
+                # CSI.TYPE_NAVAGRAHA_GANJIFA: ("Navagraha Ganjifa", ""),
+                CSI.TYPE_NAVAGRAHA_GANJIFA: ("Dashavatara Ganjifa", ""),
+                CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa", ""),
+                CSI.TYPE_TRUMP_ONLY: ("Matrix", ""),
+            }
 
     # not changeable options
     def setConstants(self):

pysollib/settings.py

@@ -30,9 +30,9 @@ def n_(x):                        # for gettext
 
 PACKAGE = 'PySolFC'
 TITLE = 'PySol'
-PACKAGE_URL = 'http://pysolfc.sourceforge.net/'
+PACKAGE_URL = 'http://pysolfc.sourceforge.io/'
 
-VERSION_TUPLE = (2, 14, 1)
+VERSION_TUPLE = (2, 15, 0)
 VERSION = '.'.join(map(str, VERSION_TUPLE))
 
 # Tk windowing system (auto set up in init.py)

scripts/cardsets_to_bundle

@@ -1,14 +1,21 @@
 cardset-2000
 cardset-crystal-mahjongg
 cardset-dashavatara-ganjifa
+cardset-dashavatara-ganjifa-xl
 cardset-dondorf
 cardset-gnome-mahjongg-1
 cardset-hexadeck
 cardset-hanafuda-200-years
+cardset-louie-mantia-hanafuda
 cardset-matrix
 cardset-mughal-ganjifa
+cardset-mughal-ganjifa-xl
 cardset-neo
+cardset-neo-hex
+cardset-neo-tarock
+cardset-next-matrix
 cardset-oxymoron
 cardset-standard
 cardset-tuxedo
+cardset-uni-mahjongg
 cardset-vienna-2k

scripts/linux-install.py

@@ -36,14 +36,14 @@ def main():
     if not os.path.exists(dot_pysol):
         os.mkdir(dot_pysol)
     if not os.path.exists(dot_pysol_cardsets):
-        cardsets_dir = "PySolFC-Cardsets-2.0"
+        cardsets_dir = "PySolFC-Cardsets-2.1"
         if not os.path.exists(cardsets_dir):
             arc = cardsets_dir + ".tar.gz"
             if not os.path.exists(arc):
                 subprocess.check_call([
                     "wget",
-                    "https://github.com/shlomif/" +
+                    "https://github.com/joeraz/" +
-                    "PySolFC-Cardsets/archive/2.0/" + arc
+                    "PySolFC-Cardsets/archive/2.1/" + arc
                 ])
                 subprocess.check_call(["tar", "-xvf", arc])
         os.symlink(os.getcwd() + "/" + cardsets_dir, dot_pysol_cardsets, )

scripts/repack-min-cardsets.bash

@@ -10,9 +10,9 @@ set -e -x
 
 src_base="PySolFC-Cardsets"
 dest_base="$src_base--Minimal"
-ver="2.0.2"
+ver="2.1.0"
-src_vbase="$src_base-2.0"
+src_vbase="$src_base-2.1"
-dest_vbase="$dest_base-2.0.2"
+dest_vbase="$dest_base-2.1.0"
 src_arc="$src_vbase.tar.bz2"
 
 if ! test -f "$src_arc"