diff options
| author | emkael <emkael@tlen.pl> | 2020-01-22 22:08:19 +0100 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2020-01-22 22:08:19 +0100 |
| commit | 384e5fd67b5c55d422ad70124657485c129aa6aa (patch) | |
| tree | 567e4bf507c1e3d76020f6e62ac00ceb9c3ed12f /jfr_playoff/gui/frames | |
| parent | b52c9bac6df1aea0a946453ac1763dce8d67c605 (diff) | |
| parent | b30e3c6c4f9b91e58c75b42558c0233f4f4a9975 (diff) | |
Merge branch 'tkinter-imports'
Diffstat (limited to 'jfr_playoff/gui/frames')
| -rw-r--r-- | jfr_playoff/gui/frames/__init__.py | 4 | ||||
| -rw-r--r-- | jfr_playoff/gui/frames/match.py | 6 | ||||
| -rw-r--r-- | jfr_playoff/gui/frames/network.py | 4 | ||||
| -rw-r--r-- | jfr_playoff/gui/frames/team.py | 6 | ||||
| -rw-r--r-- | jfr_playoff/gui/frames/translations.py | 4 | ||||
| -rw-r--r-- | jfr_playoff/gui/frames/visual.py | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/jfr_playoff/gui/frames/__init__.py b/jfr_playoff/gui/frames/__init__.py index 8b22f52..7a346e1 100644 --- a/jfr_playoff/gui/frames/__init__.py +++ b/jfr_playoff/gui/frames/__init__.py @@ -3,8 +3,8 @@ from functools import partial import types -import tkinter as tk -from tkinter import ttk +import Tkinter as tk +import ttk import tkMessageBox from ..variables import BoolVar diff --git a/jfr_playoff/gui/frames/match.py b/jfr_playoff/gui/frames/match.py index ad630d0..5437887 100644 --- a/jfr_playoff/gui/frames/match.py +++ b/jfr_playoff/gui/frames/match.py @@ -2,9 +2,9 @@ from collections import OrderedDict -import tkinter as tk -from tkinter.font import Font -from tkinter import ttk +import Tkinter as tk +from tkFont import Font +import ttk from ..frames import GuiFrame, RepeatableFrame, ScrollableFrame from ..frames import WidgetRepeater, RepeatableEntry, NumericSpinbox diff --git a/jfr_playoff/gui/frames/network.py b/jfr_playoff/gui/frames/network.py index 96c5daa..927c4b1 100644 --- a/jfr_playoff/gui/frames/network.py +++ b/jfr_playoff/gui/frames/network.py @@ -3,8 +3,8 @@ import socket from collections import OrderedDict -import tkinter as tk -from tkinter import ttk +import Tkinter as tk +import ttk import tkMessageBox as tkmb from ...db import PlayoffDB diff --git a/jfr_playoff/gui/frames/team.py b/jfr_playoff/gui/frames/team.py index 8e17422..b174e27 100644 --- a/jfr_playoff/gui/frames/team.py +++ b/jfr_playoff/gui/frames/team.py @@ -2,9 +2,9 @@ from collections import OrderedDict -import tkinter as tk -from tkinter.font import Font -from tkinter import ttk +import Tkinter as tk +from tkFont import Font +import ttk from ..frames import GuiFrame, RepeatableFrame, ScrollableFrame from ..frames import WidgetRepeater, RepeatableEntry, NumericSpinbox diff --git a/jfr_playoff/gui/frames/translations.py b/jfr_playoff/gui/frames/translations.py index a369159..2045f64 100644 --- a/jfr_playoff/gui/frames/translations.py +++ b/jfr_playoff/gui/frames/translations.py @@ -3,8 +3,8 @@ import copy from collections import OrderedDict -import tkinter as tk -from tkinter import ttk +import Tkinter as tk +import ttk from ..frames import RepeatableFrame, WidgetRepeater, ScrollableFrame from ...i18n import PLAYOFF_I18N_DEFAULTS diff --git a/jfr_playoff/gui/frames/visual.py b/jfr_playoff/gui/frames/visual.py index 1cbe177..9794ef3 100644 --- a/jfr_playoff/gui/frames/visual.py +++ b/jfr_playoff/gui/frames/visual.py @@ -2,8 +2,8 @@ from collections import OrderedDict -import tkinter as tk -from tkinter import ttk +import Tkinter as tk +import ttk import tkColorChooser as tkcc from ..frames import GuiFrame, RepeatableFrame, ScrollableFrame |