From c8573e7ac6c645f7209bd30dd1d18c8493ec0fbe Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 7 Dec 2012 16:42:53 +0200 Subject: [PATCH] Some fixes. --- pysollib/actions.py | 30 +++++----- pysollib/app.py | 22 +++---- pysollib/game.py | 16 ++--- pysollib/help.py | 8 +-- pysollib/images.py | 8 +-- pysollib/layout.py | 2 +- pysollib/main.py | 10 ++-- pysollib/options.py | 16 ++--- pysollib/pysoltk.py | 138 ++++++++++++++++++++++---------------------- pysollib/stack.py | 16 ++--- 10 files changed, 133 insertions(+), 133 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index 056c037d..d8ac03b9 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -37,23 +37,23 @@ from gamedb import GI # stats imports from stats import FileStatsFormatter -from pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog -from pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog -from pysoltk import Status_StatsDialog, Top_StatsDialog -from pysoltk import ProgressionDialog -from pysoltk import GameInfoDialog +from pysollib.pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog +from pysollib.pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog +from pysollib.pysoltk import Status_StatsDialog, Top_StatsDialog +from pysollib.pysoltk import ProgressionDialog +from pysollib.pysoltk import GameInfoDialog # toolkit imports -from pysoltk import MfxMessageDialog, MfxSimpleEntry -from pysoltk import MfxExceptionDialog -from pysoltk import PlayerOptionsDialog -from pysoltk import TimeoutsDialog -from pysoltk import ColorsDialog -from pysoltk import FontsDialog -from pysoltk import EditTextDialog -from pysoltk import create_find_card_dialog -from pysoltk import create_solver_dialog -from pysoltk import PysolMenubarTk, PysolToolbarTk +from pysollib.pysoltk import MfxMessageDialog, MfxSimpleEntry +from pysollib.pysoltk import MfxExceptionDialog +from pysollib.pysoltk import PlayerOptionsDialog +from pysollib.pysoltk import TimeoutsDialog +from pysollib.pysoltk import ColorsDialog +from pysollib.pysoltk import FontsDialog +from pysollib.pysoltk import EditTextDialog +from pysollib.pysoltk import create_find_card_dialog +from pysollib.pysoltk import create_solver_dialog +from pysollib.pysoltk import PysolMenubarTk, PysolToolbarTk from help import help_about, help_html diff --git a/pysollib/app.py b/pysollib/app.py index 5cae2af3..3ed27699 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -38,7 +38,7 @@ from resource import CSI, CardsetConfig, Cardset, CardsetManager from resource import Tile, TileManager from resource import Sample, SampleManager from resource import Music, MusicManager -from images import Images, SubsampledImages +from pysollib.images import Images, SubsampledImages from pysolrandom import PysolRandom from gamedb import GI, GAME_DB, loadGame from options import Options @@ -47,16 +47,16 @@ from settings import DEBUG from winsystems import TkSettings # Toolkit imports -from pysoltk import wm_withdraw, loadImage -from pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog -from pysoltk import TclError, MfxScrolledCanvas -from pysoltk import PysolProgressBar -from pysoltk import PysolStatusbar, HelpStatusbar -from pysoltk import SelectCardsetDialogWithPreview -from pysoltk import SelectDialogTreeData -from pysoltk import HTMLViewer -from pysoltk import destroy_find_card_dialog -from pysoltk import destroy_solver_dialog +from pysollib.pysoltk import wm_withdraw, loadImage +from pysollib.pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog +from pysollib.pysoltk import TclError, MfxScrolledCanvas +from pysollib.pysoltk import PysolProgressBar +from pysollib.pysoltk import PysolStatusbar, HelpStatusbar +from pysollib.pysoltk import SelectCardsetDialogWithPreview +from pysollib.pysoltk import SelectDialogTreeData +from pysollib.pysoltk import HTMLViewer +from pysollib.pysoltk import destroy_find_card_dialog +from pysollib.pysoltk import destroy_solver_dialog from actions import PysolMenubar from actions import PysolToolbar diff --git a/pysollib/game.py b/pysollib/game.py index adf7e38b..ce653077 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -40,14 +40,14 @@ from settings import VERSION, VERSION_TUPLE from settings import DEBUG from gamedb import GI from pysolrandom import PysolRandom, LCRandom31 -from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import CURSOR_WATCH -from pysoltk import bind, wm_map -from pysoltk import after, after_idle, after_cancel -from pysoltk import MfxMessageDialog, MfxExceptionDialog -from pysoltk import MfxCanvasText, MfxCanvasLine, MfxCanvasRectangle -from pysoltk import Card -from pysoltk import reset_solver_dialog +from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE +from pysollib.pysoltk import CURSOR_WATCH +from pysollib.pysoltk import bind, wm_map +from pysollib.pysoltk import after, after_idle, after_cancel +from pysollib.pysoltk import MfxMessageDialog, MfxExceptionDialog +from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine, MfxCanvasRectangle +from pysollib.pysoltk import Card +from pysollib.pysoltk import reset_solver_dialog from move import AMoveMove, AFlipMove, AFlipAndMoveMove from move import ASingleFlipMove, ATurnStackMove from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove diff --git a/pysollib/help.py b/pysollib/help.py index 2e7c11d6..540721b2 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -26,10 +26,10 @@ # PySol imports from settings import TITLE, PACKAGE_URL, TOOLKIT, VERSION -from pysoltk import make_help_toplevel -from pysoltk import MfxMessageDialog -from pysoltk import PysolAboutDialog -from pysoltk import HTMLViewer +from pysollib.pysoltk import make_help_toplevel +from pysollib.pysoltk import MfxMessageDialog +from pysollib.pysoltk import PysolAboutDialog +from pysollib.pysoltk import HTMLViewer # ************************************************************************ diff --git a/pysollib/images.py b/pysollib/images.py index 18547d61..622ac9bc 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -27,12 +27,12 @@ import os import traceback # PySol imports -from resource import CSI -from settings import TOOLKIT -from mfxutil import Image, ImageTk, USE_PIL +from pysollib.resource import CSI +from pysollib.settings import TOOLKIT +from pysollib.mfxutil import Image, ImageTk, USE_PIL # Toolkit imports -from pysoltk import loadImage, copyImage, createImage, shadowImage, createBottom, resizeBottom +from pysollib.pysoltk import loadImage, copyImage, createImage, shadowImage, createBottom, resizeBottom # ************************************************************************ diff --git a/pysollib/layout.py b/pysollib/layout.py index 5347c058..490e56c6 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -26,7 +26,7 @@ # PySol imports from mfxutil import Struct -from pysoltk import MfxCanvasText +from pysollib.pysoltk import MfxCanvasText from resource import CSI diff --git a/pysollib/main.py b/pysollib/main.py index 943f611e..23dc30b0 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -31,7 +31,7 @@ import getopt from util import DataLoader from mfxutil import print_err from resource import Tile -from app import Application +from pysollib.app import Application from gamedb import GAME_DB from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient from pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient @@ -39,10 +39,10 @@ from settings import TITLE, SOUND_MOD from winsystems import init_root_window # Toolkit imports -from pysoltk import loadImage -from pysoltk import MfxMessageDialog -from pysoltk import MfxRoot -from pysoltk import PysolProgressBar +from pysollib.pysoltk import loadImage +from pysollib.pysoltk import MfxMessageDialog +from pysollib.pysoltk import MfxRoot +from pysollib.pysoltk import PysolProgressBar # ************************************************************************ diff --git a/pysollib/options.py b/pysollib/options.py index 2cf0e102..4c426114 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -26,13 +26,13 @@ import sys, os import traceback # PySol imports -from mfxutil import print_err -from resource import CSI -from configobj import configobj, validate -import settings +from pysollib.mfxutil import print_err +from pysollib.resource import CSI +from pysollib.configobj import configobj, validate +import pysollib.settings # Toolkit imports -from pysoltk import TOOLBAR_BUTTONS +from pysollib.pysoltk import TOOLBAR_BUTTONS # ************************************************************************ @@ -248,7 +248,7 @@ class Options: self._config = None # configobj.ConfigObj instance self._config_encoding = 'utf-8' - self.version_tuple = settings.VERSION_TUPLE # XXX + self.version_tuple = pysollib.settings.VERSION_TUPLE # XXX self.saved = 0 # XXX # options menu: self.player = _("Unknown") @@ -403,7 +403,7 @@ class Options: ] def setDefaults(self, top=None): - WIN_SYSTEM = settings.WIN_SYSTEM + WIN_SYSTEM = pysollib.settings.WIN_SYSTEM # toolbar #if WIN_SYSTEM == 'win32': # self.toolbar_style = 'crystal' @@ -607,7 +607,7 @@ class Options: elif val is not None: setattr(self, key, val) - settings.TRANSLATE_GAME_NAMES = self.translate_game_names + pysollib.settings.TRANSLATE_GAME_NAMES = self.translate_game_names recent_gameid = self._getOption('general', 'recent_gameid', 'list') if recent_gameid is not None: diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index 68940ea5..3d9d051c 100644 --- a/pysollib/pysoltk.py +++ b/pysollib/pysoltk.py @@ -21,79 +21,79 @@ ## ##---------------------------------------------------------------------------## -from settings import TOOLKIT, USE_TILE +from pysollib.settings import TOOLKIT, USE_TILE if TOOLKIT == 'tk': if USE_TILE: - from tile.tkconst import * - from tile.tkutil import * - from tile.tkcanvas import * - from tile.tkwrap import * - from tile.tkwidget import * - from tile.tkhtml import * - from tile.edittextdialog import * - from tile.tkstats import * - from tile.playeroptionsdialog import * - from tile.soundoptionsdialog import * - from tile.timeoutsdialog import * - from tile.colorsdialog import * - from tile.fontsdialog import * - from tile.findcarddialog import * - from tile.solverdialog import * - from tile.gameinfodialog import * - from tile.toolbar import * - from tile.statusbar import * - from tile.progressbar import * - from tile.menubar import * - from tile.card import * - from tile.selectcardset import * - from tile.selecttree import * + from pysollib.tile.tkconst import * + from pysollib.tile.tkutil import * + from pysollib.tile.tkcanvas import * + from pysollib.tile.tkwrap import * + from pysollib.tile.tkwidget import * + from pysollib.tile.tkhtml import * + from pysollib.tile.edittextdialog import * + from pysollib.tile.tkstats import * + from pysollib.tile.playeroptionsdialog import * + from pysollib.tile.soundoptionsdialog import * + from pysollib.tile.timeoutsdialog import * + from pysollib.tile.colorsdialog import * + from pysollib.tile.fontsdialog import * + from pysollib.tile.findcarddialog import * + from pysollib.tile.solverdialog import * + from pysollib.tile.gameinfodialog import * + from pysollib.tile.toolbar import * + from pysollib.tile.statusbar import * + from pysollib.tile.progressbar import * + from pysollib.tile.menubar import * + from pysollib.tile.card import * + from pysollib.tile.selectcardset import * + from pysollib.tile.selecttree import * else: - from tk.tkconst import * - from tk.tkutil import * - from tk.tkcanvas import * - from tk.tkwrap import * - from tk.tkwidget import * - from tk.tkhtml import * - from tk.edittextdialog import * - from tk.tkstats import * - from tk.playeroptionsdialog import * - from tk.soundoptionsdialog import * - from tk.timeoutsdialog import * - from tk.colorsdialog import * - from tk.fontsdialog import * - from tk.findcarddialog import * - from tk.solverdialog import * - from tk.gameinfodialog import * - from tk.toolbar import * - from tk.statusbar import * - from tk.progressbar import * - from tk.menubar import * - from tk.card import * - from tk.selectcardset import * - from tk.selecttree import * + from pysollib.tk.tkconst import * + from pysollib.tk.tkutil import * + from pysollib.tk.tkcanvas import * + from pysollib.tk.tkwrap import * + from pysollib.tk.tkwidget import * + from pysollib.tk.tkhtml import * + from pysollib.tk.edittextdialog import * + from pysollib.tk.tkstats import * + from pysollib.tk.playeroptionsdialog import * + from pysollib.tk.soundoptionsdialog import * + from pysollib.tk.timeoutsdialog import * + from pysollib.tk.colorsdialog import * + from pysollib.tk.fontsdialog import * + from pysollib.tk.findcarddialog import * + from pysollib.tk.solverdialog import * + from pysollib.tk.gameinfodialog import * + from pysollib.tk.toolbar import * + from pysollib.tk.statusbar import * + from pysollib.tk.progressbar import * + from pysollib.tk.menubar import * + from pysollib.tk.card import * + from pysollib.tk.selectcardset import * + from pysollib.tk.selecttree import * else: # gtk - from pysolgtk.tkconst import * - from pysolgtk.tkutil import * - from pysolgtk.tkcanvas import * - from pysolgtk.tkwrap import * - from pysolgtk.tkwidget import * - from pysolgtk.tkhtml import * - from pysolgtk.edittextdialog import * - from pysolgtk.tkstats import * - from pysolgtk.playeroptionsdialog import * - from pysolgtk.soundoptionsdialog import * - from pysolgtk.timeoutsdialog import * - from pysolgtk.colorsdialog import * - from pysolgtk.fontsdialog import * - from pysolgtk.findcarddialog import * - from pysolgtk.solverdialog import * - from pysolgtk.gameinfodialog import * - from pysolgtk.toolbar import * - from pysolgtk.statusbar import * - from pysolgtk.progressbar import * - from pysolgtk.menubar import * - from pysolgtk.card import * - from pysolgtk.selectcardset import * + from pysollib.pysolgtk.tkconst import * + from pysollib.pysolgtk.tkutil import * + from pysollib.pysolgtk.tkcanvas import * + from pysollib.pysolgtk.tkwrap import * + from pysollib.pysolgtk.tkwidget import * + from pysollib.pysolgtk.tkhtml import * + from pysollib.pysolgtk.edittextdialog import * + from pysollib.pysolgtk.tkstats import * + from pysollib.pysolgtk.playeroptionsdialog import * + from pysollib.pysolgtk.soundoptionsdialog import * + from pysollib.pysolgtk.timeoutsdialog import * + from pysollib.pysolgtk.colorsdialog import * + from pysollib.pysolgtk.fontsdialog import * + from pysollib.pysolgtk.findcarddialog import * + from pysollib.pysolgtk.solverdialog import * + from pysollib.pysolgtk.gameinfodialog import * + from pysollib.pysolgtk.toolbar import * + from pysollib.pysolgtk.statusbar import * + from pysollib.pysolgtk.progressbar import * + from pysollib.pysolgtk.menubar import * + from pysollib.pysolgtk.card import * + from pysollib.pysolgtk.selectcardset import * diff --git a/pysollib/stack.py b/pysollib/stack.py index f11aac82..e1c68d92 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -100,14 +100,14 @@ from mfxutil import Struct, kwdefault, SubclassResponsibility from mfxutil import Image, ImageTk, USE_PIL from util import ACE, KING from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK -from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import CURSOR_DRAG, CURSOR_DOWN_ARROW -from pysoltk import ANCHOR_NW, ANCHOR_SE -from pysoltk import bind, unbind_destroy -from pysoltk import after, after_idle, after_cancel -from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine -from pysoltk import get_text_width -from pysoltk import markImage +from pysollib.pysoltk import EVENT_HANDLED, EVENT_PROPAGATE +from pysollib.pysoltk import CURSOR_DRAG, CURSOR_DOWN_ARROW +from pysollib.pysoltk import ANCHOR_NW, ANCHOR_SE +from pysollib.pysoltk import bind, unbind_destroy +from pysollib.pysoltk import after, after_idle, after_cancel +from pysollib.pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine +from pysollib.pysoltk import get_text_width +from pysollib.pysoltk import markImage from settings import TOOLKIT from settings import DEBUG