.github/workflows/macos-package.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v2

NEWS.asciidoc

@@ -1,11 +1,5 @@
 [[news]]
 === News
-* _11 January, 2025:_ There is a new stable release
-https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.2.0/[PySolFC
-v3.2.0]. New in this release:
-** New fullscreen mode, accessible by pressing F11.
-** Easy option to clear advanced search options.
-** Lots of bugfixes and enhancements.
 * _19 October, 2024:_ There is a new stable release
 https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.1.0/[PySolFC
 v3.1.0]. New in this release:

buildozer/aversion

@@ -9,7 +9,7 @@ else
 fi
 
 # current android version mumber.
-version="3.2.0"
+version="3.1.2"
 sversion=$(echo $version  | sed -E "s:(.*)\..*:\1:")
 tuple=$(echo $version | sed -E "s:(.*)\.(.*)\.(.*):(\1, \2, \3):")
 

buildozer/buildozer.spec

@@ -103,7 +103,7 @@ android.permissions = WRITE_EXTERNAL_STORAGE, MANAGE_EXTERNAL_STORAGE
 #android.features = android.hardware.usb.host
 
 # (int) Target Android API, should be as high as possible.
-android.api = 34
+android.api = 33
 
 # (int) Minimum API your APK / AAB will support.
 #android.minapi = 21

buildozer/fdroid.init

@@ -6,7 +6,7 @@ then
   exit 1
 fi
 
-python3 -m venv FINIT
+virtualenv FINIT
 source FINIT/bin/activate
 
 pip3 install attrs
@@ -43,7 +43,7 @@ sed -r "s:#? ?source\.exclude_patterns =.*:source.exclude_patterns = README.*,AU
 sed -r "s:#? ?android\.skip_update =.*:android.skip_update = True:" -i buildozer.spec
 sed -r "s:#? ?android\.accept_sdk_license =.*:android.accept_sdk_license = False:" -i buildozer.spec
 sed -r "s:#? ?log_level =.*:log_level = 2:" -i buildozer.spec
-sed -r "s:#? ?warn_on_root =.*:warn_on_root = 0:" -i buildozer.spec
+
 
 echo '### end init'
 

buildozer/pubspec.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 102130200,
-      "versionName": "3.2.0",
+      "versionCode": 102130102,
+      "versionName": "3.1.2",
       "outputFile": "pysolfc-release.apk"
     }
   ],

contrib/customize_cardset.asciidoc

@@ -3,20 +3,6 @@ Cardset Customization Tutorial
 :Author: Eric Rausch
 :Email: <neelix570@gmail.com>
 
-Setting up a Cardset
---------------------
-The easiest way to create a cardset would be to copy an existing cardset folder of the same type in your cardsets directory.  All cardsets need a number of files to work.
-
-* An image for each card - these images should be the same format and the same size, as defined in the config.txt file (described below).  These files should be named something like 01s.png for the ace of spades.  The first two (or more) digits represent the rank, and the letter after represents the suit.  The suits are labeled hcds in French decks or decks that use French suits (i.e. Hex A or Tarock decks), and the suits are alphabetical for other decks.  The suit letter z is used for jokers or trumps.
-* A shade file - shade.png, for example.
-* At least one back image, as defined in the config.txt file below.
-* A config.txt file, the format described below.
-* A copyright file, containing copyright info.
-
-The following optional files may also be added, but are only used under certain circumstances.
-
-* Bottom images.  A number of images for the bottoms of stacks.  These are not used unless your PySol install does not support generating stack bottoms, or you enable them manually (currently only possible through editing the options.cfg file).  Which bottoms are used depend on the cardset type.  Each bottom has a version with a suffix of -n, indicating the negative bottom that gets used if the appropriate option is enabled.
-* Shadow images.  These will only be used if your PySol install does not support auto-generated shadows.
 
 config.txt template
 -------------------

fastlane/metadata/android/en-US/changelogs/102130200.txt

@@ -1,3 +0,0 @@
-
-- menu entry to select random games.
-- enhancements and bug fixes (see https://pysolfc.sourceforge.io)

html-src/cardset_customization.html

@@ -1,25 +1,4 @@
     <h1>Cardset Customization Tutorial</h1>
-      <h2>Setting up a Cardset</h2>
-          <p>The easiest way to create a cardset would be to copy an existing cardset folder
-          of the same type in your cardsets directory.  All cardsets need a number of files to work.
-          <ul>
-          <li>An image for each card - these images should be the same format and the same size, as defined in the config.txt file (described below).
-          These files should be named something like 01s.png for the ace of spades.  The first two (or more) digits represent the rank, and the letter
-          after represents the suit.  The suits are labeled hcds in French decks or decks that use French suits (i.e. Hex A or Tarock decks), and
-          the suits are alphabetical for other decks.  The suit letter z is used for jokers or trumps.</li>
-          <li>A shade file - shade.png, for example.</li>
-          <li>At least one back image, as defined in the config.txt file below.</li>
-          <li>A config.txt file, the format described below.</li>
-          <li>A copyright file, containing copyright info.</li>
-          </ul>
-          <p>The following optional files may also be added, but are only used under certain circumstances.
-          <ul>
-          <li>Bottom images.  A number of images for the bottoms of stacks.  These are not used unless your PySol install
-          does not support generating stack bottoms, or you enable them manually (currently only possible through editing the
-          options.cfg file).  Which bottoms are used depend on the cardset type.  Each bottom has a version with a suffix of
-          -n, indicating the negative bottom that gets used if the appropriate option is enabled.</li>
-          <li>Shadow images.  These will only be used if your PySol install does not support auto-generated shadows.</li>
-          </ul>
       <h2>config.txt template</h2>
             <pre>PySolFC solitaire cardset;$A;$FMT;$B;$C;$D,$E;$F;$G;$H
 &lt;internal_name&gt;;&lt;cardset_name&gt;

html-src/news.html

@@ -1,28 +1,6 @@
 <h1>What's New?</h1>
 <ul>
 <li>
-<p><em>11 January, 2025:</em> There is a new stable release
-<a href="https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.2.0/">PySolFC
-v3.2.0</a>.  New in this release:</p>
-<ul>
-<li>
-<p>
-New fullscreen mode, accessible by pressing F11.
-</p>
-</li>
-<li>
-<p>
-Easy option to clear advanced search options.
-</p>
-</li>
-<li>
-<p>
-Lots of bugfixes and enhancements.
-</p>
-</li>
-</ul>
-</li>
-<li>
 <p><em>19 October, 2024:</em> There is a new stable release
 <a href="https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-3.1.0/">PySolFC
 v3.1.0</a>.  New in this release:</p>

pysollib/settings.py

@@ -32,7 +32,7 @@ PACKAGE = 'PySolFC'
 TITLE = 'PySol'
 PACKAGE_URL = 'http://pysolfc.sourceforge.io/'
 
-VERSION_TUPLE = (3, 2, 0)
+VERSION_TUPLE = (3, 1, 0)
 VERSION = '.'.join(map(str, VERSION_TUPLE))
 
 # Tk windowing system (auto set up in init.py)

pysollib/stats.py

@@ -107,7 +107,6 @@ class PysolStatsFormatter:
 
     def getLogResults(self, player, prev_games):
         t_won, tlost = 0, 0
-        stats = []
         for pg in prev_games:
             if not isinstance(pg, tuple):
                 continue
@@ -148,8 +147,7 @@ class PysolStatsFormatter:
                           _("Won"), _("Perfect"))[pg[2]+2]
             # writer.plog(name, gamenumber, date, status, gameid=gameid,
             #   won=pg[2])
-            stats.append([name, gamenumber, date, status, pg[2], gameid])
-        return stats
+            yield [name, gamenumber, date, status, pg[2], gameid]
 
     #
     #

pysollib/tile/tkstats.py

@@ -376,18 +376,11 @@ class TreeFormatter(PysolStatsFormatter):
         self.parent_window.tree_items.append(id)
         return 1
 
-    def writeLog(self, player, prev_games, sort_by='date'):
+    def writeLog(self, player, prev_games):
         if not player or not prev_games:
             return 0
         num_rows = 0
-        results = self.getLogResults(player, prev_games)
-        if sort_by == 'gamenumber':
-            results.sort(key=lambda x: x[1])
-        elif sort_by == 'name':
-            results.sort(key=lambda x: x[0])
-        elif sort_by == 'status':
-            results.sort(key=lambda x: x[3])
-        for result in results:
+        for result in self.getLogResults(player, prev_games):
             t1, t2, t3, t4, t5, t6 = result
             id = self.tree.insert("", "end", text=t1, values=(t2, t3, t4))
             self.parent_window.tree_items.append(id)
@@ -395,16 +388,15 @@ class TreeFormatter(PysolStatsFormatter):
             num_rows += 1
             if num_rows > self.MAX_ROWS:
                 break
-
         return 1
 
-    def writeFullLog(self, player, sort_by='date'):
+    def writeFullLog(self, player):
         prev_games = self.app.stats.prev_games.get(player)
-        return self.writeLog(player, prev_games, sort_by=sort_by)
+        return self.writeLog(player, prev_games)
 
-    def writeSessionLog(self, player, sort_by='date'):
+    def writeSessionLog(self, player):
         prev_games = self.app.stats.session_games.get(player)
-        return self.writeLog(player, prev_games, sort_by=sort_by)
+        return self.writeLog(player, prev_games)
 
 
 # ************************************************************************
@@ -608,7 +600,6 @@ class FullLogFrame(AllGamesFrame):
                   'XXXXXXXXXXXX')
         self.games = {}
         self.formatter.resizeHeader(player, header)
-        self.sort_by = 'date'
 
     def createHeader(self, player):
         header = self.formatter.getLogHeader()
@@ -616,10 +607,11 @@ class FullLogFrame(AllGamesFrame):
 
     def fillTreeview(self, player):
         if self.tree_items:
-            for item in self.tree.get_children():
-                self.tree.delete(item)
-            self.tree_items = []
-        self.formatter.writeFullLog(player, sort_by=self.sort_by)
+            return
+        self.formatter.writeFullLog(player)
+
+    def headerClick(self, column):
+        pass
 
     def getSelectedGame(self):
         sel = self.tree.selection()
@@ -632,10 +624,8 @@ class FullLogFrame(AllGamesFrame):
 class SessionLogFrame(FullLogFrame):
     def fillTreeview(self, player):
         if self.tree_items:
-            for item in self.tree.get_children():
-                self.tree.delete(item)
-            self.tree_items = []
-        self.formatter.writeSessionLog(player, sort_by=self.sort_by)
+            return
+        self.formatter.writeSessionLog(player)
 
 
 # ************************************************************************