Correct to the right import path.

pysollib/pysoltk.py

@@ -24,8 +24,8 @@
 from pysollib.settings import TOOLKIT, USE_TILE
 
 if TOOLKIT == 'tk':
+    from pysollib.ui.tktile.tkconst import *
     if USE_TILE:
-        from pysollib.tile.tkconst import *
         from pysollib.tile.tkutil import *
         from pysollib.tile.tkcanvas import *
         from pysollib.tile.tkwrap import *
@@ -49,7 +49,6 @@ if TOOLKIT == 'tk':
         from pysollib.tile.selectcardset import *
         from pysollib.tile.selecttree import *
     else:
-        from pysollib.tk.tkconst import *
         from pysollib.tk.tkutil import *
         from pysollib.tk.tkcanvas import *
         from pysollib.tk.tkwrap import *

pysollib/tile/menubar.py

@@ -42,7 +42,7 @@ from pysollib.settings import DEBUG
 from pysollib.gamedb import GI
 
 # toolkit imports
-from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
 from tkutil import bind, after_idle
 from tkwidget import MfxMessageDialog
 from selectgame import SelectGameDialog, SelectGameDialogWithPreview
@@ -52,7 +52,7 @@ from selecttile import SelectTileDialogWithPreview
 from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog
 from solverdialog import connect_game_solver_dialog
 
-from tkconst import TOOLBAR_BUTTONS
+from pysollib.ui.tktile.tkconst import TOOLBAR_BUTTONS
 
 from pysollib.ui.tktile.menubar import createToolbarMenu, MfxMenubar, MfxMenu
 # ************************************************************************

pysollib/tile/progressbar.py

@@ -28,7 +28,7 @@ import Tkinter
 import ttk
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkutil import makeToplevel, setTransient
 
 

pysollib/tile/solverdialog.py

@@ -39,7 +39,7 @@ from pysollib.settings import TITLE
 from pysollib.mfxutil import KwStruct
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxDialog
 from tkwidget import PysolCombo
 

pysollib/tile/soundoptionsdialog.py

@@ -35,7 +35,7 @@ from pysollib.settings import TITLE
 from pysollib.pysolaudio import pysolsoundserver
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxDialog, MfxMessageDialog
 from tkwidget import PysolScale
 

pysollib/tile/tkwrap.py

@@ -29,7 +29,7 @@ import Tkinter
 TclError = Tkinter.TclError
 
 # PySol imports
-from tkconst import EVENT_PROPAGATE
+from pysollib.ui.tktile.tkconst import EVENT_PROPAGATE
 
 
 # ************************************************************************

pysollib/tile/toolbar.py

@@ -37,7 +37,7 @@ from pysollib.settings import TITLE, WIN_SYSTEM
 from pysollib.winsystems import TkSettings
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxTooltip
 from menubar import createToolbarMenu, MfxMenu
 from tkutil import loadImage

pysollib/tk/menubar.py

@@ -42,7 +42,7 @@ from pysollib.settings import DEBUG
 from pysollib.gamedb import GI
 
 # toolkit imports
-from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
 from tkutil import bind, after_idle
 from tkwidget import MfxMessageDialog
 from selectgame import SelectGameDialog, SelectGameDialogWithPreview
@@ -52,7 +52,7 @@ from selecttile import SelectTileDialogWithPreview
 from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog
 from solverdialog import connect_game_solver_dialog
 
-from tkconst import TOOLBAR_BUTTONS
+from pysollib.ui.tktile.tkconst import TOOLBAR_BUTTONS
 
 from pysollib.ui.tktile.menubar import createToolbarMenu, MfxMenubar, MfxMenu
 # ************************************************************************

pysollib/tk/progressbar.py

@@ -27,7 +27,7 @@ __all__ = ['PysolProgressBar']
 import Tkinter
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkutil import makeToplevel, setTransient
 
 

pysollib/tk/solverdialog.py

@@ -39,7 +39,7 @@ from pysollib.mfxutil import KwStruct
 from pysollib.settings import TITLE
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxDialog
 
 

pysollib/tk/soundoptionsdialog.py

@@ -34,7 +34,7 @@ from pysollib.settings import TITLE
 from pysollib.pysolaudio import pysolsoundserver
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxDialog, MfxMessageDialog
 
 # ************************************************************************

pysollib/tk/tkwrap.py

@@ -29,7 +29,7 @@ import Tkinter
 TclError = Tkinter.TclError
 
 # PySol imports
-from tkconst import EVENT_PROPAGATE
+from pysollib.ui.tktile.tkconst import EVENT_PROPAGATE
 
 
 # ************************************************************************

pysollib/tk/toolbar.py

@@ -36,7 +36,7 @@ from pysollib.settings import TITLE
 from pysollib.winsystems import TkSettings
 
 # Toolkit imports
-from tkconst import EVENT_HANDLED
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED
 from tkwidget import MfxTooltip
 from menubar import createToolbarMenu, MfxMenu
 

pysollib/ui/tktile/menubar.py

@@ -4,8 +4,8 @@ import Tkinter
 from pysollib.mfxutil import kwdefault
 from pysollib.mygettext import _, n_
 
-from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
-from tkconst import TOOLBAR_BUTTONS
+from pysollib.ui.tktile.tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS
+from pysollib.ui.tktile.tkconst import TOOLBAR_BUTTONS
 
 def createToolbarMenu(menubar, menu):
     tearoff = menu.cget('tearoff')