*** empty log message ***

This commit is contained in:
gregw 2001-03-21 23:50:58 +00:00
parent 1ffab2faf6
commit 84a5eadefc
2 changed files with 31 additions and 18 deletions

View File

@ -18,14 +18,26 @@ class ScrollingLabel(PandaObject.PandaObject):
scale = 0.1, scale = 0.1,
width = None, width = None,
drawOrder = getDefaultDrawOrder(), drawOrder = getDefaultDrawOrder(),
font = getDefaultFont()): font = getDefaultFont(),
showLabels = 1):
self.name = name self.name = name
if (label == None):
self.label = self.name
else:
self.label = label
self.eventName = self.name self.eventName = self.name
self.frame = Frame.Frame(name) self.frame = Frame.Frame(name)
self.frame.setOffset(0.015) self.frame.setOffset(0.015)
self.item = 0 self.item = 0
self.items = itemList 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 self.keyFocus = 1
if width == None: if width == None:
@ -38,11 +50,11 @@ class ScrollingLabel(PandaObject.PandaObject):
width = max(width, w) width = max(width, w)
# create the new title # 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) scale, width, drawOrder, font)
self.frame.addItem(self.title) self.frame.addItem(self.title)
self.itemSign = Sign.Sign('item', '', Label.ScrollItem, self.itemSign = Sign.Sign('item', itemString, Label.ScrollItem,
scale, width, drawOrder, font) scale, width, drawOrder, font)
self.frame.addItem(self.itemSign) self.frame.addItem(self.itemSign)
@ -73,13 +85,6 @@ class ScrollingLabel(PandaObject.PandaObject):
self.frame.packItem(self.rightButton, GuiFrame.GuiFrame.RIGHT, self.frame.packItem(self.rightButton, GuiFrame.GuiFrame.RIGHT,
self.title) 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 # set list to first element
self.setItem(self.item) self.setItem(self.item)
@ -114,8 +119,9 @@ class ScrollingLabel(PandaObject.PandaObject):
def setTitle(self, name): def setTitle(self, name):
self.name = name self.name = name
self.title.setText(name) if (self.showLabels):
self.frame.recompute() self.title.setText(name)
self.frame.recompute()
def getItemSign(self): def getItemSign(self):
return self.itemSign return self.itemSign
@ -125,7 +131,8 @@ class ScrollingLabel(PandaObject.PandaObject):
def setItem(self, item): def setItem(self, item):
self.item = item self.item = item
self.itemSign.setText(self.items[self.item]) if (self.showLabels):
self.itemSign.setText(self.items[self.item])
def getEventName(self): def getEventName(self):
return self.eventName return self.eventName
@ -148,20 +155,26 @@ class ScrollingLabel(PandaObject.PandaObject):
self.frame.recompute() self.frame.recompute()
self.frame.thaw() self.frame.thaw()
def setWidth(self, width):
self.frame.freeze()
self.itemSign.setWidth(width)
self.frame.recompute()
self.frame.thaw()
def getKeyFocus(self): def getKeyFocus(self):
return self.keyFocus return self.keyFocus
def setKeyFocus(self, focus): def setKeyFocus(self, focus):
self.keyFocus = focus self.keyFocus = focus
if (focus == 1): if (focus == 1):
# ignore keyboard hits # remove old keyboard hooks
self.ignore("left-up") self.ignore("left-up")
self.ignore("right-up") self.ignore("right-up")
# listen for keyboard hits # listen for new keyboard hits
self.accept("left-up", self.handleLeftArrow) self.accept("left-up", self.handleLeftArrow)
self.accept("right-up", self.handleRightArrow) self.accept("right-up", self.handleRightArrow)
else: else:
# ignore keyboard hits # remove keyboard hooks
self.ignore("left-up") self.ignore("left-up")
self.ignore("right-up") self.ignore("right-up")

View File

@ -17,9 +17,9 @@ class Sign(DirectObject):
self.name = name self.name = name
self.labelText = None self.labelText = None
if not label: if (label == None):
label = self.name label = self.name
if (type(label) == type('')): if (type(label) == type('')):
(self.label, self.labelText) = \ (self.label, self.labelText) = \
Label.textLabelAndText(label, style, Label.textLabelAndText(label, style,