From 118a83e6ba25c1b1882e3ec6f0ab22ca511e0c0d Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 13 Feb 2016 23:48:33 +0200
Subject: [PATCH] Correct to the right import path.

---
 pysollib/pysoltk.py                 | 3 +--
 pysollib/tile/menubar.py            | 4 ++--
 pysollib/tile/progressbar.py        | 2 +-
 pysollib/tile/solverdialog.py       | 2 +-
 pysollib/tile/soundoptionsdialog.py | 2 +-
 pysollib/tile/tkwrap.py             | 2 +-
 pysollib/tile/toolbar.py            | 2 +-
 pysollib/tk/menubar.py              | 4 ++--
 pysollib/tk/progressbar.py          | 2 +-
 pysollib/tk/solverdialog.py         | 2 +-
 pysollib/tk/soundoptionsdialog.py   | 2 +-
 pysollib/tk/tkwrap.py               | 2 +-
 pysollib/tk/toolbar.py              | 2 +-
 pysollib/ui/tktile/menubar.py       | 4 ++--
 14 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py
index 3d9d051c..eb0eeff9 100644
--- a/pysollib/pysoltk.py
+++ b/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 *
diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py
index 845a0040..fc31eda8 100644
--- a/pysollib/tile/menubar.py
+++ b/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
 # ************************************************************************
diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py
index 024f88b2..527ab0be 100644
--- a/pysollib/tile/progressbar.py
+++ b/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
 
 
diff --git a/pysollib/tile/solverdialog.py b/pysollib/tile/solverdialog.py
index 6d365ea1..0a394538 100644
--- a/pysollib/tile/solverdialog.py
+++ b/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
 
diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py
index e6c4bb19..b2945591 100644
--- a/pysollib/tile/soundoptionsdialog.py
+++ b/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
 
diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py
index d300eed1..a63f632a 100644
--- a/pysollib/tile/tkwrap.py
+++ b/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
 
 
 # ************************************************************************
diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py
index b21433c3..bbacec26 100644
--- a/pysollib/tile/toolbar.py
+++ b/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
diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py
index d572beff..ac0c9552 100644
--- a/pysollib/tk/menubar.py
+++ b/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
 # ************************************************************************
diff --git a/pysollib/tk/progressbar.py b/pysollib/tk/progressbar.py
index d984402f..bec2c2b4 100644
--- a/pysollib/tk/progressbar.py
+++ b/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
 
 
diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py
index 1cd5bd4a..2bcc8862 100644
--- a/pysollib/tk/solverdialog.py
+++ b/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
 
 
diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py
index f66011ac..0ae9a1a5 100644
--- a/pysollib/tk/soundoptionsdialog.py
+++ b/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
 
 # ************************************************************************
diff --git a/pysollib/tk/tkwrap.py b/pysollib/tk/tkwrap.py
index d300eed1..a63f632a 100644
--- a/pysollib/tk/tkwrap.py
+++ b/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
 
 
 # ************************************************************************
diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py
index 62bc98b5..f90308c9 100644
--- a/pysollib/tk/toolbar.py
+++ b/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
 
diff --git a/pysollib/ui/tktile/menubar.py b/pysollib/ui/tktile/menubar.py
index e4d9ed2d..f7227a49 100644
--- a/pysollib/ui/tktile/menubar.py
+++ b/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')