From 0c3f1915daa50d3247461573c250bd3ecbed2eba Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 9 Jun 2006 22:39:18 +0000 Subject: [PATCH] - added check of os.environ['LANG'] - fixed `win32_gethomedir' - minor changes of widgets style - other minor fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@5 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 2 ++ pysol | 2 +- pysollib/app.py | 2 +- pysollib/mfxutil.py | 3 +++ pysollib/tk/statusbar.py | 27 ++++++++++++--------------- pysollib/tk/tkwidget.py | 6 ++++-- pysollib/tk/toolbar.py | 17 ++++++++++------- scripts/build.bat | 2 +- scripts/create_iss.py | 4 +++- 9 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index baae7118..44afc81e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ # Makefile for PySolFC +override LANG=C + PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ pysollib/games/*.py pysollib/games/special/*.py \ pysollib/games/contrib/*.py pysollib/games/ultra/*.py \ diff --git a/pysol b/pysol index b841ac68..77070ee1 100755 --- a/pysol +++ b/pysol @@ -38,7 +38,7 @@ import sys, os -if os.name == 'nt': +if os.name == 'nt' and not os.environ.has_key('LANG'): try: import locale l = locale.getdefaultlocale() diff --git a/pysollib/app.py b/pysollib/app.py index 5ea9c0f6..6b8bdabd 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -137,7 +137,7 @@ class Options: if os.name == 'posix': self.fonts["sans"] = ("helvetica", 12) if os.name == 'nt': - self.fonts["sans"] = ("times new roman", 14) + self.fonts["sans"] = ("times new roman", 12) self.fonts["fixed"] = ("courier new", 10) # colors self.table_color = "#008200" diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index 412cbca3..94316078 100644 --- a/pysollib/mfxutil.py +++ b/pysollib/mfxutil.py @@ -204,6 +204,9 @@ def win32_getprefdir(package): def win32_gethomedir(): # %USERPROFILE%, %APPDATA% + hd = os.environ.get('APPDATA') + if hd: + return hd hd = os.path.expanduser('~') if hd == '~': # win9x return os.path.abspath('/') diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index e87947ac..7f0664cf 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -59,26 +59,24 @@ class MfxStatusbar: self._row = row self._column = column self._columnspan = columnspan - self.padx = 1 - self.pady = 2 # + self.padx = 1 self.frame = Tkinter.Frame(self.top, bd=1) self.frame.grid(row=self._row, column=self._column, columnspan=self._columnspan, sticky='ew', - padx=self.padx, pady=self.pady) + padx=1, pady=1) #if os.name == "mac": # Tkinter.Label(self.frame, width=2).pack(side='right') + if os.name == 'nt': + self.frame.config(relief='raised') + self.padx = 0 # util - def _createLabel(self, name, - text="", relief='sunken', - side='left', fill='none', - padx=-1, expand=0, width=0, + def _createLabel(self, name, side='left', + fill='none', expand=0, width=0, tooltip=None): - if padx < 0: padx = self.padx - label = Tkinter.Label(self.frame, text=text, - width=width, relief=relief, bd=1) - label.pack(side=side, fill=fill, padx=padx, expand=expand) + label = Tkinter.Label(self.frame, width=width, relief='sunken', bd=1) + label.pack(side=side, fill=fill, padx=self.padx, expand=expand) setattr(self, name + "_label", label) self._widgets.append(label) if tooltip: @@ -150,15 +148,14 @@ class HelpStatusbar(MfxStatusbar): def __init__(self, top): MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) l = self._createLabel("info", fill='both', expand=1) - l.config(text="", justify="left", anchor='w', padx=8) + l.config(justify="left", anchor='w', padx=8) class HtmlStatusbar(MfxStatusbar): def __init__(self, top, row, column, columnspan): - MfxStatusbar.__init__(self, top, - row=row, column=column, columnspan=columnspan) + MfxStatusbar.__init__(self, top, row=row, column=column, columnspan=columnspan) l = self._createLabel("url", fill='both', expand=1) - l.config(text="", justify="left", anchor='w', padx=8) + l.config(justify="left", anchor='w', padx=8) # /*********************************************************************** diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 80a51ef8..ca288979 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -141,8 +141,9 @@ class MfxDialog: # ex. _ToplevelDialog raise SystemExit def altKeyEvent(self, event): - key = event.char.lower() + key = event.char key = unicode(key, 'utf-8') + key = key.lower() button = self.accel_keys.get(key) if not button is None: self.mDone(button) @@ -197,7 +198,8 @@ class MfxDialog: # ex. _ToplevelDialog s = s[0] if s: ##s = re.sub(r"[\s\.\,]", "", s) - s = s.replace('...', '.') + #if os.name == 'posix': + # s = s.replace('...', '.') s = s.replace('&', '') max_len = max(max_len, len(s)) ##print s, len(s) diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index b0e48703..f717603a 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -220,10 +220,9 @@ class PysolToolbar(PysolToolbarActions): # (see also setRelief) if os.name == 'posix': #self.frame.config(bd=0, highlightthickness=1) - relief = self.button_relief == 'flat' and 'raised' or 'flat' - self.frame.config(bd=1, relief=relief, highlightthickness=0) + self.frame.config(bd=1, relief=self.frame_relief, highlightthickness=0) elif os.name == "nt": - self.frame.config(bd=2, relief="groove", padx=2, pady=2) + self.frame.config(bd=2, relief=self.frame_relief, padx=2, pady=2) #self._createSeparator(width=4, side=Tkinter.LEFT, relief=Tkinter.FLAT) #self._createSeparator(width=4, side=Tkinter.RIGHT, relief=Tkinter.FLAT) else: @@ -267,9 +266,16 @@ class PysolToolbar(PysolToolbarActions): relief = 'flat' self.button_relief = relief if relief == 'raised': + self.frame_relief = 'flat' self.separator_relief = 'flat' + if os.name == 'nt': + self.frame_relief = 'groove' else: + self.frame_relief = 'raised' self.separator_relief = 'sunken' #'raised' + if os.name == 'nt': + self.frame_relief = 'groove' + self.separator_relief = 'groove' return relief # util @@ -465,10 +471,7 @@ class PysolToolbar(PysolToolbarActions): if self.button_relief == relief: return False self._setRelief(relief) - if os.name == 'posix': - relief = self.button_relief == 'flat' and 'raised' or 'flat' - self.frame.config(relief=relief) - #self.frame.config(relief=self.separator_relief) + self.frame.config(relief=self.frame_relief) for w in self._widgets: if isinstance(w, ToolbarButton): w.config(relief=self.button_relief) diff --git a/scripts/build.bat b/scripts/build.bat index b5c9c0de..3b1f4879 100755 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -4,7 +4,7 @@ cd .. rm -rf dist mkdir dist cp -r locale dist -cp freecell-solver\freecell-solver-2.8.6-bin\fc-solve.exe dist +cp fc-solve.exe dist python setup.py py2exe python scripts\create_iss.py "d:\Program Files\Inno Setup 5\ISCC.exe" setup.iss diff --git a/scripts/create_iss.py b/scripts/create_iss.py index 80fbcbf0..52d8db50 100755 --- a/scripts/create_iss.py +++ b/scripts/create_iss.py @@ -1,7 +1,6 @@ #!/usr/bin/env python prog_name = 'PySol Fan Club edition' -prog_version = '0.9.0' import os @@ -12,6 +11,9 @@ for root, dirs, files in os.walk('dist'): files_list.append(root) dirs_list.append(root) +execfile(os.path.join('pysollib', 'version.py')) +prog_version = FC_VERSION + out = open('setup.iss', 'w') print >> out, '''