Add more wrapper classes to avoid using panda3d.lui directly

Builtin/LUIButton.py

@@ -1,5 +1,5 @@
 
-from panda3d.lui import LUIObject
+from LUIObject import LUIObject
 from LUILayouts import LUIHorizontalStretchedLayout
 from LUILabel import LUILabel
 from LUIInitialState import LUIInitialState

Builtin/LUICheckbox.py

@@ -1,7 +1,8 @@
 
 from __future__ import division
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUILabel import LUILabel
 from LUIInitialState import LUIInitialState
 

Builtin/LUIFormattedLabel.py

@@ -1,6 +1,6 @@
 
 from panda3d.core import LVecBase2i
-from panda3d.lui import LUIObject
+from LUIObject import LUIObject
 from LUILabel import LUILabel
 from LUIInitialState import LUIInitialState
 

Builtin/LUIFrame.py

@@ -1,7 +1,8 @@
 
 from __future__ import print_function
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUILayouts import LUICornerLayout
 from LUIInitialState import LUIInitialState
 from LUIScrollableRegion import LUIScrollableRegion

Builtin/LUIHorizontalLayout.py

@@ -0,0 +1,18 @@
+"""
+
+This is a wrapper file. It contains no actual implementation
+
+"""
+
+from panda3d.lui import LUIHorizontalLayout as _LUIHorizontalLayout
+from LUIInitialState import LUIInitialState
+
+__all__ = ["LUIHorizontalLayout"]
+
+class LUIHorizontalLayout(_LUIHorizontalLayout):
+    """ This is a wrapper class for the C++ LUIHorizontalLayout class, to be able to
+    use it in a more convenient way """
+
+    def __init__(self, parent=None, spacing=0.0, **kwargs):
+        _LUIHorizontalLayout.__init__(self, parent, spacing)
+        LUIInitialState.init(self, kwargs)

Builtin/LUIInitialState.py

@@ -10,10 +10,18 @@ class LUIInitialState:
     def __init__(self):
         raise Exception("LUIInitialState is a static class")
 
-    @staticmethod
-    def init(obj, kwargs):
+    __mappings = {
+        "x": "left",
+        "y": "top",
+        "w": "width",
+        "h": "height"
+    }
+
+    @classmethod
+    def init(cls, obj, kwargs):
         """ Applies the keyword arguments as properties """
         for arg_name, arg_val in kwargs.items():
+            arg_name = cls.__mappings.get(arg_name, arg_name)
             if hasattr(obj, arg_name):
                 setattr(obj, arg_name, arg_val)
             else:

Builtin/LUIInputField.py

@@ -1,5 +1,6 @@
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUILabel import LUILabel
 from LUIInitialState import LUIInitialState
 from LUILayouts import LUIHorizontalStretchedLayout

Builtin/LUIInputHandler.py

@@ -0,0 +1,8 @@
+"""
+
+This is a wrapper file. It contains no actual implementation
+
+"""
+
+from panda3d.lui import LUIInputHandler as __LUIInputHandler
+LUIInputHandler = __LUIInputHandler

Builtin/LUILabel.py

@@ -1,5 +1,6 @@
 
-from panda3d.lui import LUIObject, LUIText
+from panda3d.lui import LUIText
+from LUIObject import LUIObject
 from LUIInitialState import LUIInitialState
 
 __all__ = ["LUILabel"]

Builtin/LUILayouts.py

@@ -1,7 +1,9 @@
 
 from __future__ import print_function, division
 
-from panda3d.lui import LUIObject, LUISprite, LUIHorizontalLayout
+from LUIObject import LUIObject
+from LUISprite import LUISprite
+from LUIHorizontalLayout import LUIHorizontalLayout
 from direct.directnotify.DirectNotify import DirectNotify
 
 from LUIInitialState import LUIInitialState

Builtin/LUIObject.py

@@ -4,15 +4,15 @@
 
 """
 
-from panda3d.lui import LUIObject as __LUIObject
-from .LUIInitialState import LUIInitialState
+from panda3d.lui import LUIObject as _LUIObject
+from LUIInitialState import LUIInitialState
 
 __all__ = ["LUIObject"]
 
-class LUIObject(__LUIObject):
+class LUIObject(_LUIObject):
     """ This is a wrapper class for the C++ LUIObject class, to be able to
     use it in a more convenient way """
 
-    def __init__(self, x=0, y=0, w=-1, h=-1, solid=False, **kwargs):
-        LUIObject.__init__(self, x, y, w, h, solid)
+    def __init__(self, *args, **kwargs):
+        _LUIObject.__init__(self, *args)
         LUIInitialState.init(self, kwargs)

Builtin/LUIProgressbar.py

@@ -1,5 +1,6 @@
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 
 from LUILayouts import LUIHorizontalStretchedLayout
 from LUILabel import LUILabel

Builtin/LUIRadiobox.py

@@ -1,7 +1,8 @@
 
 from __future__ import division
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUIInitialState import LUIInitialState
 from LUILabel import LUILabel
 

Builtin/LUIRadioboxGroup.py

@@ -1,5 +1,5 @@
 
-from panda3d.lui import LUIObject
+from LUIObject import LUIObject
 
 class LUIRadioboxGroup(LUIObject):
 

Builtin/LUIRegion.py

@@ -0,0 +1,8 @@
+"""
+
+This is a wrapper file. It contains no actual implementation
+
+"""
+
+from panda3d.lui import LUIRegion as __LUIRegion
+LUIRegion = __LUIRegion

Builtin/LUIScrollableRegion.py

@@ -1,5 +1,6 @@
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUIInitialState import LUIInitialState
 from LUILayouts import LUIHorizontalStretchedLayout
 

Builtin/LUISelectbox.py

@@ -1,5 +1,6 @@
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUILabel import LUILabel
 from LUILayouts import LUICornerLayout, LUIHorizontalStretchedLayout
 from LUIInitialState import LUIInitialState

Builtin/LUISkin.py

@@ -1,9 +1,10 @@
 
-from panda3d.lui import LUIFontPool, LUIAtlasPool
-from panda3d.core import Filename
 import os
 from os.path import join
 
+from panda3d.core import Filename
+from panda3d.lui import LUIFontPool, LUIAtlasPool
+
 class LUISkin:
 
     """ Abstract class, each skin derives from this class """

Builtin/LUISlider.py

@@ -1,5 +1,6 @@
 
-from panda3d.lui import LUIObject, LUISprite
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUIInitialState import LUIInitialState
 from LUILayouts import LUIHorizontalStretchedLayout
 

Builtin/LUISprite.py

@@ -0,0 +1,18 @@
+"""
+
+This is a wrapper file. It contains no actual implementation
+
+"""
+
+from panda3d.lui import LUISprite as _LUISprite
+from LUIInitialState import LUIInitialState
+
+__all__ = ["LUISprite"]
+
+class LUISprite(_LUISprite):
+    """ This is a wrapper class for the C++ LUISprite class, to be able to
+    use it in a more convenient way """
+
+    def __init__(self, *args, **kwargs):
+        _LUISprite.__init__(self, *args)
+        LUIInitialState.init(self, kwargs)

Builtin/LUISpriteButton.py

@@ -1,4 +1,6 @@
-from panda3d.lui import LUIObject, LUISprite
+
+from LUIObject import LUIObject
+from LUISprite import LUISprite
 from LUILabel import LUILabel
 from LUIInitialState import LUIInitialState
 

Builtin/LUITabbedFrame.py

@@ -1,6 +1,9 @@
+
 from LUIFrame import LUIFrame
 from LUILabel import LUILabel
-from panda3d.lui import LUIVerticalLayout, LUIHorizontalLayout, LUIObject
+from LUIObject import LUIObject
+from LUIVerticalLayout import LUIVerticalLayout
+from LUIHorizontalLayout import LUIHorizontalLayout
 
 class LUITabbedFrame(LUIFrame):
     def __init__(self, **kwargs):

Builtin/LUIVerticalLayout.py

@@ -0,0 +1,18 @@
+"""
+
+This is a wrapper file. It contains no actual implementation
+
+"""
+
+from panda3d.lui import LUIVerticalLayout as _LUIVerticalLayout
+from LUIInitialState import LUIInitialState
+
+__all__ = ["LUIVerticalLayout"]
+
+class LUIVerticalLayout(_LUIVerticalLayout):
+    """ This is a wrapper class for the C++ LUIVerticalLayout class, to be able to
+    use it in a more convenient way """
+
+    def __init__(self, parent=None, spacing=0.0, **kwargs):
+        _LUIVerticalLayout.__init__(self, parent, spacing)
+        LUIInitialState.init(self, kwargs)

Demos/01_MinimalExample.py

@@ -10,13 +10,12 @@
 import sys
 sys.path.insert(0, "../Builtin")
 
-# Load some required LUI classes
-from panda3d.lui import LUIRegion, LUIInputHandler
-
-# Load a builtin LUI class. When lui is included in panda, this will be
-# from direct.luiwidgets.LUIButton import LUIButton
+# Load some builtin LUI classes. When lui is included in panda, this will be
+# from direct.lui.LUIButton import LUIButton
 from LUIButton import LUIButton
 from LUISkin import LUIDefaultSkin
+from LUIRegion import LUIRegion
+from LUIInputHandler import LUIInputHandler
 
 # Setup panda, nothing special here
 from panda3d.core import load_prc_file_data

Demos/02_SimpleConsole.py

@@ -21,14 +21,17 @@
 """)
 
 # Imports
-from panda3d.lui import LUIRegion, LUIObject, LUIInputHandler
-from panda3d.lui import LUIVerticalLayout
+
 from LUISkin import LUIDefaultSkin
 from LUIFrame import LUIFrame
 from LUILabel import LUILabel
 from LUIInputField import LUIInputField
 from LUIFormattedLabel import LUIFormattedLabel
 from LUIScrollableRegion import LUIScrollableRegion
+from LUIObject import LUIObject
+from LUIRegion import LUIRegion
+from LUIInputHandler import LUIInputHandler
+from LUIVerticalLayout import LUIVerticalLayout
 
 from Skins.Metro.LUIMetroSkin import LUIMetroSkin
 

Demos/B_Button.py

@@ -1,7 +1,7 @@
 
 from DemoFramework import DemoFramework
 from LUIButton import LUIButton
-from panda3d.lui import LUIHorizontalLayout
+from LUIHorizontalLayout import LUIHorizontalLayout
 
 import random
 

Demos/B_Frame.py

@@ -1,11 +1,11 @@
 
 
 from DemoFramework import DemoFramework
-from panda3d.lui import LUIVerticalLayout
+from LUIVerticalLayout import LUIVerticalLayout
 from LUIFrame import LUIFrame
 from LUILabel import LUILabel
 from LUIButton import LUIButton
-from panda3d.lui import LUIObject
+from LUIObject import LUIObject
 
 import random
 

Demos/B_Progressbar.py

@@ -4,7 +4,7 @@
 from LUIProgressbar import LUIProgressbar
 from LUISlider import LUISlider
 from LUILabel import LUILabel
-from panda3d.lui import LUIVerticalLayout
+from LUIVerticalLayout import LUIVerticalLayout
 
 import random
 

Demos/B_Radiobox.py

@@ -3,7 +3,7 @@
 from DemoFramework import DemoFramework
 from LUIRadiobox import LUIRadiobox
 from LUIRadioboxGroup import LUIRadioboxGroup
-from panda3d.lui import LUIVerticalLayout
+from LUIVerticalLayout import LUIVerticalLayout
 
 import random
 

Demos/B_Slider.py

@@ -3,7 +3,7 @@
 from DemoFramework import DemoFramework
 from LUISlider import LUISlider
 from LUILabel import LUILabel
-from panda3d.lui import LUIVerticalLayout
+from LUIVerticalLayout import LUIVerticalLayout
 
 import random
 

Demos/DemoFramework.py

@@ -11,8 +11,12 @@
 sys.path.insert(0, "../Builtin")
 
 from panda3d.core import *
-from panda3d.lui import LUIRegion, LUIInputHandler, LUISprite, LUIObject, LUIVerticalLayout
 
+from LUIRegion import LUIRegion
+from LUIInputHandler import LUIInputHandler
+from LUISprite import LUISprite
+from LUIObject import LUIObject
+from LUIVerticalLayout import LUIVerticalLayout
 from LUILabel import LUILabel
 from LUIFrame import LUIFrame
 

Tests/Test.py

@@ -19,7 +19,11 @@
     win-fixed-size #f
 """)
 
-from panda3d.lui import LUIRegion, LUIObject, LUIInputHandler, LUISprite, LUIVerticalLayout
+from LUIRegion import LUIRegion
+from LUIObject import LUIObject
+from LUIInputHandler import LUIInputHandler
+from LUISprite import LUISprite
+from LUIVerticalLayout import LUIVerticalLayout
 from LUISkin import LUIDefaultSkin
 from LUIFrame import LUIFrame
 from LUIFormattedLabel import LUIFormattedLabel

Tests/common.py

@@ -23,7 +23,10 @@
 
 import time
 from functools import wraps
-from panda3d.lui import LUIRegion, LUIObject, LUIInputHandler, LUISprite
+from LUIRegion import LUIRegion
+from LUIObject import LUIObject
+from LUIInputHandler import LUIInputHandler
+from LUISprite import LUISprite
 from LUISkin import LUIDefaultSkin
 from panda3d.lui import LUIVerticalLayout
 from LUIFrame import LUIFrame