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

Import ttk from standard library, drop local copy

This commit is contained in:
Juhani Numminen 2020-02-11 22:39:24 +02:00
parent 97c957d055
commit 984ab3570a
20 changed files with 21 additions and 1576 deletions

View file

@ -1,4 +1,5 @@
from . import ttk from six.moves import tkinter_ttk as ttk
from .tkwidget import MfxDialog from .tkwidget import MfxDialog

View file

@ -27,8 +27,8 @@ from pysollib.ui.tktile.tkutil import bind
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_font from six.moves import tkinter_font
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxDialog from .tkwidget import MfxDialog
from .tkwidget import PysolScale from .tkwidget import PysolScale

View file

@ -29,7 +29,8 @@ from pysollib.ui.tktile.menubar import MfxMenu, PysolMenubarTkCommon
from pysollib.ui.tktile.solverdialog import connect_game_solver_dialog from pysollib.ui.tktile.solverdialog import connect_game_solver_dialog
from pysollib.util import CARDSET from pysollib.util import CARDSET
from . import ttk from six.moves import tkinter_ttk as ttk
from .selectgame import SelectGameDialog, SelectGameDialogWithPreview from .selectgame import SelectGameDialog, SelectGameDialogWithPreview
from .selecttile import SelectTileDialogWithPreview from .selecttile import SelectTileDialogWithPreview
from .soundoptionsdialog import SoundOptionsDialog from .soundoptionsdialog import SoundOptionsDialog

View file

@ -25,8 +25,8 @@ from pysollib.mfxutil import KwStruct
from pysollib.mygettext import _ from pysollib.mygettext import _
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxDialog from .tkwidget import MfxDialog

View file

@ -25,8 +25,7 @@ from pysollib.ui.tktile.tkconst import EVENT_HANDLED
from pysollib.ui.tktile.tkutil import makeToplevel, setTransient from pysollib.ui.tktile.tkutil import makeToplevel, setTransient
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
# ************************************************************************ # ************************************************************************
# * a simple progress bar # * a simple progress bar

View file

@ -32,8 +32,8 @@ from pysollib.ui.tktile.tkutil import loadImage
from pysollib.util import CARDSET from pysollib.util import CARDSET
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .selecttree import SelectDialogTreeCanvas from .selecttree import SelectDialogTreeCanvas
from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
from .tkwidget import MfxDialog, MfxScrolledCanvas, PysolScale from .tkwidget import MfxDialog, MfxScrolledCanvas, PysolScale

View file

@ -32,8 +32,8 @@ from pysollib.ui.tktile.selecttree import SelectDialogTreeData
from pysollib.ui.tktile.tkutil import unbind_destroy from pysollib.ui.tktile.tkutil import unbind_destroy
from six.moves import UserList from six.moves import UserList
from six.moves import tkinter_ttk as ttk
from . import ttk
from .selecttree import SelectDialogTreeCanvas from .selecttree import SelectDialogTreeCanvas
from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
from .tkwidget import MfxDialog, MfxScrolledCanvas from .tkwidget import MfxDialog, MfxScrolledCanvas

View file

@ -28,8 +28,8 @@ from pysollib.ui.tktile.selecttree import SelectDialogTreeData
import six import six
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_colorchooser from six.moves import tkinter_colorchooser
from six.moves import tkinter_ttk as ttk
from . import ttk
from .selecttree import SelectDialogTreeCanvas from .selecttree import SelectDialogTreeCanvas
from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
from .tkwidget import MfxDialog, MfxScrolledCanvas from .tkwidget import MfxDialog, MfxScrolledCanvas

View file

@ -30,8 +30,8 @@ from pysollib.settings import TITLE
from pysollib.ui.tktile.tkconst import EVENT_HANDLED from pysollib.ui.tktile.tkconst import EVENT_HANDLED
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxDialog, MfxMessageDialog from .tkwidget import MfxDialog, MfxMessageDialog
from .tkwidget import PysolScale from .tkwidget import PysolScale

View file

@ -29,8 +29,8 @@ from pysollib.mygettext import _
import six import six
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxTooltip from .tkwidget import MfxTooltip
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -25,8 +25,8 @@ from pysollib.mfxutil import KwStruct
from pysollib.mygettext import _ from pysollib.mygettext import _
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxDialog, PysolScale from .tkwidget import MfxDialog, PysolScale

View file

@ -29,8 +29,8 @@ from pysollib.mygettext import _
from pysollib.ui.tktile.tkhtml import Base_HTMLViewer from pysollib.ui.tktile.tkhtml import Base_HTMLViewer
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .statusbar import HtmlStatusbar from .statusbar import HtmlStatusbar
from .tkwidget import MfxMessageDialog from .tkwidget import MfxMessageDialog

View file

@ -33,8 +33,8 @@ from pysollib.ui.tktile.tkutil import bind, loadImage
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_font from six.moves import tkinter_font
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxDialog, MfxMessageDialog from .tkwidget import MfxDialog, MfxMessageDialog

View file

@ -38,8 +38,7 @@ import six
from six import PY2 from six import PY2
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_font from six.moves import tkinter_font
from six.moves import tkinter_ttk as ttk
from . import ttk
# ************************************************************************ # ************************************************************************
# * abstract base class for the dialogs in this module # * abstract base class for the dialogs in this module

View file

@ -33,8 +33,8 @@ from pysollib.util import IMAGE_EXTENSIONS
from pysollib.winsystems import TkSettings from pysollib.winsystems import TkSettings
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxTooltip from .tkwidget import MfxTooltip

File diff suppressed because it is too large Load diff

View file

@ -28,8 +28,8 @@ from pysollib.wizardutil import WizardWidgets
import six import six
from six.moves import tkinter from six.moves import tkinter
from six.moves import tkinter_ttk as ttk
from . import ttk
from .tkwidget import MfxDialog from .tkwidget import MfxDialog
from .tkwidget import PysolCombo, PysolScale from .tkwidget import PysolCombo, PysolScale

View file

@ -33,7 +33,7 @@ from pysollib.settings import VERSION
if TOOLKIT == 'tk': if TOOLKIT == 'tk':
if USE_TILE: if USE_TILE:
from pysollib.tile import ttk from six.moves import tkinter_ttk as ttk
def init_tile(app, top): def init_tile(app, top):

View file

@ -25,7 +25,7 @@ from pysollib.settings import TOOLKIT, USE_TILE
from pysollib.winsystems.common import BaseTkSettings, base_init_root_window from pysollib.winsystems.common import BaseTkSettings, base_init_root_window
if USE_TILE: if USE_TILE:
from pysollib.tile import ttk from six.moves import tkinter_ttk as ttk
def init_root_window(root, app): def init_root_window(root, app):

View file

@ -33,7 +33,7 @@ from pysollib.winsystems.common import \
if TOOLKIT == 'tk': if TOOLKIT == 'tk':
if USE_TILE: if USE_TILE:
from pysollib.tile import ttk from six.moves import tkinter_ttk as ttk
# ************************************************************************ # ************************************************************************