mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
* some bugs fixes
git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@116 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
parent
5c23217375
commit
1a7541a14c
8 changed files with 15 additions and 18 deletions
|
@ -5,7 +5,8 @@
|
|||
##
|
||||
include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README
|
||||
#recursive-include pysollib *.py
|
||||
include pysollib/*.py pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py
|
||||
include pysollib/*.py pysollib/macosx/*.py
|
||||
include pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py
|
||||
include pysollib/games/*.py pysollib/games/special/*.py
|
||||
include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py
|
||||
include data/tcl/*.tcl
|
||||
|
|
|
@ -110,9 +110,11 @@ class Options:
|
|||
self.tile_theme = 'default'
|
||||
if WIN_SYSTEM == 'win32':
|
||||
self.tile_theme = 'winnative'
|
||||
if sys.getwindowsversion() >= (5, 1): # xp
|
||||
self.tile_theme = 'xpnative'
|
||||
elif WIN_SYSTEM == 'x11':
|
||||
self.tile_theme = 'step'
|
||||
else: # aqua
|
||||
elif WIN_SYSTEM == 'aqua':
|
||||
self.tile_theme = 'aqua'
|
||||
self.toolbar = 1 # 0 == hide, 1,2,3,4 == top, bottom, lef, right
|
||||
##self.toolbar_style = 'default'
|
||||
|
|
|
@ -1328,12 +1328,12 @@ the next time you restart """)+PACKAGE,
|
|||
all_themes.sort()
|
||||
#
|
||||
tn = {
|
||||
'default': 'Default',
|
||||
'classic': 'Classic',
|
||||
'alt': 'Revitalized',
|
||||
'winnative': 'Windows native',
|
||||
'xpnative': 'XP Native',
|
||||
'aqua': 'Aqua',
|
||||
'default': _('Default'),
|
||||
'classic': _('Classic'),
|
||||
'alt': _('Revitalized'),
|
||||
'winnative': _('Windows native'),
|
||||
'xpnative': _('XP Native'),
|
||||
'aqua': _('Aqua'),
|
||||
}
|
||||
for t in all_themes:
|
||||
try:
|
||||
|
|
|
@ -148,7 +148,7 @@ def makeToplevel(parent, title=None):
|
|||
window = Tkinter.Toplevel(parent) #, class_=PACKAGE)
|
||||
##window.wm_group(parent)
|
||||
##window.wm_command("")
|
||||
if os.name == "posix":
|
||||
if WIN_SYSTEM == "x11":
|
||||
window.wm_command("/bin/true")
|
||||
##window.wm_protocol("WM_SAVE_YOURSELF", None)
|
||||
if title:
|
||||
|
|
|
@ -443,17 +443,11 @@ class MfxScrolledCanvas:
|
|||
self.frame.grid_rowconfigure(0, weight=1)
|
||||
self.frame.grid_columnconfigure(0, weight=1)
|
||||
if hbar:
|
||||
if hbar == 3:
|
||||
w = 21
|
||||
self.frame.grid_rowconfigure(1, minsize=w)
|
||||
self.createHbar()
|
||||
if not vbar:
|
||||
bind(self.hbar, "<Map>", self._mapBar)
|
||||
self.bindHbar()
|
||||
if vbar:
|
||||
if vbar == 3:
|
||||
w = 21
|
||||
self.frame.grid_columnconfigure(1, minsize=w)
|
||||
self.createVbar()
|
||||
bind(self.vbar, "<Map>", self._mapBar)
|
||||
self.bindVbar()
|
||||
|
@ -567,7 +561,6 @@ class MfxScrolledCanvas:
|
|||
# don't work on Linux
|
||||
#bind(w, '<MouseWheel>', self.mouse_wheel)
|
||||
|
||||
|
||||
def mouse_wheel(self, *args):
|
||||
print 'MfxScrolledCanvas.mouse_wheel', args
|
||||
|
||||
|
|
|
@ -146,7 +146,7 @@ def makeToplevel(parent, title=None):
|
|||
window = Tkinter.Toplevel(parent) #, class_=PACKAGE)
|
||||
##window.wm_group(parent)
|
||||
##window.wm_command("")
|
||||
if os.name == "posix":
|
||||
if WIN_SYSTEM == "x11":
|
||||
window.wm_command("/bin/true")
|
||||
##window.wm_protocol("WM_SAVE_YOURSELF", None)
|
||||
if title:
|
||||
|
|
|
@ -47,7 +47,7 @@ from tkFont import Font
|
|||
|
||||
# PySol imports
|
||||
from pysollib.mfxutil import destruct, Struct
|
||||
from pysollib.settings import PACKAGE, VERSION
|
||||
from pysollib.settings import PACKAGE, VERSION, WIN_SYSTEM
|
||||
from pysollib.macosx.appSupport import setupApp
|
||||
from tkutil import after_idle, wm_set_icon
|
||||
from tkconst import EVENT_HANDLED, EVENT_PROPAGATE
|
||||
|
|
1
setup.py
1
setup.py
|
@ -65,6 +65,7 @@ kw = {
|
|||
'license' : 'GPL',
|
||||
'scripts' : ['pysol'],
|
||||
'packages' : ['pysollib',
|
||||
'pysollib.macosx',
|
||||
'pysollib.tk',
|
||||
'pysollib.tile',
|
||||
'pysollib.pysolgtk',
|
||||
|
|
Loading…
Add table
Reference in a new issue