more fixes for import

drwrose · drwrose · commit 1f3cc3b671d6 · 2006-08-09T22:32:50.000Z
diff --git a/direct/src/gui/DirectButton.py b/direct/src/gui/DirectButton.py
@@ -6,12 +6,6 @@
 import DirectGuiGlobals as DGG
 from DirectFrame import *
 
-# DirectButton States:
-BUTTON_READY_STATE     = PGButton.SReady       # 0
-BUTTON_DEPRESSED_STATE = PGButton.SDepressed   # 1
-BUTTON_ROLLOVER_STATE  = PGButton.SRollover    # 2
-BUTTON_INACTIVE_STATE  = PGButton.SInactive    # 3
-
 class DirectButton(DirectFrame):
     """
     DirectButton(parent) - Create a DirectGuiWidget which responds
diff --git a/direct/src/gui/DirectDialog.py b/direct/src/gui/DirectDialog.py
@@ -6,6 +6,7 @@
 import DirectGuiGlobals as DGG
 from DirectFrame import *
 from DirectButton import *
+import types
 
 def findDialog(uniqueName):
     """findPanel(string uniqueName)
@@ -93,7 +94,7 @@ def __init__(self, parent = None, **kw):
             ('text',              '',            None),
             ('text_align',        TextNode.ALeft,   None),
             ('text_scale',        0.06,          None),
-            ('image',  getDefaultDialogGeom(),   None),
+            ('image',  DGG.getDefaultDialogGeom(),   None),
             ('relief',            None,          None),
             ('buttonTextList',    [],            DGG.INITOPT),
             ('buttonGeomList',    [],            DGG.INITOPT),
diff --git a/direct/src/gui/DirectEntry.py b/direct/src/gui/DirectEntry.py
@@ -5,6 +5,7 @@
 from pandac.PandaModules import *
 import DirectGuiGlobals as DGG
 from DirectFrame import *
+from OnscreenText import OnscreenText
 import string,types
 
 # DirectEntry States:
diff --git a/direct/src/gui/DirectFrame.py b/direct/src/gui/DirectFrame.py
@@ -5,7 +5,8 @@
 from pandac.PandaModules import *
 import DirectGuiGlobals as DGG
 from DirectGuiBase import *
-from OnscreenImage import *
+from OnscreenImage import OnscreenImage
+from OnscreenGeom import OnscreenGeom
 import string, types
 
 class DirectFrame(DirectGuiWidget):
diff --git a/direct/src/gui/DirectGui.py b/direct/src/gui/DirectGui.py
@@ -1,6 +1,6 @@
 """Undocumented Module"""
 
-import DirectGuiGlobals
+import DirectGuiGlobals as DGG
 from OnscreenText import *
 from OnscreenGeom import *
 from OnscreenImage import *
diff --git a/direct/src/gui/DirectGuiGlobals.py b/direct/src/gui/DirectGuiGlobals.py
@@ -91,6 +91,12 @@
 _OPT_VALUE           = 1
 _OPT_FUNCTION        = 2
 
+# DirectButton States:
+BUTTON_READY_STATE     = PGButton.SReady       # 0
+BUTTON_DEPRESSED_STATE = PGButton.SDepressed   # 1
+BUTTON_ROLLOVER_STATE  = PGButton.SRollover    # 2
+BUTTON_INACTIVE_STATE  = PGButton.SInactive    # 3
+
 def getDefaultRolloverSound():
     global defaultRolloverSound
     if defaultRolloverSound == None:
diff --git a/direct/src/interval/IntervalManager.py b/direct/src/interval/IntervalManager.py
@@ -1,6 +1,6 @@
 """Undocumented Module"""
 
-__all__ = ['IntervalManager']
+__all__ = ['IntervalManager', 'ivalMgr']
 
 from pandac.PandaModules import *
 from pandac import PandaModules
diff --git a/direct/src/showbase/Transitions.py b/direct/src/showbase/Transitions.py
@@ -72,7 +72,7 @@ def loadFade(self):
                 relief = None,
                 image = self.fadeModel,
                 image_scale = 2 * base.getAspectRatio(),
-                state = NORMAL,
+                state = DGG.NORMAL,
                 )
 
             def rescaleFade():

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def loadFade(self):`
`72`	`72`	`relief = None,`
`73`	`73`	`image = self.fadeModel,`
`74`	`74`	`image_scale = 2 * base.getAspectRatio(),`
`75`		`- state = NORMAL,`
	`75`	`+ state = DGG.NORMAL,`
`76`	`76`	`)`
`77`	`77`
`78`	`78`	`def rescaleFade():`