* improved look for x11

* renamed option `separatorwidth' to `separator' (dialogs)


git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@179 39dd0a4e-7c14-0410-91b3-c4f2d318f732

data/tcl/fsdialog8.4.tcl

@@ -1676,8 +1676,8 @@ if {![llength [info procs lassign]]} {
 }
 
 style default Slim.TButton -padding 0
-option add *TkFDialog*selectBackground #0a5f89
+# option add *TkFDialog*selectBackground #0a5f89
-option add *TkFDialog*selectForeground #ffffff
+# option add *TkFDialog*selectForeground #ffffff
 option add *TkFDialog*Toolbar*takeFocus 0
 option add *TkFDialog*Text.background white
 # option add *TkFDialog*Menu.activeBackground #0a5f89

data/tcl/fsdialog8.5.tcl

@@ -1639,8 +1639,8 @@ if {![llength [info procs lassign]]} {
 	}
 }
 
-option add *TkFDialog*selectBackground #0a5f89
+# option add *TkFDialog*selectBackground #0a5f89
-option add *TkFDialog*selectForeground #ffffff
+# option add *TkFDialog*selectForeground #ffffff
 option add *TkFDialog*Toolbar*takeFocus 0
 option add *TkFDialog*Text.background white
 # option add *TkFDialog*Menu.activeBackground #0a5f89

pysollib/app.py

@@ -414,12 +414,11 @@ class Options:
                 val = config.getfloat(section, key)
             else: # str
                 val = config.get(section, key)
-                if isinstance(val, str):
                 val = unicode(val, 'utf-8')
         except ConfigParser.NoOptionError:
             val = None
         except:
-            print >> sys.stderr, 'Load option error:', key
+            print_err('load option error: '+key)
             traceback.print_exc()
             val = None
         return val
@@ -969,6 +968,7 @@ class Application:
                         raise           # internal error?
                     traceback.print_exc()
                     self.nextgame.id = 2
+                    self.freeGame()
                     continue
                 if self.nextgame.holdgame:
                     assert self.nextgame.id <= 0

pysollib/game.py

@@ -37,7 +37,6 @@
 # imports
 import time
 import math
-import md5
 import traceback
 from cStringIO import StringIO
 
@@ -667,7 +666,7 @@ class Game:
     def leaveState(self, old_state):
         self.moves.state = old_state
 
-    def getSnapshot(self, hex=False):
+    def getSnapshot(self):
         # generate hash (unique string) of current move
         sn = []
         for stack in self.allstacks:
@@ -676,11 +675,8 @@ class Game:
                 s.append('%d%03d%d' % (card.suit, card.rank, card.face_up))
             sn.append(''.join(s))
         sn = '-'.join(sn)
-        # make more short string
+        # optimisation
-        if hex:
+        sn = hash(sn)
-            sn = md5.new(sn).hexdigest()
-        else:
-            sn = md5.new(sn).digest()
         return sn
 
     def createSnGroups(self):
@@ -1690,7 +1686,7 @@ for %d moves.
 %s
 ''') % (time, self.moves.index, top_msg),
                                  strings=(_("&New game"), None, _("&Cancel")),
-                                 image=self.app.gimages.logos[5], separatorwidth=2)
+                                 image=self.app.gimages.logos[5])
         elif status == 1:
             top_msg = self.updateStats()
             time = self.getTime()
@@ -1706,7 +1702,7 @@ for %d moves.
 %s
 ''') % (time, self.moves.index, top_msg),
                                  strings=(_("&New game"), None, _("&Cancel")),
-                                 image=self.app.gimages.logos[4], separatorwidth=2)
+                                 image=self.app.gimages.logos[4])
         elif self.gstats.updated < 0:
             self.finished = True
             self.playSample("gamefinished", priority=1000)

pysollib/help.py

@@ -76,7 +76,7 @@ For more information about this application visit''') % (t, version),
                          url=PACKAGE_URL,
                          image=app.gimages.logos[2],
                          strings=strings, default=0,
-                         separatorwidth=2)
+                         separator=True)
     if d.status == 0 and d.button == 1:
         help_credits(app, sound=sound)
     return d.status
@@ -103,7 +103,7 @@ Natascha
 The Python, %s, SDL & Linux crews
 for making this program possible''') % t,
                   image=app.gimages.logos[3], image_side="right",
-                  separatorwidth=2)
+                  separator=True)
     return d.status
 
 

pysollib/pysolgtk/tkwidget.py

@@ -73,7 +73,7 @@ class MfxDialog(_MyDialog):
                  width=-1, height=-1,
                  text='', justify='center',
                  strings=("OK",), default=0,
-                 separatorwidth=0,
+                 separator=False,
                  padx=20, pady=20,
                  bitmap=None, bitmap_side='left',
                  bitmap_padx=20, bitmap_pady=20,
@@ -172,8 +172,8 @@ class MfxDialog(_MyDialog):
                   image_padx=10, image_pady=20,
                   )
 ##         # default to separator if more than one button
-##         sw = 2 * (len(kw.strings) > 1)
+##         sw = len(kw.strings) > 1
-##         kwdefault(kw.__dict__, separatorwidth=sw)
+##         kwdefault(kw.__dict__, separator=sw)
         return kw
 
     def done(self, button):

pysollib/tile/Tile.py

@@ -36,6 +36,7 @@ class Style(Tkinter.Misc):
 
     def default(self, style, **kw):
         """Sets the default value of the specified option(s) in style"""
+        assert TileVersion < '0.8'      # removed in Tile-0.8.0
         opts = self._options(kw)
         return self.tk.call(_tile_prefix+"style", "default", style, *opts)
 
@@ -496,7 +497,7 @@ class Treeview(Widget, Tkinter.Listbox):
         if id: args = args + ('-id', id)
         return self.tk.call(args + self._options(kw))
 
-    def item(item, **kw):
+    def item(self, item, **kw):
         """Query or modify the options for the specified item. If no -option 
         is specified, returns a dictionary of option/value pairs. If a single 
         -option is specified, returns the value of that option. Otherwise, the

pysollib/tile/edittextdialog.py

@@ -82,8 +82,8 @@ class EditTextDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Cancel")),
                       default=-1,
-                      resizable=1,
+                      resizable=False,
-                      separatorwidth=0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tile/findcarddialog.py

@@ -49,7 +49,7 @@ class FindCardDialog(Tkinter.Toplevel):
     def __init__(self, parent, game, dir, size='large'):
         Tkinter.Toplevel.__init__(self)
         self.title(_('Find card'))
-        self.wm_resizable(0, 0)
+        self.wm_resizable(False, False)
         #
         ##self.images_dir = dir
         if size == 'large':

pysollib/tile/gameinfodialog.py

@@ -153,6 +153,6 @@ class GameInfoDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"),),
                       default=0,
-                      separatorwidth=2,
+                      separator=True,
                       )
         return MfxDialog.initKw(self, kw)

pysollib/tile/progressbar.py

@@ -56,7 +56,7 @@ class PysolProgressBar:
         self.top = makeToplevel(parent, title=title)
         self.top.wm_protocol("WM_DELETE_WINDOW", self.wmDeleteWindow)
         self.top.wm_group(parent)
-        self.top.wm_resizable(0, 0)
+        self.top.wm_resizable(False, False)
         self.top.config(cursor="watch")
         #
         self.frame = Tile.Frame(self.top, relief='flat', borderwidth=0)

pysollib/tile/selectcardset.py

@@ -237,7 +237,7 @@ class SelectCardsetDialogWithPreview(MfxDialog):
                       strings = ((_("&Info..."), 10), 'sep',
                                  _("&Load"), _("&Cancel"),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
                       )
         return MfxDialog.initKw(self, kw)
 
@@ -388,8 +388,8 @@ class CardsetInfoDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
-                      separatorwidth=2,
+                      separator=True,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tile/selectgame.py

@@ -298,8 +298,8 @@ class SelectGameDialog(MfxDialog):
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(None, None, _("&Cancel"),), default=0,
-                      separatorwidth=2,
+                      resizable=True,
-                      resizable=1,
+                      separator=True,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tile/selecttile.py

@@ -156,7 +156,7 @@ class SelectTileDialogWithPreview(MfxDialog):
                       strings=((_("&Solid color..."), 10),
                                'sep', _("&OK"), _("&Cancel"),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
                       font=None,
                       )
         return MfxDialog.initKw(self, kw)

pysollib/tile/tkstats.py

@@ -123,7 +123,7 @@ class StatsDialog(MfxDialog):
                                "sep", _("&OK"),
                                (_("&Reset..."), 500)),
                       default=0,
-                      separatorwidth=0,
+                      separator=False,
         )
         return MfxDialog.initKw(self, kw)
 
@@ -554,7 +554,7 @@ class LogDialog(MfxDialog):
                                (_("&Save to file"), 500)),
                       default=0,
                       width=76*self.CHAR_W,
-                      separatorwidth=0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 
@@ -732,7 +732,7 @@ class _TopDialog(MfxDialog):
 
 
     def initKw(self, kw):
-        kw = KwStruct(kw, strings=(_('&OK'),), default=0, separatorwidth=2)
+        kw = KwStruct(kw, strings=(_('&OK'),), default=0, separator=True)
         return MfxDialog.initKw(self, kw)
 
 

pysollib/tile/tkwidget.py

@@ -69,7 +69,7 @@ class MfxDialog: # ex. _ToplevelDialog
     img = {}
     button_img = {}
 
-    def __init__(self, parent, title="", resizable=0, default=-1):
+    def __init__(self, parent, title="", resizable=False, default=-1):
         self.parent = parent
         self.status = 0
         self.button = default
@@ -150,7 +150,7 @@ class MfxDialog: # ex. _ToplevelDialog
 
     def initKw(self, kw):
         kw = KwStruct(kw,
-                      timeout=0, resizable=0,
+                      timeout=0, resizable=False,
                       text="", justify="center",
                       strings=(_("&OK"),),
                       default=0,
@@ -162,14 +162,14 @@ class MfxDialog: # ex. _ToplevelDialog
                       image_padx=10, image_pady=20,
                       )
         # default to separator if more than one button
-        sw = 2 * (len(kw.strings) > 1)
+        sep = len(kw.strings) > 1
-        kwdefault(kw.__dict__, separatorwidth=sw)
+        kwdefault(kw.__dict__, separator=sep)
         return kw
 
     def createFrames(self, kw):
         bottom_frame = Tile.Frame(self._frame, relief='flat', borderwidth=4)
         bottom_frame.pack(side='bottom', fill='both', expand=False)
-        if kw.separatorwidth > 0:
+        if kw.separator:
             separator = Tile.Separator(self._frame)
             separator.pack(side='bottom', fill='x')
         top_frame = Tile.Frame(self._frame)
@@ -361,7 +361,7 @@ class MfxSimpleEntry(MfxDialog):
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Cancel")), default=0,
-                      separatorwidth = 0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tile/wizarddialog.py

@@ -147,6 +147,7 @@ class WizardDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_('&OK'), _('&Cancel')),
                       default=0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tk/edittextdialog.py

@@ -81,8 +81,8 @@ class EditTextDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Cancel")),
                       default=-1,
-                      resizable=1,
+                      resizable=True,
-                      separatorwidth=0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tk/findcarddialog.py

@@ -52,7 +52,7 @@ class FindCardDialog(Tkinter.Toplevel):
     def __init__(self, parent, game, dir, size='large'):
         Tkinter.Toplevel.__init__(self)
         self.title(_('Find card'))
-        self.wm_resizable(0, 0)
+        self.wm_resizable(False, False)
         #
         ##self.images_dir = dir
         if size == 'large':

pysollib/tk/gameinfodialog.py

@@ -153,6 +153,6 @@ class GameInfoDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"),),
                       default=0,
-                      separatorwidth=2,
+                      separator=True,
                       )
         return MfxDialog.initKw(self, kw)

pysollib/tk/playeroptionsdialog.py

@@ -82,8 +82,8 @@ class SelectUserNameDialog(MfxDialog):
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Cancel")), default=0,
-                      separatorwidth=0,
+                      separator=False,
-                      resizable=0,
+                      resizable=False,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,
                       )

pysollib/tk/progressbar.py

@@ -55,7 +55,7 @@ class PysolProgressBar:
         self.top = makeToplevel(parent, title=title)
         self.top.wm_protocol("WM_DELETE_WINDOW", self.wmDeleteWindow)
         self.top.wm_group(parent)
-        self.top.wm_resizable(0, 0)
+        self.top.wm_resizable(False, False)
         self.frame = Tkinter.Frame(self.top, relief='flat', bd=0,
                                    takefocus=0)
         self.cframe = Tkinter.Frame(self.frame, relief='sunken', bd=1,

pysollib/tk/selectcardset.py

@@ -236,7 +236,7 @@ class SelectCardsetDialogWithPreview(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Load"), _("&Cancel"),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,
                       )
@@ -388,8 +388,8 @@ class CardsetInfoDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
-                      separatorwidth=2,
+                      separator=True,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,
                       )

pysollib/tk/selectgame.py

@@ -300,8 +300,8 @@ class SelectGameDialog(MfxDialog):
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(None, None, _("&Cancel"),), default=0,
-                      separatorwidth=2,
+                      separator=True,
-                      resizable=1,
+                      resizable=True,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,
                       )

pysollib/tk/selecttile.py

@@ -155,7 +155,7 @@ class SelectTileDialogWithPreview(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Solid color..."), _("&Cancel"),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
                       font=None,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,

pysollib/tk/soundoptionsdialog.py

@@ -167,7 +167,6 @@ class SoundOptionsDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=strings,
                       default=0,
-                      resizable=1,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,
                       )

pysollib/tk/tkstats.py

@@ -512,7 +512,7 @@ class AllGames_StatsDialog(MfxDialog):
                                (_("&Save to file"), 202),
                                (_("&Reset all..."), 301),),
                       default=0,
-                      resizable=1,
+                      resizable=True,
                       padx=10, pady=10,
                       #width=900,
         )
@@ -704,7 +704,7 @@ class _TopDialog(MfxDialog):
 
 
     def initKw(self, kw):
-        kw = KwStruct(kw, strings=(_('&OK'),), default=0, separatorwidth=2)
+        kw = KwStruct(kw, strings=(_('&OK'),), default=0, separator=True)
         return MfxDialog.initKw(self, kw)
 
 
@@ -791,7 +791,7 @@ class Top_StatsDialog(MfxDialog):
                       strings=(_('&OK'),),
                       default=0,
                       image=self.app.gimages.logos[4],
-                      separatorwidth=2,
+                      separator=True,
                       )
         return MfxDialog.initKw(self, kw)
 
@@ -956,7 +956,7 @@ class ProgressionDialog(MfxDialog):
 
 
     def initKw(self, kw):
-        kw = KwStruct(kw, strings=(_('&OK'),), default=0, separatorwidth=2)
+        kw = KwStruct(kw, strings=(_('&OK'),), default=0, separator=True)
         return MfxDialog.initKw(self, kw)
 
 

pysollib/tk/tkwidget.py

@@ -67,7 +67,7 @@ from tkcanvas import MfxCanvas
 class MfxDialog: # ex. _ToplevelDialog
     img = {}
     button_img = {}
-    def __init__(self, parent, title="", resizable=0, default=-1):
+    def __init__(self, parent, title="", resizable=False, default=-1):
         self.parent = parent
         self.status = 0
         self.button = default
@@ -156,7 +156,7 @@ class MfxDialog: # ex. _ToplevelDialog
 
     def initKw(self, kw):
         kw = KwStruct(kw,
-                      timeout=0, resizable=0,
+                      timeout=0, resizable=False,
                       text="", justify="center",
                       strings=(_("&OK"),),
                       default=0,
@@ -168,18 +168,17 @@ class MfxDialog: # ex. _ToplevelDialog
                       image_padx=10, image_pady=20,
                       )
         # default to separator if more than one button
-        sw = 2 * (len(kw.strings) > 1)
+        sep = len(kw.strings) > 1
-        kwdefault(kw.__dict__, separatorwidth=sw)
+        kwdefault(kw.__dict__, separator=sep)
         return kw
 
     def createFrames(self, kw):
         bottom_frame = Tkinter.Frame(self.top)
         bottom_frame.pack(side='bottom', fill='both', expand=False,
                           ipadx=3, ipady=3)
-        if kw.separatorwidth > 0:
+        if kw.separator:
             separator = Tkinter.Frame(self.top, relief="sunken",
-                    height=kw.separatorwidth, width=kw.separatorwidth,
+                    height=2, width=2, borderwidth=1)
-                    borderwidth=kw.separatorwidth / 2)
             separator.pack(side='bottom', fill='x')
         top_frame = Tkinter.Frame(self.top)
         top_frame.pack(side='top', fill='both', expand=True)
@@ -358,7 +357,7 @@ class MfxSimpleEntry(MfxDialog):
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(_("&OK"), _("&Cancel")), default=0,
-                      separatorwidth = 0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/tk/wizarddialog.py

@@ -137,6 +137,7 @@ class WizardDialog(MfxDialog):
         kw = KwStruct(kw,
                       strings=(_('&OK'), _('&Cancel')),
                       default=0,
+                      separator=False,
                       )
         return MfxDialog.initKw(self, kw)
 

pysollib/winsystems/x11.py

@@ -90,8 +90,21 @@ def init_root_window(root, app):
 
         root.option_add('*Listbox.background', 'white', 60)
         root.option_add('*Listbox.foreground', 'black', 60)
-        root.option_add('*Listbox*selectBackground', '#0a5f89', 60)
+        root.option_add('*Text.background', 'white', 60)
-        root.option_add('*Listbox*selectForeground', 'white', 60)
+        root.option_add('*Text.foreground', 'black', 60)
+        root.option_add('*selectForeground', 'white', 60)
+        root.option_add('*selectBackground', '#0a5f89', 60)
+        root.option_add('*inactiveSelectBackground', '#0a5f89', 60) # Tk-8.5
+
+        color = style.lookup('TEntry', 'selectbackground', 'focus')
+        if color:
+            root.option_add('*selectBackground', color, 60)
+            root.option_add('*inactiveSelectBackground', color, 60)
+        color = style.lookup('TEntry', 'selectforeground', 'focus')
+        if color:
+            root.option_add('*selectForeground', color, 60)
+
+        root.option_add('*selectBorderWidth', 0, 60)
 
         font = root.option_get('font', PACKAGE)
         if font:
@@ -113,7 +126,7 @@ def init_root_window(root, app):
                     root.option_add('*font', font)
                     app.opt.fonts['default'] = fn
         if app.opt.tile_theme in ('clam', 'clearlooks'):
-            root.wm_minsize(550, 360)
+            ##root.wm_minsize(550, 360)
             style.configure('TLabelframe', labeloutside=False,
                             labelmargins=(8, 0, 8, 0))
 
@@ -123,8 +136,12 @@ def init_root_window(root, app):
         root.option_add('*Entry.foreground', 'black', 60)
         root.option_add('*Listbox.background', 'white', 60)
         root.option_add('*Listbox.foreground', 'black', 60)
-        root.option_add('*Listbox*selectBackground', '#0a5f89', 60)
+        root.option_add('*Text.background', 'white', 60)
-        root.option_add('*Listbox*selectForeground', 'white', 60)
+        root.option_add('*Text.foreground', 'black', 60)
+        root.option_add('*selectForeground', 'white', 60)
+        root.option_add('*selectBackground', '#0a5f89', 60)
+        root.option_add('*inactiveSelectBackground', '#0a5f89', 60) # Tk-8.5
+        root.option_add('*selectBorderWidth', 0, 60)
         ##root.option_add('*borderWidth', '1', 50)
         ##root.option_add('*Button.borderWidth', '1', 50)
         root.option_add('*Scrollbar.elementBorderWidth', 1, 60)

pysollib/wizardutil.py

@@ -19,7 +19,7 @@
 ##
 ##---------------------------------------------------------------------------##
 
-import sys, os
+import os
 
 from gamedb import GI, loadGame
 from util import *