diff --git a/direct/src/tkpanels/AnimPanel.py b/direct/src/tkpanels/AnimPanel.py index e1f8c30b28..765632adc7 100644 --- a/direct/src/tkpanels/AnimPanel.py +++ b/direct/src/tkpanels/AnimPanel.py @@ -6,9 +6,8 @@ from direct.tkwidgets.AppShell import * from direct.showbase.TkGlobal import * from tkSimpleDialog import askfloat -import string -import math -import types +from Tkinter import * +import Pmw, string, math, types from direct.task import Task FRAMES = 0 diff --git a/direct/src/tkpanels/DirectSessionPanel.py b/direct/src/tkpanels/DirectSessionPanel.py index c1c50392a9..6a4436d79d 100644 --- a/direct/src/tkpanels/DirectSessionPanel.py +++ b/direct/src/tkpanels/DirectSessionPanel.py @@ -3,9 +3,9 @@ # Import Tkinter, Pmw, and the dial code from direct.showbase.TkGlobal import * from direct.tkwidgets.AppShell import * +from Tkinter import * from pandac.PandaModules import * - -import string +import Pmw, string from direct.tkwidgets import Dial from direct.tkwidgets import Floater from direct.tkwidgets import Slider diff --git a/direct/src/tkpanels/FSMInspector.py b/direct/src/tkpanels/FSMInspector.py index b08842d282..2e4bd73a17 100644 --- a/direct/src/tkpanels/FSMInspector.py +++ b/direct/src/tkpanels/FSMInspector.py @@ -2,8 +2,8 @@ from direct.tkwidgets.AppShell import * from direct.showbase.TkGlobal import * from tkSimpleDialog import askstring -import math -import operator +from Tkinter import * +import Pmw, math, operator DELTA = (5.0 / 360.) * 2.0 * math.pi diff --git a/direct/src/tkpanels/Inspector.py b/direct/src/tkpanels/Inspector.py index 0f9ea4becf..5d307a2bc2 100644 --- a/direct/src/tkpanels/Inspector.py +++ b/direct/src/tkpanels/Inspector.py @@ -5,6 +5,8 @@ import string from direct.showbase.TkGlobal import * +from Tkinter import * +import Pmw ### public API diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py index cbc42244d3..c0da950750 100644 --- a/direct/src/tkpanels/MopathRecorder.py +++ b/direct/src/tkpanels/MopathRecorder.py @@ -10,8 +10,8 @@ from direct.directtools.DirectUtil import * from direct.directtools.DirectGeometry import * from direct.directtools.DirectSelection import * from tkFileDialog import * -import os -import string +from Tkinter import * +import Pmw, os, string from direct.tkwidgets import Dial from direct.tkwidgets import Floater from direct.tkwidgets import Slider diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py index 61580a900a..81d1c82193 100644 --- a/direct/src/tkpanels/ParticlePanel.py +++ b/direct/src/tkpanels/ParticlePanel.py @@ -12,7 +12,8 @@ from direct.tkwidgets import VectorWidgets from direct.particles import ForceGroup from direct.particles import Particles from direct.particles import ParticleEffect -import os,Placer +from Tkinter import * +import Pmw, os,Placer from pandac.PandaModules import * diff --git a/direct/src/tkpanels/Placer.py b/direct/src/tkpanels/Placer.py index 2ffbb77319..d99b73ee16 100644 --- a/direct/src/tkpanels/Placer.py +++ b/direct/src/tkpanels/Placer.py @@ -7,6 +7,8 @@ from direct.tkwidgets.AppShell import * from direct.tkwidgets import Dial from direct.tkwidgets import Floater from direct.directtools.DirectGlobals import ZERO_VEC, UNIT_VEC +from Tkinter import * +import Pmw """ TODO: diff --git a/direct/src/tkpanels/TaskManagerPanel.py b/direct/src/tkpanels/TaskManagerPanel.py index 52035e1b66..b7910f73f8 100644 --- a/direct/src/tkpanels/TaskManagerPanel.py +++ b/direct/src/tkpanels/TaskManagerPanel.py @@ -1,4 +1,6 @@ from direct.tkwidgets.AppShell import * +from Tkinter import * +import Pmw class TaskManagerPanel(AppShell): # Override class variables here diff --git a/direct/src/tkwidgets/AppShell.py b/direct/src/tkwidgets/AppShell.py index 497f2fc9c9..ac1767b476 100644 --- a/direct/src/tkwidgets/AppShell.py +++ b/direct/src/tkwidgets/AppShell.py @@ -7,6 +7,8 @@ created by Doug Hellmann (doughellmann@mindspring.com). from direct.showbase.DirectObject import DirectObject from direct.showbase.TkGlobal import * from tkFileDialog import * +from Tkinter import * +import Pmw import Dial import Floater import Slider diff --git a/direct/src/tkwidgets/Dial.py b/direct/src/tkwidgets/Dial.py index 0aa3f21a67..501390b7c4 100644 --- a/direct/src/tkwidgets/Dial.py +++ b/direct/src/tkwidgets/Dial.py @@ -3,11 +3,10 @@ Dial Class: Velocity style controller for floating point values with a label, entry (validated), and scale """ from direct.showbase.TkGlobal import * +from Tkinter import * from Valuator import * from direct.task import Task -import math -import string -import operator +import math, string, operator, Pmw from pandac.PandaModules import ClockObject TWO_PI = 2.0 * math.pi diff --git a/direct/src/tkwidgets/EntryScale.py b/direct/src/tkwidgets/EntryScale.py index 7ba60f4f66..b82d169286 100644 --- a/direct/src/tkwidgets/EntryScale.py +++ b/direct/src/tkwidgets/EntryScale.py @@ -3,7 +3,8 @@ EntryScale Class: Scale with a label, and a linked and validated entry """ from direct.showbase.DirectObject import DirectObject from direct.showbase.TkGlobal import * -import string +from Tkinter import * +import string, Pmw import tkColorChooser from tkSimpleDialog import * diff --git a/direct/src/tkwidgets/Floater.py b/direct/src/tkwidgets/Floater.py index dc31c41d60..c6b474d224 100644 --- a/direct/src/tkwidgets/Floater.py +++ b/direct/src/tkwidgets/Floater.py @@ -3,9 +3,10 @@ Floater Class: Velocity style controller for floating point values with a label, entry (validated), and scale """ from direct.showbase.TkGlobal import * +from Tkinter import * from Valuator import * from direct.task import Task -import math, sys, string +import math, sys, string, Pmw FLOATER_WIDTH = 22 FLOATER_HEIGHT = 18 diff --git a/direct/src/tkwidgets/ProgressBar.py b/direct/src/tkwidgets/ProgressBar.py index 540d3e7e7d..9f049c24fa 100644 --- a/direct/src/tkwidgets/ProgressBar.py +++ b/direct/src/tkwidgets/ProgressBar.py @@ -2,6 +2,7 @@ A basic widget for showing the progress being made in a task. """ from direct.showbase.TkGlobal import * +from Tkinter import * class ProgressBar: def __init__(self, master=None, orientation="horizontal", diff --git a/direct/src/tkwidgets/SceneGraphExplorer.py b/direct/src/tkwidgets/SceneGraphExplorer.py index efea38ebbb..57ace391c0 100644 --- a/direct/src/tkwidgets/SceneGraphExplorer.py +++ b/direct/src/tkwidgets/SceneGraphExplorer.py @@ -1,5 +1,6 @@ from direct.showbase.DirectObject import DirectObject from direct.showbase.TkGlobal import * +from Tkinter import * from Tree import * # changing these strings requires changing DirectSession.py SGE_ strs too! diff --git a/direct/src/tkwidgets/Slider.py b/direct/src/tkwidgets/Slider.py index a6e67259fa..4934658a5e 100644 --- a/direct/src/tkwidgets/Slider.py +++ b/direct/src/tkwidgets/Slider.py @@ -3,10 +3,11 @@ Slider Class: Velocity style controller for floating point values with a label, entry (validated), and min/max slider """ from direct.showbase.TkGlobal import * +from Tkinter import * from Valuator import * from direct.task import Task import math, sys, string -import operator +import operator, Pmw from pandac.PandaModules import ClockObject class Slider(Valuator): diff --git a/direct/src/tkwidgets/Tree.py b/direct/src/tkwidgets/Tree.py index c94eec016b..94e73218a5 100644 --- a/direct/src/tkwidgets/Tree.py +++ b/direct/src/tkwidgets/Tree.py @@ -19,6 +19,8 @@ import os import sys import string from direct.showbase.TkGlobal import * +from Tkinter import * +import Pmw from pandac.PandaModules import * # Initialize icon directory diff --git a/direct/src/tkwidgets/Valuator.py b/direct/src/tkwidgets/Valuator.py index 550101f6b5..7bf20de574 100644 --- a/direct/src/tkwidgets/Valuator.py +++ b/direct/src/tkwidgets/Valuator.py @@ -1,8 +1,9 @@ from direct.showbase.DirectObject import * from direct.showbase.TkGlobal import * +from Tkinter import * import tkColorChooser import WidgetPropertiesDialog -import string +import string, Pmw from direct.directtools.DirectUtil import getTkColorString VALUATOR_MINI = 'mini' diff --git a/direct/src/tkwidgets/VectorWidgets.py b/direct/src/tkwidgets/VectorWidgets.py index 5d5831c1e9..8720e04f89 100644 --- a/direct/src/tkwidgets/VectorWidgets.py +++ b/direct/src/tkwidgets/VectorWidgets.py @@ -1,10 +1,12 @@ from direct.showbase.TkGlobal import * +from Tkinter import * import Valuator import Floater import Slider import string import tkColorChooser import types +import Pmw class VectorEntry(Pmw.MegaWidget): def __init__(self, parent = None, **kw): diff --git a/direct/src/tkwidgets/WidgetPropertiesDialog.py b/direct/src/tkwidgets/WidgetPropertiesDialog.py index 13fd813ab6..eb6e815429 100644 --- a/direct/src/tkwidgets/WidgetPropertiesDialog.py +++ b/direct/src/tkwidgets/WidgetPropertiesDialog.py @@ -1,6 +1,6 @@ from direct.showbase.TkGlobal import * -import types -import string +from Tkinter import * +import types, string, Pmw """ TODO: