Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv6331
Modified Files:
LetterBox.py ListBox.py RegionScroller.py
Log Message:
Fixes for event changes.
Index: LetterBox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/LetterBox.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LetterBox.py 21 May 2003 00:04:25 -0000 1.11
--- LetterBox.py 2 Jun 2003 03:28:41 -0000 1.12
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2003/06/02 03:28:41 rshortt
+ # Fixes for event changes.
+ #
# Revision 1.11 2003/05/21 00:04:25 rshortt
# General improvements to layout and drawing.
***************
*** 79,82 ****
--- 82,86 ----
import pygame, string
import config
+ import event as em
from GUIObject import Align
***************
*** 107,120 ****
phoneChars = {
! 1 : ["1"],
! 2 : ["2", "A", "B", "C"],
! 3 : ["3", "D", "E", "F"],
! 4 : ["4", "G", "H", "I"],
! 5 : ["5", "J", "K", "L"],
! 6 : ["6", "M", "N", "O"],
! 7 : ["7", "P", "Q", "R", "S"],
! 8 : ["8", "T", "U", "V"],
! 9 : ["9", "W", "X", "Y", "Z"],
! 0 : ["0", "-", ".", " "],
}
--- 111,124 ----
phoneChars = {
! em.INPUT_1.name : ["1"],
! em.INPUT_2.name : ["2", "A", "B", "C"],
! em.INPUT_3.name : ["3", "D", "E", "F"],
! em.INPUT_4.name : ["4", "G", "H", "I"],
! em.INPUT_5.name : ["5", "J", "K", "L"],
! em.INPUT_6.name : ["6", "M", "N", "O"],
! em.INPUT_7.name : ["7", "P", "Q", "R", "S"],
! em.INPUT_8.name : ["8", "T", "U", "V"],
! em.INPUT_9.name : ["9", "W", "X", "Y", "Z"],
! em.INPUT_0.name : ["0", "-", ".", " "],
}
Index: ListBox.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/ListBox.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ListBox.py 27 May 2003 17:53:34 -0000 1.15
--- ListBox.py 2 Jun 2003 03:28:41 -0000 1.16
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.16 2003/06/02 03:28:41 rshortt
+ # Fixes for event changes.
+ #
# Revision 1.15 2003/05/27 17:53:34 dischi
# Added new event handler module
***************
*** 156,163 ****
if DEBUG: print 'listbox scroll: direction="%s"' % direction
! if direction == "RIGHT" or direction == "LEFT":
return RegionScroller.scroll(self, direction)
! elif direction == "DOWN":
i = self.get_selected_index()
--- 159,166 ----
if DEBUG: print 'listbox scroll: direction="%s"' % direction
! if direction in (em.INPUT_RIGHT, em.INPUT_LEFT):
return RegionScroller.scroll(self, direction)
! elif direction == em.INPUT_DOWN:
i = self.get_selected_index()
***************
*** 171,175 ****
return RegionScroller.scroll(self, direction)
! elif direction == "UP":
i = self.get_selected_index()
--- 174,178 ----
return RegionScroller.scroll(self, direction)
! elif direction == em.INPUT_UP:
i = self.get_selected_index()
***************
*** 183,189 ****
return RegionScroller.scroll(self, direction)
- # self.draw()
- # self.osd.update()
-
def get_selected_index(self):
--- 186,189 ----
***************
*** 296,301 ****
--- 296,303 ----
def eventhandler(self, event):
+ if DEBUG: print 'ListBox::eventhandler: event=%s' % event
if event in (em.INPUT_UP, em.INPUT_DOWN, em.INPUT_LEFT, em.INPUT_RIGHT ):
+ if DEBUG: print 'ListBox::eventhandler: should scroll'
self.scroll(event)
self.parent.draw()
Index: RegionScroller.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/RegionScroller.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RegionScroller.py 27 May 2003 17:53:34 -0000 1.13
--- RegionScroller.py 2 Jun 2003 03:28:41 -0000 1.14
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.14 2003/06/02 03:28:41 rshortt
+ # Fixes for event changes.
+ #
# Revision 1.13 2003/05/27 17:53:34 dischi
# Added new event handler module
***************
*** 199,218 ****
if DEBUG: print 'scrolldir: direction="%s"' % direction
! if direction == "RIGHT":
new_x = self.v_x + self.x_scroll_interval
if new_x > self.max_x_offset:
new_x = self.max_x_offset
self.v_x = new_x
! elif direction == "LEFT":
new_x = self.v_x - self.x_scroll_interval
if new_x < 0:
new_x = 0
self.v_x = new_x
! elif direction == "DOWN":
new_y = self.v_y + self.y_scroll_interval
if new_y > self.max_y_offset:
new_y = self.max_y_offset
self.v_y = new_y
! elif direction == "UP":
new_y = self.v_y - self.y_scroll_interval
if new_y < 0:
--- 202,221 ----
if DEBUG: print 'scrolldir: direction="%s"' % direction
! if direction == em.INPUT_RIGHT:
new_x = self.v_x + self.x_scroll_interval
if new_x > self.max_x_offset:
new_x = self.max_x_offset
self.v_x = new_x
! elif direction == em.INPUT_LEFT:
new_x = self.v_x - self.x_scroll_interval
if new_x < 0:
new_x = 0
self.v_x = new_x
! elif direction == em.INPUT_DOWN:
new_y = self.v_y + self.y_scroll_interval
if new_y > self.max_y_offset:
new_y = self.max_y_offset
self.v_y = new_y
! elif direction == em.INPUT_UP:
new_y = self.v_y - self.y_scroll_interval
if new_y < 0:
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
