Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2684
Modified Files:
menu.py
Log Message:
fixed some navigating bugs
Index: menu.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/menu.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** menu.py 30 Mar 2003 17:00:00 -0000 1.28
--- menu.py 30 Mar 2003 19:10:32 -0000 1.29
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.29 2003/03/30 19:10:32 dischi
+ # fixed some navigating bugs
+ #
# Revision 1.28 2003/03/30 17:00:00 dischi
# removed debug (again)
***************
*** 427,432 ****
if self.cols == 1:
curr_selected = self.rows - 1
! else:
curr_selected = self.all_items.index(menu.selected)
except ValueError:
curr_selected += self.cols
--- 430,437 ----
if self.cols == 1:
curr_selected = self.rows - 1
! elif self.rows != 1:
curr_selected = self.all_items.index(menu.selected)
+ else:
+ curr_selected+=self.cols
except ValueError:
curr_selected += self.cols
***************
*** 438,448 ****
curr_selected = self.all_items.index(menu.selected)
if curr_selected+self.cols > len(self.all_items)-1 and \
! (self.cols > 1 or config.NEW_SKIN):
self.goto_next_page(arg='no_refresh')
try:
if self.cols == 1:
curr_selected = 0
! else:
curr_selected = self.all_items.index(menu.selected)
except ValueError:
curr_selected -= self.cols
--- 443,457 ----
curr_selected = self.all_items.index(menu.selected)
if curr_selected+self.cols > len(self.all_items)-1 and \
! (self.cols > 1 or config.NEW_SKIN) and \
! menu.page_start + len(self.all_items) < len(menu.choices):
!
self.goto_next_page(arg='no_refresh')
try:
if self.cols == 1:
curr_selected = 0
! elif self.rows != 1:
curr_selected = self.all_items.index(menu.selected)
+ else:
+ curr_selected-=self.cols
except ValueError:
curr_selected -= self.cols
***************
*** 462,465 ****
--- 471,476 ----
try:
curr_selected = self.all_items.index(menu.selected)
+ if self.rows == 1:
+ curr_selected = len(self.all_items)
except ValueError:
curr_selected += self.cols
***************
*** 491,496 ****
--- 502,510 ----
try:
curr_selected = self.all_items.index(menu.selected)
+ if self.rows == 1:
+ curr_selected -= 1
except ValueError:
curr_selected -= self.cols
+
curr_selected = min(curr_selected+1, len(self.all_items)-1)
menu.selected = self.all_items[curr_selected]
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
