Cleanup repo

tobspr · Feb 6, 2016 · b66d524 · b66d524
1 parent 39da558
commit b66d524
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 53 deletions.
diff --git a/Builtin/LUILabel.py b/Builtin/LUILabel.py
@@ -8,6 +8,7 @@ class LUILabel(LUIObject):
 
     """ A simple label, displaying text. """
 
+    # Default variables which can be overridden by skins
     DEFAULT_COLOR = (0.9, 0.9, 0.9, 1)
     DEFAULT_USE_SHADOW = True
 
@@ -17,7 +18,7 @@ def __init__(self, text=u"Label", shadow=None, font_size=14, font="label", **kwa
         LUIObject.__init__(self)
         self._text = LUIText(self, unicode(text), font, font_size)
         self._text.z_offset = 1
-        self.color = self.DEFAULT_COLOR
+        self.color = LUILabel.DEFAULT_COLOR
         if shadow is None:
             shadow = LUILabel.DEFAULT_USE_SHADOW
         self._have_shadow = shadow

diff --git a/Builtin/LUILayouts.py b/Builtin/LUILayouts.py
@@ -1,33 +1,12 @@
 
 from __future__ import print_function, division
 
-from panda3d.lui import *
+from panda3d.lui import LUIObject, LUISprite, LUIHorizontalLayout
 from direct.directnotify.DirectNotify import DirectNotify
 
 from LUIInitialState import LUIInitialState
 
-__all__ = ["LUIBaseLayout",
-           "LUICornerLayout", "LUIHorizontalStretchedLayout"]
-
-class LUIBaseLayout(LUIObject):
-
-    """ Abstract class to supply a consistent interface for different layouts """
-
-    def add(self, *objects):
-        """ Use to add elements """
-        raise NotImplementedError()
-
-    def remove(self, index):
-        """ Use to delete cells """
-        raise NotImplementedError()
-
-    def reset(self):
-        """ Resets the layout, removing all components """
-        raise NotImplementedError()
-
-    def get(self, index):
-        """ Use to get an element """
-        raise NotImplementedError()
+__all__ = ["LUICornerLayout", "LUIHorizontalStretchedLayout"]
 
 class LUICornerLayout(LUIObject):
 
@@ -100,11 +79,11 @@ class LUIHorizontalStretchedLayout(LUIObject):
 
     def __init__(self, parent=None, prefix="ButtonDefault", **kwargs):
         LUIObject.__init__(self)
-        self._sprite_left = LUISprite(self, "blank", "skin")
-        self._sprite_mid = LUISprite(self, "blank", "skin")
-        self._sprite_right = LUISprite(self, "blank", "skin")
-        self._sprite_right.right = 0
-        self._sprite_mid.left = 0
+        self._layout = LUIHorizontalLayout(self, spacing=0)
+        self._layout.width = "100%"
+        self._sprite_left = LUISprite(self._layout.cell(), "blank", "skin")
+        self._sprite_mid = LUISprite(self._layout.cell('*'), "blank", "skin")
+        self._sprite_right = LUISprite(self._layout.cell(), "blank", "skin")
         if parent is not None:
             self.parent = parent
         self.prefix = prefix
@@ -115,8 +94,6 @@ def set_prefix(self, prefix):
         self._sprite_left.set_texture(prefix + "_Left", "skin")
         self._sprite_mid.set_texture(prefix, "skin")
         self._sprite_right.set_texture(prefix + "_Right", "skin")
-        self._sprite_mid.margin = (0, self._sprite_right.width, 0, self._sprite_left.width)
-
         self._sprite_mid.width = "100%"
         self._prefix = prefix
 

diff --git a/Demos/DemoFramework.py b/Demos/DemoFramework.py
@@ -38,7 +38,7 @@ class DemoFramework:
 
     def __init__(self):
 
-        if True:
+        if False:
             self._skin = LUIMetroSkin()
             base.win.set_clear_color(Vec4(1))
         else:

diff --git a/Misc/Button.psd b/Misc/Button.psd
diff --git a/Misc/Button2.psd b/Misc/Button2.psd
diff --git a/Builtin/res/Draft3.psd → Misc/Draft3.psd b/Builtin/res/Draft3.psd → Misc/Draft3.psd
diff --git a/Misc/GenerateDemoTextures.py b/Misc/GenerateDemoTextures.py
diff --git a/Misc/Superflat.psd → Misc/Metro.psd b/Misc/Superflat.psd → Misc/Metro.psd
diff --git a/Misc/btn_gray.png b/Misc/btn_gray.png
diff --git a/Misc/btn_green.png b/Misc/btn_green.png
diff --git a/Misc/btn_green/ButtonMagic_BL.png b/Misc/btn_green/ButtonMagic_BL.png
diff --git a/Misc/btn_green/ButtonMagic_BR.png b/Misc/btn_green/ButtonMagic_BR.png
diff --git a/Misc/btn_green/ButtonMagic_Bottom.png b/Misc/btn_green/ButtonMagic_Bottom.png
diff --git a/Misc/btn_green/ButtonMagic_Left.png b/Misc/btn_green/ButtonMagic_Left.png
diff --git a/Misc/btn_green/ButtonMagic_Mid.png b/Misc/btn_green/ButtonMagic_Mid.png
diff --git a/Misc/btn_green/ButtonMagic_Right.png b/Misc/btn_green/ButtonMagic_Right.png
diff --git a/Misc/btn_green/ButtonMagic_TL.png b/Misc/btn_green/ButtonMagic_TL.png
diff --git a/Misc/btn_green/ButtonMagic_TR.png b/Misc/btn_green/ButtonMagic_TR.png
diff --git a/Misc/btn_green/ButtonMagic_Top.png b/Misc/btn_green/ButtonMagic_Top.png
diff --git a/Misc/btn_green_focus.png b/Misc/btn_green_focus.png
diff --git a/Misc/popup.png b/Misc/popup.png
diff --git a/Misc/sunkenFrame.png b/Misc/sunkenFrame.png
diff --git a/Misc/window_bg.png b/Misc/window_bg.png