diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index cfd6a00b..9c5b4f36 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -27,7 +27,6 @@ __all__ = [] import sys import re import time -# from tkFont import Font from gettext import ungettext # PySol imports diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py index 45a7763a..3f5056ed 100644 --- a/pysollib/games/mahjongg/shisensho.py +++ b/pysollib/games/mahjongg/shisensho.py @@ -25,7 +25,6 @@ __all__ = [] # Imports import sys -# from tkFont import Font from gettext import ungettext # PySol imports diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py index 2064c01c..b49c205b 100644 --- a/pysollib/tile/fontsdialog.py +++ b/pysollib/tile/fontsdialog.py @@ -26,7 +26,7 @@ __all__ = ['FontsDialog'] # imports from six.moves import tkinter import ttk -import tkFont +from six.moves import tkinter_font # PySol imports from pysollib.mfxutil import KwStruct @@ -111,7 +111,7 @@ class FontChooserDialog(MfxDialog): command=self.fontupdate, variable=self.size_var) sc.grid(row=4, column=0, columnspan=2, sticky='news') # - font_families = list(tkFont.families()) + font_families = list(tkinter_font.families()) font_families.sort() selected = -1 n = 0 diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index 75c1d001..f17e1098 100644 --- a/pysollib/tile/tkstats.py +++ b/pysollib/tile/tkstats.py @@ -35,7 +35,7 @@ import os import time from six.moves import tkinter import ttk -import tkFont +from six.moves import tkinter_font # PySol imports from pysollib.mygettext import _ @@ -64,11 +64,11 @@ class StatsDialog(MfxDialog): MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) self.font = app.getFont('default') - self.tkfont = tkFont.Font(parent, self.font) + self.tkfont = tkinter_font.Font(parent, self.font) self.font_metrics = self.tkfont.metrics() style = ttk.Style(parent) heading_font = style.lookup('Heading', 'font') # treeview heading - self.heading_tkfont = tkFont.Font(parent, heading_font) + self.heading_tkfont = tkinter_font.Font(parent, heading_font) self.selected_game = None @@ -509,10 +509,10 @@ class LogDialog(MfxDialog): def __init__(self, parent, title, app, player, **kw): self.font = app.getFont('default') - self.tkfont = tkFont.Font(parent, self.font) + self.tkfont = tkinter_font.Font(parent, self.font) style = ttk.Style(parent) heading_font = style.lookup('Heading', 'font') # treeview heading - self.heading_tkfont = tkFont.Font(parent, heading_font) + self.heading_tkfont = tkinter_font.Font(parent, heading_font) self.font_metrics = self.tkfont.metrics() self.CHAR_H = self.font_metrics['linespace'] diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index 8a8c8df1..6bd35fcc 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -38,7 +38,7 @@ import time import locale from six.moves import tkinter import ttk -import tkFont +from six.moves import tkinter_font import traceback # PySol imports @@ -328,10 +328,10 @@ class PysolAboutDialog(MfxMessageDialog): if sys.version_info >= (2, 4): # font_name = msg.lookup('TLabel', 'font') font_name = 'TkDefaultFont' - font = tkFont.Font(parent, name=font_name, exists=True) + font = tkinter_font.Font(parent, name=font_name, exists=True) font = font.copy() else: - font = tkFont.Font(parent, app.getFont('default')) + font = tkinter_font.Font(parent, app.getFont('default')) font.configure(underline=True) url_label = ttk.Label(frame, text=kw.url, font=font, foreground='blue', cursor='hand2') diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py index 12606a31..0ee4d1db 100644 --- a/pysollib/tk/fontsdialog.py +++ b/pysollib/tk/fontsdialog.py @@ -25,7 +25,7 @@ __all__ = ['FontsDialog'] # imports from six.moves import tkinter -import tkFont +from six.moves import tkinter_font # PySol imports from pysollib.mygettext import _ @@ -110,7 +110,7 @@ class FontChooserDialog(MfxDialog): self.size_var.set(self.font_size) self.weight_var.set(self.font_weight == 'bold') self.slant_var.set(self.font_slant == 'italic') - font_families = list(tkFont.families()) + font_families = list(tkinter_font.families()) font_families.sort() selected = -1 n = 0 diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index f0ff55c8..4f515314 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -34,7 +34,7 @@ __all__ = ['SingleGame_StatsDialog', import os import time from six.moves import tkinter -import tkFont +from six.moves import tkinter_font # PySol imports from pysollib.mygettext import _ @@ -79,7 +79,7 @@ class SingleGame_StatsDialog(MfxDialog): # createChart = self.createSimpleChart # self.font = self.app.getFont("default") - self.tk_font = tkFont.Font(self.top, self.font) + self.tk_font = tkinter_font.Font(self.top, self.font) self.font_metrics = self.tk_font.metrics() self._calc_tabs() # @@ -335,7 +335,7 @@ class CanvasFormatter(PysolStatsFormatter): tw = 15*self.w # tw = 160 self._tabs = [tw] - font = tkFont.Font(self.canvas, self.font) + font = tkinter_font.Font(self.canvas, self.font) for t in arg[1:]: tw = font.measure(t)+20 self._tabs.append(tw) @@ -481,7 +481,7 @@ class AllGames_StatsDialog(MfxDialog): # lines = 20 # self.font = app.getFont(self.FONT_TYPE) - font = tkFont.Font(parent, self.font) + font = tkinter_font.Font(parent, self.font) self.font_metrics = font.metrics() self.CHAR_H = self.font_metrics['linespace'] self.CHAR_W = font.measure('M') @@ -831,8 +831,8 @@ class ProgressionDialog(MfxDialog): def __init__(self, parent, title, app, player, gameid, **kw): font_name = app.getFont('default') - font = tkFont.Font(parent, font_name) - tkfont = tkFont.Font(parent, font) + font = tkinter_font.Font(parent, font_name) + tkfont = tkinter_font.Font(parent, font) font_metrics = font.metrics() measure = tkfont.measure self.text_height = font_metrics['linespace'] diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index d2afdb41..4770bcbc 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -35,7 +35,7 @@ __all__ = ['MfxDialog', import sys import time from six.moves import tkinter -import tkFont +from six.moves import tkinter_font import traceback # PySol imports @@ -324,7 +324,7 @@ class PysolAboutDialog(MfxMessageDialog): width=kw.width) msg.pack(fill='both', expand=True) - font = tkFont.Font(parent, app.getFont('default')) + font = tkinter_font.Font(parent, app.getFont('default')) font.configure(underline=True) url_label = tkinter.Label(frame, text=kw.url, font=font, foreground='blue', cursor='hand2') diff --git a/pysollib/ui/tktile/selecttree.py b/pysollib/ui/tktile/selecttree.py index 7db11252..9bba218c 100644 --- a/pysollib/ui/tktile/selecttree.py +++ b/pysollib/ui/tktile/selecttree.py @@ -26,7 +26,7 @@ # ************************************************************************ # imports -import tkFont +from six.moves import tkinter_font class BaseSelectDialogTreeLeaf: @@ -110,7 +110,7 @@ class BaseSelectDialogTreeCanvas: self.style.height = 14 # height of symbol if font: self.style.font = font - f = tkFont.Font(parent, font) + f = tkinter_font.Font(parent, font) h = f.metrics()["linespace"] self.style.disty = max(self.style.width, h) diff --git a/pysollib/ui/tktile/tkutil.py b/pysollib/ui/tktile/tkutil.py index 220d1384..9e30f46b 100644 --- a/pysollib/ui/tktile/tkutil.py +++ b/pysollib/ui/tktile/tkutil.py @@ -48,7 +48,7 @@ __all__ = ['wm_withdraw', # imports import re from six.moves import tkinter -from tkFont import Font +from six.moves import tkinter_font # PySol imports from pysollib.mfxutil import Image, ImageTk, ImageOps @@ -444,4 +444,4 @@ def resizeBottom(image, maskimage, color='white', backfile=None): # ************************************************************************ def get_text_width(text, font, root=None): - return Font(root=root, font=font).measure(text) + return tkinter_font.Font(root=root, font=font).measure(text)