Author: duncan
Date: Tue Aug 28 14:40:47 2007
New Revision: 9849
Log:
[ 1782837 ] some finetuning of the favorite handling
Patch from Tanja Kotthaus applied
Modified:
branches/rel-1/freevo/src/tv/favoriteitem.py
branches/rel-1/freevo/src/tv/programitem.py
Modified: branches/rel-1/freevo/src/tv/favoriteitem.py
==============================================================================
--- branches/rel-1/freevo/src/tv/favoriteitem.py (original)
+++ branches/rel-1/freevo/src/tv/favoriteitem.py Tue Aug 28 14:40:47 2007
@@ -84,9 +84,12 @@
# needed by the inputbox handler
self.menuw = None
+ self.red_action = (self.display_submenu,_('Edit favorite'))
+ self.green_action = (self.rem_favorite, _('Remove favorite'))
+
def actions(self):
- return [( self.display_submenu , _('Display favorite'))]
+ return [( self.display_submenu , _('Edit favorite'))]
def display_submenu(self, arg=None, menuw=None):
@@ -354,10 +357,11 @@
self.fav.allowDuplicates,
self.fav.onlyNew)
if result:
- self.fav_action = 'edit'
if menuw:
- # and reload the menu that we return to
- menuw.back_one_menu(arg='reload')
+ menuw.delete_submenu()
+ if self.fav_action == 'add':
+ menuw.refresh(reload=1)
+ self.fav_action = 'edit'
pop.destroy()
else:
pop.destroy()
@@ -377,8 +381,8 @@
if result:
# if this is successfull
if menuw:
- # reload the menu that we return to
- menuw.back_one_menu(arg='reload')
+ menuw.delete_submenu()
+ menuw.refresh(reload=1)
# and show a short message of success
msgtext = text=_('"%s" has been removed from favorites') % name
AlertBox(text=msgtext).show()
Modified: branches/rel-1/freevo/src/tv/programitem.py
==============================================================================
--- branches/rel-1/freevo/src/tv/programitem.py (original)
+++ branches/rel-1/freevo/src/tv/programitem.py Tue Aug 28 14:40:47 2007
@@ -258,10 +258,7 @@
Add a program to favorites
"""
if menuw:
- # we do not want to return to this menu,
- # if we delete it here, then later back_one_menu
- # brings us back to the tvguide
- menuw.delete_menu()
+ menuw.delete_submenu(refresh=False)
# create a favorite
fav = Favorite(self.title, self.prog,
True, True, True, -1, True, False)
@@ -276,10 +273,7 @@
Edit the settings of a favorite
"""
if menuw:
- # we do not want to return to this menu,
- # if we delete it here, then later back_one_menu
- # brings us back to the tvguide
- menuw.delete_menu()
+ menuw.delete_submenu(refresh=False)
# get the favorite from the record_client
(got_fav, fav) = record_client.getFavoriteObject(self.prog)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
