anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

+ improved Tile bindings, added theme selection in options-menu

Browse source 
- removed `--theme' command-line option, removed settings.TILE_THEME


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@98 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
skomoroh 2006-11-15 22:13:08 +00:00
parent 4cf2459482
commit 6178cddeae
13 changed files with 2042 additions and 1850 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -3,7 +3,7 @@
override LANG=C
override PYSOL_DEBUG=1
PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \
PYSOLLIB_FILES=pysollib/tk/*.py pysollib/tile/*.py pysollib/*.py \
pysollib/games/*.py pysollib/games/special/*.py \
pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py

2
po/games.pot
View file

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Tue Nov 14 16:43:27 2006\n"
"POT-Creation-Date: Wed Nov 15 13:22:51 2006\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2811
po/pysol.pot
View file

File diff suppressed because it is too large Load diff

2
po/ru_games.po
View file

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Tue Nov 14 16:43:27 2006\n"
"POT-Creation-Date: Wed Nov 15 13:22:51 2006\n"
"PO-Revision-Date: 2006-11-14 17:04+0300\n"
"Last-Translator: Скоморох <skomoroh@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n"

890
po/ru_pysol.po
View file

File diff suppressed because it is too large Load diff

11
pysollib/app.py
View file

@ -107,6 +107,9 @@ class Options:
self.shrink_face_down = True
self.shade_filled_stacks = True
self.demo_logo = True
self.tile_theme = 'default'
if os.name == 'nt':
self.tile_theme = 'winnative'
self.toolbar = 1 # 0 == hide, 1,2,3,4 == top, bottom, lef, right
##self.toolbar_style = 'default'
self.toolbar_style = 'crystal'
@ -1354,8 +1357,12 @@ Please select a %s type %s.
def getAllUserNames(self):
names = []
for n in self.stats.games_stats.keys():
if n is None: # demo
continue
if self.stats.games_stats[n]:
names.append(n)
if self.opt.player not in names:
names.append(self.opt.player)
names.sort()
return names
@ -1377,8 +1384,8 @@ Please select a %s type %s.
try:
loadGame(m.group(1), n)
except Exception, ex:
print "Error loading plugin " + n + ": " + str(ex)
sys.stdout.flush()
print >> sys.stderr, "Error loading plugin " + n + ": " + str(ex)
sys.stderr.flush()
sys.path = p

7
pysollib/main.py
View file

@ -87,7 +87,6 @@ def parse_option(argv):
"fg=", "foreground=",
"bg=", "background=",
"fn=", "font=",
"theme=",
"french-only",
"noplugins",
"nosound",
@ -103,7 +102,6 @@ def parse_option(argv):
"fg" : None,
"bg" : None,
"fn" : None,
"theme" : None,
"french-only" : False,
"noplugins" : False,
"nosound" : False,
@ -122,8 +120,6 @@ def parse_option(argv):
opts["bg"] = i[1]
elif i[0] in ("--fn", "--font"):
opts["fn"] = i[1]
elif i[0] == "--theme":
opts["theme"] = i[1]
elif i[0] == "--french-only":
opts["french-only"] = True
elif i[0] == "--noplugins":
@ -142,7 +138,6 @@ def parse_option(argv):
--fg --foreground=COLOR foreground color
--bg --background=COLOR background color
--fn --font=FONT default font
--theme=THEME specify theme (for Tile binding)
--sound-mod=MOD
--nosound disable sound support
--noplugins disable load plugins
@ -268,7 +263,7 @@ def pysol_init(app, args):
app.opt.sound_mode = 0
# init toolkit 2)
top.initToolkit(app, opts['fg'], opts['bg'], opts['fn'], opts['theme'])
top.initToolkit(app, opts['fg'], opts['bg'], opts['fn'])
# check games
if len(app.gdb.getGamesIdSortedByName()) == 0:

8
pysollib/settings.py
View file

@ -35,14 +35,6 @@ VERSION_TUPLE = (4, 82)
# toolkit
TOOLKIT = 'tk' # or 'gtk'
USE_TILE = 'auto' # or True or False
# name of tile's theme
# available values:
# 'default', 'alt', 'classic', 'clam', 'step', 'blue' (all)
# 'winnative', 'xpnative' (windows)
# 'aqua' (macosx)
TILE_THEME = 'default'
if os.name == 'nt':
TILE_THEME = 'winnative'
# sound
# available values:

42
pysollib/tile/menubar.py
View file

@ -51,13 +51,14 @@ from pysollib.actions import PysolMenubarActions
# toolkit imports
from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
from tkutil import bind, after_idle
from tkutil import bind, after_idle, load_theme
from selectgame import SelectGameDialog, SelectGameDialogWithPreview
from soundoptionsdialog import SoundOptionsDialog
from selectcardset import SelectCardsetDialogWithPreview
from selecttile import SelectTileDialogWithPreview
from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog
from tkwrap import MfxRadioMenuItem, MfxCheckMenuItem, StringVar
from tkwidget import MfxMessageDialog
#from toolbar import TOOLBAR_BUTTONS
from tkconst import TOOLBAR_BUTTONS
@ -263,6 +264,7 @@ class PysolMenubar(PysolMenubarActions):
mouse_undo = MfxCheckMenuItem(self),
negative_bottom = MfxCheckMenuItem(self),
pause = MfxCheckMenuItem(self),
theme = StringVar(),
toolbar_vars = {},
)
for w in TOOLBAR_BUTTONS:
@ -307,6 +309,7 @@ class PysolMenubar(PysolMenubarActions):
tkopt.mouse_type.set(opt.mouse_type)
tkopt.mouse_undo.set(opt.mouse_undo)
tkopt.negative_bottom.set(opt.negative_bottom)
tkopt.theme.set(opt.tile_theme)
for w in TOOLBAR_BUTTONS:
tkopt.toolbar_vars[w].set(opt.toolbar_vars[w])
@ -497,6 +500,8 @@ class PysolMenubar(PysolMenubarActions):
menu.add_command(label=n_("&Colors..."), command=self.mOptColors)
menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeouts)
menu.add_separator()
submenu = MfxMenu(menu, label=n_("T&heme"))
self.createThemesMenu(submenu)
submenu = MfxMenu(menu, label=n_("&Toolbar"))
createToolbarMenu(self, submenu)
submenu = MfxMenu(menu, label=n_("Stat&usbar"))
@ -1317,3 +1322,38 @@ class PysolMenubar(PysolMenubarActions):
if self._cancelDrag(break_pause=True): return
self.game.showStackDesc()
#
# Tlie
#
def mOptTheme(self, *event):
theme = self.tkopt.theme.get()
d = MfxMessageDialog(self.top, title=_("Change theme"),
text=_("""\
This settings will take effect
the next time you restart """)+PACKAGE,
bitmap="warning",
default=0, strings=(_("&OK"),))
self.app.opt.tile_theme = theme
def createThemesMenu(self, menu):
style = Tkinter.Style(self.top)
all_themes = style.theme_names()
#
tn = {
'default': 'Default',
'classic': 'Classic',
'alt': 'Revitalized',
'winnative': 'Windows native',
'xpnative': 'XP Native',
'aqua': 'Aqua',
}
for t in all_themes:
try:
n = tn[t]
except KeyError:
n = t.capitalize()
menu.add_radiobutton(label=n, variable=self.tkopt.theme,
value=t, command=self.mOptTheme)

77
pysollib/tile/playeroptionsdialog.py
View file

@ -52,45 +52,6 @@ from tkutil import bind
# //
# ************************************************************************/
class SelectUserNameDialog(MfxDialog):
def __init__(self, parent, title, usernames=[], **kw):
kw = self.initKw(kw)
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
top_frame, bottom_frame = self.createFrames(kw)
self.createBitmaps(top_frame, kw)
#
listbox = Tkinter.Listbox(top_frame)
listbox.pack(side='left', fill='both', expand=1)
scrollbar = Tkinter.Scrollbar(top_frame)
scrollbar.pack(side='right', fill='y')
listbox.configure(yscrollcommand=scrollbar.set)
scrollbar.configure(command=listbox.yview)
self.username = None
self.listbox = listbox
bind(listbox, '<<ListboxSelect>>', self.updateUserName)
#
for un in usernames:
listbox.insert('end', un)
focus = self.createButtons(bottom_frame, kw)
self.mainloop(focus, kw.timeout)
#if listbox.curselection():
# self.username = listbox.get(listbox.curselection())
def updateUserName(self, *args):
self.username = self.listbox.get(self.listbox.curselection())
def initKw(self, kw):
kw = KwStruct(kw,
strings=(_("&OK"), _("&Cancel")), default=0,
separatorwidth=0,
resizable=0,
)
return MfxDialog.initKw(self, kw)
class PlayerOptionsDialog(MfxDialog):
def __init__(self, parent, title, app, **kw):
kw = self.initKw(kw)
@ -112,13 +73,13 @@ class PlayerOptionsDialog(MfxDialog):
#justify='left', anchor='w',
takefocus=0)
widget.grid(row=0, column=0, columnspan=2, sticky='ew', padx=0, pady=5)
#
w = kw.get("e_width", 30) # width in characters
self.player_var = Tkinter.Entry(frame, exportselection=1, width=w)
self.player_var.insert(0, app.opt.player)
names = self.app.getAllUserNames()
self.player_var = Tkinter.Combobox(frame, width=w, values=tuple(names))
self.player_var.current(names.index(app.opt.player))
self.player_var.grid(row=1, column=0, sticky='ew', padx=0, pady=5)
widget = Tkinter.Button(frame, text=_('Choose...'),
command=self.selectUserName)
widget.grid(row=1, column=1, padx=5, pady=5)
#
widget = Tkinter.Checkbutton(frame, variable=self.confirm_var,
anchor='w', text=_("Confirm quit"))
widget.grid(row=2, column=0, columnspan=2, sticky='ew', padx=0, pady=5)
@ -139,13 +100,6 @@ class PlayerOptionsDialog(MfxDialog):
focus = self.createButtons(bottom_frame, kw)
self.mainloop(focus, kw.timeout)
def selectUserName(self, *args):
names = self.app.getAllUserNames()
d = SelectUserNameDialog(self.top, _("Select name"), names)
if d.status == 0 and d.button == 0 and d.username:
self.player_var.delete(0, 'end')
self.player_var.insert(0, d.username)
def mDone(self, button):
self.button = button
self.player = self.player_var.get()
@ -161,24 +115,3 @@ class PlayerOptionsDialog(MfxDialog):
)
return MfxDialog.initKw(self, kw)
# /***********************************************************************
# //
# ************************************************************************/
def playeroptionsdialog_main(args):
from tkutil import wm_withdraw
opt = Struct(player="Test", update_player_stats=1)
app = Struct(opt=opt)
tk = Tkinter.Tk()
wm_withdraw(tk)
tk.update()
d = PlayerOptionsDialog(tk, "Player options", app)
print d.status, d.button, ":", d.player, d.update_stats
return 0
if __name__ == "__main__":
import sys
sys.exit(playeroptionsdialog_main(sys.argv))

26
pysollib/tile/tkutil.py
View file

@ -52,7 +52,8 @@ __all__ = ['wm_withdraw',
#'fillImage',
'createImage',
'get_text_width',
'load_theme',
#'init_tile',
#'load_theme',
]
# imports
@ -179,9 +180,8 @@ def make_help_toplevel(app, title=None):
# Create an independent Toplevel window.
parent = app.top
window = Tkinter.Tk(className=PACKAGE)
from pysollib.settings import TILE_THEME
if TILE_THEME:
load_theme(app, window, TILE_THEME)
theme = app.opt.tile_theme
init_tile(app, window, theme)
font = parent.option_get('font', '')
if font:
window.option_add('*font', font)
@ -413,15 +413,12 @@ def get_text_width(text, font, root=None):
# //
# ************************************************************************/
def load_theme(app, top, theme):
#
def init_tile(app, top, theme):
if os.name == 'posix':
f = os.path.join(app.dataloader.dir, 'tcl', 'menu8.4.tcl')
if os.path.exists(f):
top.tk.call('source', f)
#
top.tk.call("package", "require", "tile")
style = Tkinter.Style(top)
# load available themes
d = os.path.join(app.dataloader.dir, 'themes')
if os.path.isdir(d):
@ -434,7 +431,12 @@ def load_theme(app, top, theme):
except:
traceback.print_exc()
pass
#
load_theme(app, top, theme)
def load_theme(app, top, theme):
# set theme
style = Tkinter.Style(top)
all_themes = style.theme_names()
if theme not in all_themes:
print >> sys.stderr, 'WARNING: invalid theme name:', theme
@ -444,7 +446,13 @@ def load_theme(app, top, theme):
if theme not in ('winnative', 'xpnative'):
color = style.lookup('.', 'background')
if color:
top.tk_setPalette(color)
try:
##top.tk.call("tk_setPalette", color)
top.tk_setPalette(color)
##top.option_add('*background', color)
except:
traceback.print_exc()
pass
color = style.lookup('.', 'background', 'active')
if color:
top.option_add('*Menu.activeBackground', color)

12
pysollib/tile/tkwrap.py
View file

@ -48,7 +48,7 @@ from tkFont import Font
# PySol imports
from pysollib.mfxutil import destruct, Struct
from pysollib.settings import PACKAGE, VERSION
from tkutil import after_idle, load_theme, wm_set_icon
from tkutil import after_idle, init_tile, wm_set_icon
from tkconst import EVENT_HANDLED, EVENT_PROPAGATE
# /***********************************************************************
@ -98,7 +98,8 @@ class MfxRoot(Tkinter.Tk):
def connectApp(self, app):
self.app = app
def initToolkit(self, app, fg=None, bg=None, font=None, theme=None):
def initToolkit(self, app, fg=None, bg=None, font=None):
theme = app.opt.tile_theme
sw, sh, sd = self.winfo_screenwidth(), self.winfo_screenheight(), self.winfo_screendepth()
self.wm_group(self)
self.wm_title(PACKAGE + ' ' + VERSION)
@ -145,11 +146,8 @@ class MfxRoot(Tkinter.Tk):
app.opt.fonts['default'] = None
# theme
import pysollib.settings
if theme:
pysollib.settings.TILE_THEME = theme
try:
load_theme(app, self, pysollib.settings.TILE_THEME)
init_tile(app, self, theme)
except Exception, err:
print >> sys.stderr, 'ERROR: set theme:', err
##self.option_add('*Toolbar.relief', 'groove')
@ -160,8 +158,6 @@ class MfxRoot(Tkinter.Tk):
##self.option_add('*Toolbar*takeFocus', 0)
# sometimes an update() is needed under Windows, whereas
# under Unix an update_idletasks() would be enough...
def busyUpdate(self):

2
pysollib/tile/toolbar.py
View file

@ -224,7 +224,7 @@ class PysolToolbar(PysolToolbarActions):
self.dir = dir
self.size = size
self.compound = compound
self.orient=Tkinter.HORIZONTAL
self.orient='horizontal'
self.label_padx = 4
self.label_pady = 4
self.button_pad = 2