From 60257ce016cef4dae269dbaa3922892547bb70fc Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 13 Feb 2016 20:20:56 +0200 Subject: [PATCH] Reduce diff between {tk,tile}/menubar.py a little. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “Every journey of a thousand miles begins with one small step.” --- pysollib/tile/menubar.py | 6 +++--- pysollib/tk/menubar.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py index 1de98803..0be598ba 100644 --- a/pysollib/tile/menubar.py +++ b/pysollib/tile/menubar.py @@ -24,9 +24,10 @@ __all__ = ['PysolMenubarTk'] # imports -import math, os, sys, re, traceback +import math, os, sys, re import Tkinter import ttk +import traceback import tkFileDialog # PySol imports @@ -43,15 +44,14 @@ from pysollib.gamedb import GI # toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS from tkutil import bind, after_idle +from tkwidget import MfxMessageDialog 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 solverdialog import connect_game_solver_dialog -from tkwidget import MfxMessageDialog -#from toolbar import TOOLBAR_BUTTONS from tkconst import TOOLBAR_BUTTONS diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index ac1b4a09..44bb3d87 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -25,8 +25,9 @@ __all__ = ['PysolMenubarTk'] # imports import math, os, sys, re +import Tkinter import traceback -import Tkinter, tkFileDialog +import tkFileDialog # PySol imports from pysollib.mygettext import _, n_