Author: duncan
Date: Thu Jan 10 15:48:49 2008
New Revision: 10279
Log:
[ 1868478 ] models.py move_{up,down,left,right}
Patch from Alberto González RodrĂguez added
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/skin/models.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/skin/models.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Thu Jan 10 15:48:49 2008
@@ -27,6 +27,7 @@
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
+ * Updated skin code to wrap around when possible (F#1868478)
* Updated shut down to allow single key confirmation (F#1857456)
* Updated web server fileinfo module to display watched/keep status
(F#1857392)
* Updated xine tv plug-in to show OSD messages (F#1861772)
Modified: branches/rel-1-7/freevo/src/skin/models.py
==============================================================================
--- branches/rel-1-7/freevo/src/skin/models.py (original)
+++ branches/rel-1-7/freevo/src/skin/models.py Thu Jan 10 15:48:49 2008
@@ -98,7 +98,7 @@
def layout(self, width, height, font):
"""
- Layout the text into lines/pages based on the width,height and font
+ Layout the text into lines/pages based on the width, height and font
supplied.
"""
self.first_line_index = 0
@@ -301,12 +301,25 @@
Select the button above the currently selected button.
"""
if self.selected_row == 0:
- return False
- for r in range(self.selected_row-1, -1, -1):
+ for r in range(-1, self.rows * -1, -1):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = self.rows+r
+ self.selected_button =
self.buttons[r][self.selected_column]
+ return True
+ for r in range(self.selected_row-1, -1, -1):
if self.buttons[r][self.selected_column]:
self.selected_row = r
self.selected_button = self.buttons[r][self.selected_column]
return True
+
+ for r in range(-1, self.rows * -1, -1):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = self.rows+r
+ self.selected_button = self.buttons[r][self.selected_column]
+ return True
+
+
+
return False
@@ -315,12 +328,22 @@
Select the button below the currently selected button.
"""
if self.selected_row + 1 == self.rows:
- return False
+ for r in range(0, self.rows):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = r
+ self.selected_button =
self.buttons[r][self.selected_column]
+ return True
for r in range(self.selected_row+1, self.rows):
if self.buttons[r][self.selected_column]:
self.selected_row = r
self.selected_button = self.buttons[r][self.selected_column]
return True
+
+ for r in range(0, self.rows):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = r
+ self.selected_button = self.buttons[r][self.selected_column]
+ return True
return False
@@ -329,8 +352,13 @@
Select the button to the left of the currently selected button.
"""
if self.selected_column == 0:
- return False
- for c in range(self.selected_column - 1, -1, -1):
+ for c in range(-1, self.columns * -1, -1):
+ if self.buttons[self.selected_row][c]:
+ self.selected_column = self.columns+c
+ self.selected_button = self.buttons[self.selected_row][c]
+ return True
+
+ for c in range(self.selected_column - 1, -1, -1):
if self.buttons[self.selected_row][c]:
self.selected_column = c
self.selected_button = self.buttons[self.selected_row][c]
@@ -343,12 +371,21 @@
Select the button to the right of the currently selected button.
"""
if self.selected_column + 1 == self.columns:
- return False
- for c in range(self.selected_column + 1, self.columns):
+ for c in range(0, self.columns, 1):
+ if self.buttons[self.selected_row][c]:
+ self.selected_column = c
+ self.selected_button = self.buttons[self.selected_row][c]
+ return True
+ for c in range(self.selected_column + 1, self.columns):
if self.buttons[self.selected_row][c]:
self.selected_column = c
self.selected_button = self.buttons[self.selected_row][c]
return True
+ for c in range(0, self.columns, 1):
+ if self.buttons[self.selected_row][c]:
+ self.selected_column = c
+ self.selected_button = self.buttons[self.selected_row][c]
+ return True
return False
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Thu Jan 10 15:48:49 2008
@@ -30,6 +30,7 @@
* Updated re-encode plug-in and encoding core with additional features
(F#1868764)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
+ * Updated skin code to wrap around when possible (F#1868478)
* Updated shut down to allow single key confirmation (F#1857456)
* Updated web server fileinfo module to display watched/keep status
(F#1857392)
* Updated xine tv plug-in to show OSD messages (F#1861772)
Modified: branches/rel-1/freevo/src/skin/models.py
==============================================================================
--- branches/rel-1/freevo/src/skin/models.py (original)
+++ branches/rel-1/freevo/src/skin/models.py Thu Jan 10 15:48:49 2008
@@ -100,7 +100,7 @@
def layout(self, width, height, font):
"""
- Layout the text into lines/pages based on the width,height and font
+ Layout the text into lines/pages based on the width, height and font
supplied.
"""
self.first_line_index = 0
@@ -303,12 +303,25 @@
Select the button above the currently selected button.
"""
if self.selected_row == 0:
- return False
- for r in range(self.selected_row-1, -1, -1):
+ for r in range(-1, self.rows * -1, -1):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = self.rows+r
+ self.selected_button =
self.buttons[r][self.selected_column]
+ return True
+ for r in range(self.selected_row-1, -1, -1):
if self.buttons[r][self.selected_column]:
self.selected_row = r
self.selected_button = self.buttons[r][self.selected_column]
return True
+
+ for r in range(-1, self.rows * -1, -1):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = self.rows+r
+ self.selected_button = self.buttons[r][self.selected_column]
+ return True
+
+
+
return False
@@ -317,12 +330,22 @@
Select the button below the currently selected button.
"""
if self.selected_row + 1 == self.rows:
- return False
+ for r in range(0, self.rows):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = r
+ self.selected_button =
self.buttons[r][self.selected_column]
+ return True
for r in range(self.selected_row+1, self.rows):
if self.buttons[r][self.selected_column]:
self.selected_row = r
self.selected_button = self.buttons[r][self.selected_column]
return True
+
+ for r in range(0, self.rows):
+ if self.buttons[r][self.selected_column]:
+ self.selected_row = r
+ self.selected_button = self.buttons[r][self.selected_column]
+ return True
return False
@@ -331,8 +354,13 @@
Select the button to the left of the currently selected button.
"""
if self.selected_column == 0:
- return False
- for c in range(self.selected_column - 1, -1, -1):
+ for c in range(-1, self.columns * -1, -1):
+ if self.buttons[self.selected_row][c]:
+ self.selected_column = self.columns+c
+ self.selected_button = self.buttons[self.selected_row][c]
+ return True
+
+ for c in range(self.selected_column - 1, -1, -1):
if self.buttons[self.selected_row][c]:
self.selected_column = c
self.selected_button = self.buttons[self.selected_row][c]
@@ -345,12 +373,21 @@
Select the button to the right of the currently selected button.
"""
if self.selected_column + 1 == self.columns:
- return False
- for c in range(self.selected_column + 1, self.columns):
+ for c in range(0, self.columns, 1):
+ if self.buttons[self.selected_row][c]:
+ self.selected_column = c
+ self.selected_button = self.buttons[self.selected_row][c]
+ return True
+ for c in range(self.selected_column + 1, self.columns):
if self.buttons[self.selected_row][c]:
self.selected_column = c
self.selected_button = self.buttons[self.selected_row][c]
return True
+ for c in range(0, self.columns, 1):
+ if self.buttons[self.selected_row][c]:
+ self.selected_column = c
+ self.selected_button = self.buttons[self.selected_row][c]
+ return True
return False
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
