From 84a5eadefc0bf115e01338d610683485d122e1f8 Mon Sep 17 00:00:00 2001
From: gregw <>
Date: Wed, 21 Mar 2001 23:50:58 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/gui/ScrollingLabel.py | 45 ++++++++++++++++++++------------
 direct/src/gui/Sign.py           |  4 +--
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/direct/src/gui/ScrollingLabel.py b/direct/src/gui/ScrollingLabel.py
index ac36ec4062..f24c76dbf0 100644
--- a/direct/src/gui/ScrollingLabel.py
+++ b/direct/src/gui/ScrollingLabel.py
@@ -18,14 +18,26 @@ class ScrollingLabel(PandaObject.PandaObject):
                  scale = 0.1,
                  width = None,
                  drawOrder = getDefaultDrawOrder(),
-                 font = getDefaultFont()):
+                 font = getDefaultFont(),
+                 showLabels = 1):
 
         self.name = name
+        if (label == None):
+            self.label = self.name
+        else:
+            self.label = label
         self.eventName = self.name
         self.frame = Frame.Frame(name)
         self.frame.setOffset(0.015)
         self.item = 0
         self.items = itemList
+        self.showLabels = showLabels
+        if (showLabels):
+            # we'll need a card to add text to later
+            itemString = " "
+        else:
+            # no card needed
+            itemString = ""
         self.keyFocus = 1
 
         if width == None:
@@ -38,11 +50,11 @@ class ScrollingLabel(PandaObject.PandaObject):
                 width = max(width, w)
 
         # create the new title
-        self.title = Sign.Sign(self.name, self.name, Label.ScrollTitle,
+        self.title = Sign.Sign(self.name, self.label, Label.ScrollTitle,
                                scale, width, drawOrder, font)
         self.frame.addItem(self.title)
                 
-        self.itemSign = Sign.Sign('item', '', Label.ScrollItem,
+        self.itemSign = Sign.Sign('item', itemString, Label.ScrollItem,
                                   scale, width, drawOrder, font)
         self.frame.addItem(self.itemSign)
             
@@ -73,13 +85,6 @@ class ScrollingLabel(PandaObject.PandaObject):
         self.frame.packItem(self.rightButton, GuiFrame.GuiFrame.RIGHT,
                             self.title)        
 
-        # listen for the scroll buttons
-        #self.accept(self.eventName + "-left", self.handleLeftButton)
-        #self.accept(self.eventName + "-right", self.handleRightButton)
-        
-        # listen for keyboard hits
-        #self.setKeyFocus(0)
-
         # set list to first element
         self.setItem(self.item)
         
@@ -114,8 +119,9 @@ class ScrollingLabel(PandaObject.PandaObject):
 
     def setTitle(self, name):
         self.name = name
-        self.title.setText(name)
-        self.frame.recompute()
+        if (self.showLabels):
+            self.title.setText(name)
+            self.frame.recompute()
 
     def getItemSign(self):
         return self.itemSign
@@ -125,7 +131,8 @@ class ScrollingLabel(PandaObject.PandaObject):
 
     def setItem(self, item):
         self.item = item
-        self.itemSign.setText(self.items[self.item])
+        if (self.showLabels):
+            self.itemSign.setText(self.items[self.item])
         
     def getEventName(self):
         return self.eventName
@@ -148,20 +155,26 @@ class ScrollingLabel(PandaObject.PandaObject):
         self.frame.recompute()
         self.frame.thaw()
 
+    def setWidth(self, width):
+        self.frame.freeze()
+        self.itemSign.setWidth(width)
+        self.frame.recompute()
+        self.frame.thaw()
+        
     def getKeyFocus(self):
         return self.keyFocus
 
     def setKeyFocus(self, focus):
         self.keyFocus = focus
         if (focus == 1):
-            # ignore keyboard hits
+            # remove old keyboard hooks
             self.ignore("left-up")
             self.ignore("right-up")            
-            # listen for keyboard hits
+            # listen for new keyboard hits
             self.accept("left-up", self.handleLeftArrow)
             self.accept("right-up", self.handleRightArrow)
         else:
-            # ignore keyboard hits
+            # remove keyboard hooks
             self.ignore("left-up")
             self.ignore("right-up")
         
diff --git a/direct/src/gui/Sign.py b/direct/src/gui/Sign.py
index 5a8ce9a89e..dfaef775b4 100644
--- a/direct/src/gui/Sign.py
+++ b/direct/src/gui/Sign.py
@@ -17,9 +17,9 @@ class Sign(DirectObject):
         self.name = name
         self.labelText = None
         
-        if not label:
+        if (label == None):
             label = self.name
-                
+
         if (type(label) == type('')):
             (self.label, self.labelText) = \
                          Label.textLabelAndText(label, style,