Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215
Modified Files:
edit_favorite.py program_display.py program_search.py
view_favorites.py
Log Message:
update to new gui code
Index: edit_favorite.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/edit_favorite.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edit_favorite.py 9 Jan 2004 19:35:49 -0000 1.7
--- edit_favorite.py 18 Feb 2004 21:55:11 -0000 1.8
***************
*** 10,13 ****
--- 10,16 ----
#-----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2004/02/18 21:55:11 dischi
+ # update to new gui code
+ #
# Revision 1.7 2004/01/09 19:35:49 outlyer
# Inherit DEBUG parameter from config, move some prints into DEBUG
***************
*** 117,121 ****
! PopupBox.__init__(self, text=_('Edit Favorite'), left=left, top=top,
width=width,
height=height)
--- 120,124 ----
! PopupBox.__init__(self, text=_('Edit Favorite'), x=left, y=top, width=width,
height=height)
***************
*** 239,277 ****
def eventhandler(self, event, menuw=None):
#print 'SELECTED CHILD: %s' % self.get_selected_child()
if self.get_selected_child() == self.name_input:
if event == em.INPUT_LEFT:
self.name_input.change_selected_box('left')
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_RIGHT:
self.name_input.change_selected_box('right')
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_ENTER:
self.name_input.get_selected_box().toggle_selected()
self.chan_box.toggle_selected()
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_UP:
self.name_input.get_selected_box().charUp()
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_DOWN:
self.name_input.get_selected_box().charDown()
self.draw()
! self.osd.update(self.get_rect())
! return
elif event in em.INPUT_ALL_NUMBERS:
self.name_input.get_selected_box().cycle_phone_char(event)
self.draw()
! self.osd.update(self.get_rect())
! return
elif event == em.INPUT_EXIT:
self.destroy()
! return
elif self.get_selected_child() == self.chan_box:
--- 242,275 ----
def eventhandler(self, event, menuw=None):
#print 'SELECTED CHILD: %s' % self.get_selected_child()
+
if self.get_selected_child() == self.name_input:
if event == em.INPUT_LEFT:
self.name_input.change_selected_box('left')
self.draw()
! return True
elif event == em.INPUT_RIGHT:
self.name_input.change_selected_box('right')
self.draw()
! return True
elif event == em.INPUT_ENTER:
self.name_input.get_selected_box().toggle_selected()
self.chan_box.toggle_selected()
self.draw()
! return True
elif event == em.INPUT_UP:
self.name_input.get_selected_box().charUp()
self.draw()
! return True
elif event == em.INPUT_DOWN:
self.name_input.get_selected_box().charDown()
self.draw()
! return True
elif event in em.INPUT_ALL_NUMBERS:
self.name_input.get_selected_box().cycle_phone_char(event)
self.draw()
! return True
elif event == em.INPUT_EXIT:
self.destroy()
! return True
elif self.get_selected_child() == self.chan_box:
***************
*** 294,300 ****
elif event == em.INPUT_EXIT:
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
elif self.get_selected_child() == self.dow_box:
--- 292,296 ----
elif event == em.INPUT_EXIT:
self.destroy()
! return True
elif self.get_selected_child() == self.dow_box:
***************
*** 316,322 ****
elif event == em.INPUT_EXIT:
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
elif self.get_selected_child() == self.tod_box:
--- 312,317 ----
elif event == em.INPUT_EXIT:
self.destroy()
! return True
! return True
elif self.get_selected_child() == self.tod_box:
***************
*** 338,344 ****
elif event == em.INPUT_EXIT:
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
elif self.get_selected_child() == self.save:
--- 333,338 ----
elif event == em.INPUT_EXIT:
self.destroy()
! return True
! return True
elif self.get_selected_child() == self.save:
***************
*** 359,363 ****
else:
AlertBox(parent=self, text=_('Failed: %s') % msg).show()
! return
elif event in (em.INPUT_LEFT, em.MENU_PAGEUP):
self.save.toggle_selected()
--- 353,357 ----
else:
AlertBox(parent=self, text=_('Failed: %s') % msg).show()
! return True
elif event in (em.INPUT_LEFT, em.MENU_PAGEUP):
self.save.toggle_selected()
***************
*** 373,379 ****
elif event == em.INPUT_EXIT:
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
elif self.get_selected_child() == self.remove:
--- 367,372 ----
elif event == em.INPUT_EXIT:
self.destroy()
! return True
! return True
elif self.get_selected_child() == self.remove:
***************
*** 381,385 ****
ConfirmBox(text=_('Do you want to remove %s?') %
self.name_input.get_word(),
handler=self.removeFavorite).show()
! return
elif event in (em.INPUT_LEFT, em.MENU_PAGEUP):
self.save.toggle_selected()
--- 374,378 ----
ConfirmBox(text=_('Do you want to remove %s?') %
self.name_input.get_word(),
handler=self.removeFavorite).show()
! return True
elif event in (em.INPUT_LEFT, em.MENU_PAGEUP):
self.save.toggle_selected()
***************
*** 392,398 ****
elif event in (em.INPUT_ENTER, em.INPUT_EXIT):
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
elif self.get_selected_child() == self.cancel:
--- 385,390 ----
elif event in (em.INPUT_ENTER, em.INPUT_EXIT):
self.destroy()
! return True
! return True
elif self.get_selected_child() == self.cancel:
***************
*** 406,416 ****
elif event in (em.INPUT_ENTER, em.INPUT_EXIT):
self.destroy()
! return
! self.osd.update(self.get_rect())
! return
if event == em.INPUT_EXIT:
self.destroy()
! return
else:
return self.parent.eventhandler(event)
--- 398,411 ----
elif event in (em.INPUT_ENTER, em.INPUT_EXIT):
self.destroy()
! return True
! return True
if event == em.INPUT_EXIT:
self.destroy()
! return True
! elif event in (em.MENU_PAGEDOWN, em.MENU_PAGEUP):
! return True
else:
return self.parent.eventhandler(event)
+
+
Index: program_display.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** program_display.py 9 Jan 2004 02:10:00 -0000 1.24
--- program_display.py 18 Feb 2004 21:55:11 -0000 1.25
***************
*** 10,13 ****
--- 10,16 ----
#-----------------------------------------------------------------------
# $Log$
+ # Revision 1.25 2004/02/18 21:55:11 dischi
+ # update to new gui code
+ #
# Revision 1.24 2004/01/09 02:10:00 rshortt
# Patch from Matthieu Weber to revive add/edit favorites support from the
***************
*** 136,146 ****
self.context = 'guide'
! PopupBox.__init__(self, parent=parent, text=self.prog.title, left=left,
! top=top, width=width, height=height,
vertical_expansion=vertical_expansion)
- if not height:
- self.height = self.osd.height - (2 * config.OSD_OVERSCAN_Y) - 100
-
self.v_spacing = 15
self.h_margin = 20
--- 139,146 ----
self.context = 'guide'
! PopupBox.__init__(self, parent=parent, text=self.prog.title, x=left,
! y=top, width=width, height=height,
vertical_expansion=vertical_expansion)
self.v_spacing = 15
self.h_margin = 20
***************
*** 211,222 ****
- # layout the box to get top and height values
- self.layout()
-
# correct height and top
! if not height:
! self.height = self.layout_manager.needed_space + 2 * self.v_margin
! if not top:
! self.top = self.osd.height/2 - self.height/2
def eventhandler(self, event, menuw=None):
--- 211,221 ----
# correct height and top
! self.content.layout()
! needed_height = self.content.layout_manager.needed_space + 2 * self.v_margin
!
! if needed_height > self.height:
! self.set_size(self.width, needed_height)
!
def eventhandler(self, event, menuw=None):
***************
*** 348,354 ****
text = _('Scheduled Recordings')
! PopupBox.__init__(self, parent, text, handler, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width,
! vertical_expansion)
self.result = False
--- 347,352 ----
text = _('Scheduled Recordings')
! PopupBox.__init__(self, text, handler, left, top, width, height,
! icon, vertical_expansion, parent=parent)
self.result = False
Index: program_search.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/program_search.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** program_search.py 16 Nov 2003 17:38:48 -0000 1.11
--- program_search.py 18 Feb 2004 21:55:11 -0000 1.12
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2004/02/18 21:55:11 dischi
+ # update to new gui code
+ #
# Revision 1.11 2003/11/16 17:38:48 dischi
# i18n patch from David Sagnol
***************
*** 18,34 ****
# Moving tv_util from src/tv/ to src/util/.
#
- # Revision 1.9 2003/09/07 11:18:27 dischi
- # many optical improvements
- #
- # Revision 1.8 2003/09/05 02:48:12 rshortt
- # Removing src/tv and src/www from PYTHONPATH in the freevo script. Therefore any
module that was imported from src/tv/ or src/www that didn't have a leading 'tv.' or
'www.' needed it added. Also moved tv/tv.py to tv/tvmenu.py to avoid namespace
conflicts.
- #
- # Revision 1.7 2003/09/01 19:46:03 dischi
- # add menuw to eventhandler, it may be needed
- #
- # Revision 1.6 2003/08/23 12:51:43 dischi
- # removed some old CVS log messages
- #
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 21,24 ----
***************
*** 96,102 ****
text = _('Program Search')
! PopupBox.__init__(self, parent, text, handler, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width,
! vertical_expansion)
(self.server_available, msg) = record_client.connectionTest()
--- 86,91 ----
text = _('Program Search')
! PopupBox.__init__(self, text, handler, left, top, width, height,
! icon, vertical_expansion, parent=parent)
(self.server_available, msg) = record_client.connectionTest()
***************
*** 136,140 ****
if result:
! if DEBUG: print 'FOUND: %s' % len(matches)
i = 0
self.results.items = []
--- 125,131 ----
if result:
! if DEBUG:
! print 'FOUND: %s' % len(matches)
!
i = 0
self.results.items = []
***************
*** 173,208 ****
self.lbg.change_selected_box('left')
self.draw()
- self.osd.update(self.get_rect())
return
elif event == em.INPUT_RIGHT:
self.lbg.change_selected_box('right')
self.draw()
- self.osd.update(self.get_rect())
return
elif event == em.INPUT_ENTER:
self.searchProg(self.lbg.get_word())
self.draw()
- self.osd.update(self.get_rect())
return
elif event == em.INPUT_UP:
self.lbg.get_selected_box().charUp()
self.draw()
- self.osd.update(self.get_rect())
return
elif event == em.INPUT_DOWN:
self.lbg.get_selected_box().charDown()
self.draw()
- self.osd.update(self.get_rect())
return
elif event == em.MENU_PAGEDOWN:
self.lbg.get_selected_box().toggle_selected()
self.results.toggle_selected_index(0)
self.draw()
- self.osd.update(self.get_rect())
return
elif event in em.INPUT_ALL_NUMBERS:
self.lbg.get_selected_box().cycle_phone_char(event)
self.draw()
- self.osd.update(self.get_rect())
return
--- 164,198 ----
self.lbg.change_selected_box('left')
self.draw()
return
+
elif event == em.INPUT_RIGHT:
self.lbg.change_selected_box('right')
self.draw()
return
+
elif event == em.INPUT_ENTER:
self.searchProg(self.lbg.get_word())
self.draw()
return
+
elif event == em.INPUT_UP:
self.lbg.get_selected_box().charUp()
self.draw()
return
+
elif event == em.INPUT_DOWN:
self.lbg.get_selected_box().charDown()
self.draw()
return
+
elif event == em.MENU_PAGEDOWN:
self.lbg.get_selected_box().toggle_selected()
self.results.toggle_selected_index(0)
self.draw()
return
+
elif event in em.INPUT_ALL_NUMBERS:
self.lbg.get_selected_box().cycle_phone_char(event)
self.draw()
return
***************
*** 210,219 ****
if event == em.INPUT_UP or event == em.INPUT_DOWN:
return self.results.eventhandler(event)
elif event in (em.INPUT_LEFT, em.INPUT_RIGHT, em.MENU_PAGEUP):
self.results.get_selected_child().toggle_selected()
self.lbg.boxes[0].toggle_selected()
self.draw()
- self.osd.update(self.get_rect())
return
elif event == em.INPUT_ENTER:
prog = self.results.get_selected_child().value
--- 200,210 ----
if event == em.INPUT_UP or event == em.INPUT_DOWN:
return self.results.eventhandler(event)
+
elif event in (em.INPUT_LEFT, em.INPUT_RIGHT, em.MENU_PAGEUP):
self.results.get_selected_child().toggle_selected()
self.lbg.boxes[0].toggle_selected()
self.draw()
return
+
elif event == em.INPUT_ENTER:
prog = self.results.get_selected_child().value
Index: view_favorites.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/view_favorites.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** view_favorites.py 9 Jan 2004 06:36:53 -0000 1.7
--- view_favorites.py 18 Feb 2004 21:55:11 -0000 1.8
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2004/02/18 21:55:11 dischi
+ # update to new gui code
+ #
# Revision 1.7 2004/01/09 06:36:53 outlyer
# Fix a crash; I don't know if Python 2.2 is more forgiving about the types,
***************
*** 91,96 ****
text = _('View Favorites')
! PopupBox.__init__(self, parent, text, handler, left, top, width, height,
! bg_color, fg_color, icon, border, bd_color, bd_width)
(self.server_available, msg) = record_client.connectionTest()
--- 94,99 ----
text = _('View Favorites')
! PopupBox.__init__(self, text, handler, left, top, width, height,
! icon, parent=parent)
(self.server_available, msg) = record_client.connectionTest()
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
