From 3b0cc10d30a9a56e7889d968625e1a1be9c709d1 Mon Sep 17 00:00:00 2001
From: skomoroh <skomoroh@efabe8c0-fbe8-4139-b769-b5e6d273206e>
Date: Sun, 27 Aug 2006 21:13:54 +0000
Subject: [PATCH] + version 0.9.3 * bug fixes

git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@58 efabe8c0-fbe8-4139-b769-b5e6d273206e
---
 pysollib/actions.py           | 8 ++++++--
 pysollib/gamedb.py            | 1 +
 pysollib/games/spider.py      | 2 +-
 pysollib/help.py              | 1 +
 pysollib/pysolgtk/menubar.py  | 3 +++
 pysollib/tk/findcarddialog.py | 1 +
 pysollib/tk/menubar.py        | 3 +++
 7 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pysollib/actions.py b/pysollib/actions.py
index 282c1e2a..0358bbc8 100644
--- a/pysollib/actions.py
+++ b/pysollib/actions.py
@@ -121,7 +121,11 @@ class PysolMenubarActions:
         return self.game is None or self.game._finishDrag()
 
     def _cancelDrag(self, break_pause=True):
-        return self.game is None or self.game._cancelDrag(break_pause=break_pause)
+        if self.game is None:
+            return True
+        ret = self.game._cancelDrag(break_pause=break_pause)
+        self._setPauseMenu(self.game.pause)
+        return ret
 
     def changed(self, *args, **kw):
         assert self.game is not None
@@ -712,7 +716,7 @@ class PysolMenubarActions:
             #
             if (text_color != self.app.opt.colors['text'] or
                 use_default_text_color != self.app.opt.use_default_text_color):
-                self.app.setTile(self.app.opt.tabletile_index)
+                self.app.setTile(self.app.tabletile_index)
 
     def mOptFonts(self, *args):
         if self._cancelDrag(break_pause=False): return
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index f0e65251..86a848ea 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -336,6 +336,7 @@ class GI:
         ('fc-0.9.0', tuple(range(323, 421))),
         ('fc-0.9.1', tuple(range(421, 441))),
         ('fc-0.9.2', tuple(range(441, 466))),
+        ('fc-0.9.3', tuple(range(466, 661))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py
index ad39692c..385fba7c 100644
--- a/pysollib/games/spider.py
+++ b/pysollib/games/spider.py
@@ -855,7 +855,7 @@ class Applegate(Game):
     def getHighlightPilesStacks(self):
         return ()
 
-    shallHighlightMatch = Game._shallHighlightMatch_RKW
+    shallHighlightMatch = Game._shallHighlightMatch_SSW
 
 
 # /***********************************************************************
diff --git a/pysollib/help.py b/pysollib/help.py
index 5a51aee5..afedc1c3 100644
--- a/pysollib/help.py
+++ b/pysollib/help.py
@@ -162,6 +162,7 @@ def help_html(app, document, dir_, top=None):
         viewer = HTMLViewer(top, app, help_html_index)
         viewer.display(doc)
     #wm_map(top, maximized=maximized)
+    viewer.parent.wm_deiconify()
     viewer.parent.tkraise()
     help_html_viewer = viewer
     return viewer
diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py
index e7dfb021..13739572 100644
--- a/pysollib/pysolgtk/menubar.py
+++ b/pysollib/pysolgtk/menubar.py
@@ -863,3 +863,6 @@ class PysolMenubar(PysolMenubarActions):
         # FIXME
         pass
 
+    def _setPauseMenu(self, v):
+        # FIXME
+        pass
diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py
index 0ae5ad91..cf55a000 100644
--- a/pysollib/tk/findcarddialog.py
+++ b/pysollib/tk/findcarddialog.py
@@ -196,6 +196,7 @@ find_card_dialog = None
 def create_find_card_dialog(parent, game, dir):
     global find_card_dialog
     try:
+        find_card_dialog.wm_deiconify()
         find_card_dialog.tkraise()
     except:
         ##traceback.print_exc()
diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py
index b063cff6..d3e7d520 100644
--- a/pysollib/tk/menubar.py
+++ b/pysollib/tk/menubar.py
@@ -939,6 +939,9 @@ class PysolMenubar(PysolMenubarActions):
     def _setCommentMenu(self, v):
         self.tkopt.comment.set(v)
 
+    def _setPauseMenu(self, v):
+        self.tkopt.pause.set(v)
+
 
     #
     # menu actions