Add option to clear filters

po/de_pysol.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-11-10 18:26-0500\n"
+"PO-Revision-Date: 2024-11-16 11:21-0500\n"
 "Last-Translator: H. Schaekel <Holger.Schaekel@web.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -111,6 +111,9 @@ msgstr "&Nächste Nummer"
 msgid "&Cancel"
 msgstr "&Abbruch"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Zufallsspiel auswählen"

po/fr_pysol.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: 1.02\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-11-10 18:25-0500\n"
+"PO-Revision-Date: 2024-11-16 11:21-0500\n"
 "Last-Translator: Eric Rausch <neelix570@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@@ -116,6 +116,9 @@ msgstr "&Numéro suivant"
 msgid "&Cancel"
 msgstr "&Annuler"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Jeu au hasard"

po/it_pysol.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: it_pysol\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-11-10 18:25-0500\n"
+"PO-Revision-Date: 2024-11-16 11:21-0500\n"
 "Last-Translator: Giuliano Colla <giuliano.colla@gmail.com>\n"
 "Language-Team: Italiano <it@li.org>\n"
 "Language: it\n"
@@ -121,6 +121,9 @@ msgstr "&Numero successivo"
 msgid "&Cancel"
 msgstr "&Cancella"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Un gioco a caso"

po/pl_pysol.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PySolFC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-11-10 18:25-0500\n"
+"PO-Revision-Date: 2024-11-16 11:22-0500\n"
 "Last-Translator: Jerzy Trzeciak <artusek@wp.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
@@ -117,6 +117,9 @@ msgstr "&Następny numer"
 msgid "&Cancel"
 msgstr "Anuluj"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Wybierz grę losowo"

po/pt_BR_pysol.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-11-10 18:26-0500\n"
+"PO-Revision-Date: 2024-11-16 11:23-0500\n"
 "Last-Translator: Matheus Knack <mtknack555@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -116,6 +116,9 @@ msgstr "&próximo número"
 msgid "&Cancel"
 msgstr "&Cancelar"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Selecionar jogo aleatório"

po/pysol.pot

@@ -113,6 +113,9 @@ msgstr ""
 msgid "&Cancel"
 msgstr ""
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr ""

po/ru_pysol.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-12-10 10:19-0500\n"
-"PO-Revision-Date: 2024-11-10 18:24-0500\n"
+"PO-Revision-Date: 2024-11-16 11:23-0500\n"
 "Last-Translator: Skomoroh <skomoroh@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
@@ -117,6 +117,9 @@ msgstr "&Следующий номер"
 msgid "&Cancel"
 msgstr "От&мена"
 
+msgid "C&lear"
+msgstr ""
+
 #: pysollib/actions.py:311
 msgid "Select random game"
 msgstr "Выбор случайной игры"

pysollib/app.py

@@ -567,6 +567,7 @@ class Application:
                 (_('&Next number'), 'next'),
                 (_('&Play'), 'next'),
                 (_('&Play this game'), 'next'),
+                (_('C&lear'), 'clear'),
                 (_('&Solid color...'), 'color'),
                 (_('&Save to file'), 'save'),
                 (_('&Statistics...'), 'statistics'),

pysollib/games/crossword.py

@@ -23,6 +23,7 @@
 
 from pysollib.game import Game
 from pysollib.gamedb import GI, GameInfo, registerGame
+from pysollib.hint import AbstractHint
 from pysollib.layout import Layout
 from pysollib.stack import \
         OpenTalonStack, \
@@ -36,6 +37,20 @@ from pysollib.stack import \
 # ************************************************************************
 
 
+class Crossword_Hint(AbstractHint):
+
+    def computeHints(self):
+        game = self.game
+        rows = game.s.rows
+        for i in range(len(rows)):
+            r = rows[i]
+            if r.cards:
+                continue
+            if game.isValidPlay(r.id, game.s.talon.getCard().rank + 1):
+                # TODO: Check a few moves ahead to get better hints.
+                self.addHint(5000, 1, game.s.talon, r)
+
+
 class Crossword_RowStack(ReserveStack):
     def clickHandler(self, event):
         if (not self.cards and self.game.s.talon.cards and
@@ -85,7 +100,7 @@ class Crossword(Game):
     Talon_Class = OpenTalonStack
     RowStack_Class = StackWrapper(Crossword_RowStack, max_move=0)
     FinalCards_Class = StackWrapper(Crossword_FinalCard, max_move=0)
-    Hint_Class = None
+    Hint_Class = Crossword_Hint
 
     #
     # game layout

pysollib/tile/selectcardset.py

@@ -548,6 +548,10 @@ class SelectCardsetDialogWithPreview(MfxDialog):
         d = SelectCardsetAdvancedSearch(self.top, _("Advanced search"),
                                         self.criteria, self.manager)
         if d.status == 0 and d.button == 0:
+            self.criteria = SearchCriteria(self.manager)
+            self.performSearch()
+
+        if d.status == 0 and d.button == 1:
             self.criteria.name = d.name.get()
 
             self.list_searchtext.delete(0, "end")
@@ -903,11 +907,14 @@ class SelectCardsetAdvancedSearch(MfxDialog):
             top_frame, variable=self.compatible,
             text=_("Compatible with current game"), anchor="w"
         )
-        compatCheck.grid(row=row, column=0, columnspan=2, sticky='ew',
+        compatCheck.grid(row=row, column=0, columnspan=5, sticky='ew',
                          padx=1, pady=1)
 
+        top_frame.columnconfigure(4, weight=1)
+
         focus = self.createButtons(bottom_frame, kw)
         # focus = text_w
+
         self.mainloop(focus, kw.timeout)
 
     def updateSubtypes(self, *args):
@@ -929,7 +936,7 @@ class SelectCardsetAdvancedSearch(MfxDialog):
 
     def initKw(self, kw):
         kw = KwStruct(kw,
-                      strings=(_("&OK"), _("&Cancel")), default=0,
+                      strings=(_("C&lear"), 'sep', _("&OK"), _("&Cancel")),
-                      padx=10, pady=10,
+                      default=1, padx=10, pady=10,
                       )
         return MfxDialog.initKw(self, kw)

pysollib/tile/selectgame.py

@@ -676,6 +676,10 @@ class SelectGameDialogWithPreview(SelectGameDialog):
         d = SelectGameAdvancedSearch(self.top, _("Advanced search"),
                                      self.criteria)
         if d.status == 0 and d.button == 0:
+            self.criteria = SearchCriteria()
+            self.performSearch()
+
+        if d.status == 0 and d.button == 1:
             self.criteria.name = d.name.get()
 
             self.list_searchtext.delete(0, "end")
@@ -1227,6 +1231,9 @@ class SelectGameAdvancedSearch(MfxDialog):
                            padx=1, pady=1)
 
         focus = self.createButtons(bottom_frame, kw)
+
+        top_frame.config(width=bottom_frame.winfo_width())
+
         # focus = text_w
         self.mainloop(focus, kw.timeout)
 
@@ -1249,7 +1256,7 @@ class SelectGameAdvancedSearch(MfxDialog):
 
     def initKw(self, kw):
         kw = KwStruct(kw,
-                      strings=(_("&OK"), _("&Cancel")), default=0,
+                      strings=(_("C&lear"), 'sep', _("&OK"), _("&Cancel")),
-                      padx=10, pady=10,
+                      default=1, padx=10, pady=10,
                       )
         return MfxDialog.initKw(self, kw)

pysollib/tile/selecttile.py

@@ -344,6 +344,10 @@ class SelectTileDialogWithPreview(MfxDialog):
         d = SelectTileAdvancedSearch(self.top, _("Advanced search"),
                                      self.criteria)
         if d.status == 0 and d.button == 0:
+            self.criteria = SearchCriteria()
+            self.performSearch()
+
+        if d.status == 0 and d.button == 1:
             self.criteria.name = d.name.get()
 
             self.list_searchtext.delete(0, "end")
@@ -461,13 +465,15 @@ class SelectTileAdvancedSearch(MfxDialog):
                           padx=1, pady=1)
             row += 1
 
+        top_frame.columnconfigure(4, weight=1)
+
         focus = self.createButtons(bottom_frame, kw)
         # focus = text_w
         self.mainloop(focus, kw.timeout)
 
     def initKw(self, kw):
         kw = KwStruct(kw,
-                      strings=(_("&OK"), _("&Cancel")), default=0,
+                      strings=(_("C&lear"), 'sep', _("&OK"), _("&Cancel")),
-                      padx=10, pady=10,
+                      default=1, padx=10, pady=10,
                       )
         return MfxDialog.initKw(self, kw)

pysollib/tile/tkwidget.py

@@ -154,7 +154,7 @@ class MfxDialog:  # ex. _ToplevelDialog
             separator = ttk.Separator(self._frame)
             separator.pack(side='bottom', fill='x')
         top_frame = ttk.Frame(self._frame)
-        top_frame.pack(side='top', fill='both', expand=1)
+        top_frame.pack(side='top', fill='both', expand=True)
         return top_frame, bottom_frame
 
     def createBitmaps(self, frame, kw):

pysollib/ui/tktile/menubar.py

@@ -1119,8 +1119,8 @@ class PysolMenubarTkCommon:
             if not mahjongg_games[n:n + d]:
                 break
             m = min(n + d - 1, len(mahjongg_games) - 1)
-            label = mahjongg_games[n].short_name[:3] + ' - ' + \
+            label = mahjongg_games[n].short_name[:3].strip() + ' - ' + \
-                mahjongg_games[m].short_name[:3]
+                mahjongg_games[m].short_name[:3].strip()
             submenu = MfxMenu(menu, label=label, name=None)
             self._addSelectGameSubSubMenu(mahjongg_games[n:n + d], submenu,
                                           command, variable, short_name=True)
@@ -1182,7 +1182,8 @@ class PysolMenubarTkCommon:
             if not games[n:n+d]:
                 break
             m = min(n+d-1, len(games)-1)
-            label = games[n].name[:3] + ' - ' + games[m].name[:3]
+            label = games[n].name[:3].strip() + ' - ' + \
+                games[m].name[:3].strip()
             submenu = MfxMenu(menu, label=label, name=None)
             self._addSelectGameSubSubMenu(games[n:n+d], submenu,
                                           command, variable)