Author: duncan
Date: Sun Feb 10 07:01:21 2008
New Revision: 10357

Log:
[ 1890499 ] dvdbackup configurable menu
Patch from George Kibardin applied


Modified:
   branches/rel-1-7/freevo/ChangeLog
   branches/rel-1-7/freevo/Docs/CREDITS
   branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py
   branches/rel-1/freevo/ChangeLog
   branches/rel-1/freevo/Docs/CREDITS
   branches/rel-1/freevo/src/video/plugins/dvdbackup.py

Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog   (original)
+++ branches/rel-1-7/freevo/ChangeLog   Sun Feb 10 07:01:21 2008
@@ -17,6 +17,7 @@
 --------------------------------
 
  * New placement support when using xrandr (F#1869969)
+ * Updated dvdbackup to allow customized menus (F#1890499)
  * Updated playlist to process "#EXTINF" comments in m3u files (F#1890203)
  * Updated Russian translation (B#1889826)
  * Updated tv guide with scheduled to record and favorite icons (F#1886621)

Modified: branches/rel-1-7/freevo/Docs/CREDITS
==============================================================================
--- branches/rel-1-7/freevo/Docs/CREDITS        (original)
+++ branches/rel-1-7/freevo/Docs/CREDITS        Sun Feb 10 07:01:21 2008
@@ -66,6 +66,13 @@
 Occasional contributors:
 ------------------------
 
+Stephan Roolvink <live_kenny at hotmail.com>
+o Tux n' Tosh TV skin
+
+George Kibardin <george-kibardin at yandex.ru>
+o Russian translation updates
+o Fixes to cdbackup
+
 Michael Beal <mlbeal2003 at yahoo.com>
 o irsend_directv plug-in
 o Various fixes

Modified: branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py      (original)
+++ branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py      Sun Feb 10 
07:01:21 2008
@@ -78,20 +78,25 @@
         return []
 
     def encoding_profile_menu(self, menuw=None, arg=None):
-        #create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
-        #args : tuple, (videocodec, size, multipass
-        menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job, 
(2,700,False,0)) ]
-        menu_items.append( menu.MenuItem("XviD, 700mb, High Quality", 
self.create_job, (2,700,True,0)) )
-        menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job, 
(2,1400,False,0)) )
-        menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality", 
self.create_job, (2,1400,True,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 700mb", self.create_job, 
(0,700,False,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 700mb, High Quality", 
self.create_job, (0,700,True,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 1400mb", self.create_job, 
(0,1400,False,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 1400mb, High Quality", 
self.create_job, (0,1400,True,0)) )
-        menu_items.append( menu.MenuItem("h.264, 700mb", self.create_job, 
(3,700,False,0)) )
-        menu_items.append( menu.MenuItem("h.264, 700mb, High Quality", 
self.create_job, (3,700,True,0)) )
-        menu_items.append( menu.MenuItem("h.264, 1400mb", self.create_job, 
(3,1400,False,0)) )
-        menu_items.append( menu.MenuItem("h.264, 1400mb, High Quality", 
self.create_job, (3,1400,True,0)) )
+        if config.DVD_BACKUP_MENU:
+            menu_items = []
+            for menu_item in config.DVD_BACKUP_MENU:
+                menu_items.append(menu.MenuItem(menu_item[0], self.create_job, 
menu_item[1]))
+        else:
+            #create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
+            #args : tuple, (videocodec, size, multipass
+            menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job, 
(2,700,False,0)) ]
+            menu_items.append( menu.MenuItem("XviD, 700mb, High Quality", 
self.create_job, (2,700,True,0)) )
+            menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job, 
(2,1400,False,0)) )
+            menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality", 
self.create_job, (2,1400,True,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 700mb", self.create_job, 
(0,700,False,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 700mb, High Quality", 
self.create_job, (0,700,True,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 1400mb", self.create_job, 
(0,1400,False,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 1400mb, High Quality", 
self.create_job, (0,1400,True,0)) )
+            menu_items.append( menu.MenuItem("h.264, 700mb", self.create_job, 
(3,700,False,0)) )
+            menu_items.append( menu.MenuItem("h.264, 700mb, High Quality", 
self.create_job, (3,700,True,0)) )
+            menu_items.append( menu.MenuItem("h.264, 1400mb", self.create_job, 
(3,1400,False,0)) )
+            menu_items.append( menu.MenuItem("h.264, 1400mb, High Quality", 
self.create_job, (3,1400,True,0)) )
 
         encoding_menu = menu.Menu(_('Choose your encoding profile'), 
menu_items)
         menuw.pushmenu(encoding_menu)

Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog     (original)
+++ branches/rel-1/freevo/ChangeLog     Sun Feb 10 07:01:21 2008
@@ -20,6 +20,7 @@
 --------------------------------
 
  * New placement support when using xrandr (F#1869969)
+ * Updated dvdbackup to allow customized menus (F#1890499)
  * Updated playlist to process "#EXTINF" comments in m3u files (F#1890203)
  * Updated Russian translation (B#1889826)
  * Updated tv guide with scheduled to record and favorite icons (F#1886621)

Modified: branches/rel-1/freevo/Docs/CREDITS
==============================================================================
--- branches/rel-1/freevo/Docs/CREDITS  (original)
+++ branches/rel-1/freevo/Docs/CREDITS  Sun Feb 10 07:01:21 2008
@@ -66,6 +66,13 @@
 Occasional contributors:
 ------------------------
 
+Stephan Roolvink <live_kenny at hotmail.com>
+o Tux n' Tosh TV skin
+
+George Kibardin <george-kibardin at yandex.ru>
+o Russian translation updates
+o Fixes to cdbackup
+
 Michael Beal <mlbeal2003 at yahoo.com>
 o irsend_directv plug-in
 o Various fixes
@@ -82,6 +89,7 @@
 Alberto González Rodríguez <alberto at pesadilla.org>
 o YouTube video plug-in
 o flickr image plug-in
+o Various fixes
 
 Michel Lespinasse <walken at zoy.org>
 o Various fixes

Modified: branches/rel-1/freevo/src/video/plugins/dvdbackup.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/dvdbackup.py        (original)
+++ branches/rel-1/freevo/src/video/plugins/dvdbackup.py        Sun Feb 10 
07:01:21 2008
@@ -78,20 +78,25 @@
         return []
 
     def encoding_profile_menu(self, menuw=None, arg=None):
-        #create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
-        #args : tuple, (videocodec, size, multipass
-        menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job, 
(2,700,False,0)) ]
-        menu_items.append( menu.MenuItem("XviD, 700mb, High Quality", 
self.create_job, (2,700,True,0)) )
-        menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job, 
(2,1400,False,0)) )
-        menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality", 
self.create_job, (2,1400,True,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 700mb", self.create_job, 
(0,700,False,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 700mb, High Quality", 
self.create_job, (0,700,True,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 1400mb", self.create_job, 
(0,1400,False,0)) )
-        menu_items.append( menu.MenuItem("MPEG4, 1400mb, High Quality", 
self.create_job, (0,1400,True,0)) )
-        menu_items.append( menu.MenuItem("h.264, 700mb", self.create_job, 
(3,700,False,0)) )
-        menu_items.append( menu.MenuItem("h.264, 700mb, High Quality", 
self.create_job, (3,700,True,0)) )
-        menu_items.append( menu.MenuItem("h.264, 1400mb", self.create_job, 
(3,1400,False,0)) )
-        menu_items.append( menu.MenuItem("h.264, 1400mb, High Quality", 
self.create_job, (3,1400,True,0)) )
+        if config.DVD_BACKUP_MENU:
+            menu_items = []
+            for menu_item in config.DVD_BACKUP_MENU:
+                menu_items.append(menu.MenuItem(menu_item[0], self.create_job, 
menu_item[1]))
+        else:
+            #create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
+            #args : tuple, (videocodec, size, multipass
+            menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job, 
(2,700,False,0)) ]
+            menu_items.append( menu.MenuItem("XviD, 700mb, High Quality", 
self.create_job, (2,700,True,0)) )
+            menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job, 
(2,1400,False,0)) )
+            menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality", 
self.create_job, (2,1400,True,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 700mb", self.create_job, 
(0,700,False,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 700mb, High Quality", 
self.create_job, (0,700,True,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 1400mb", self.create_job, 
(0,1400,False,0)) )
+            menu_items.append( menu.MenuItem("MPEG4, 1400mb, High Quality", 
self.create_job, (0,1400,True,0)) )
+            menu_items.append( menu.MenuItem("h.264, 700mb", self.create_job, 
(3,700,False,0)) )
+            menu_items.append( menu.MenuItem("h.264, 700mb, High Quality", 
self.create_job, (3,700,True,0)) )
+            menu_items.append( menu.MenuItem("h.264, 1400mb", self.create_job, 
(3,1400,False,0)) )
+            menu_items.append( menu.MenuItem("h.264, 1400mb, High Quality", 
self.create_job, (3,1400,True,0)) )
 
         encoding_menu = menu.Menu(_('Choose your encoding profile'), 
menu_items)
         menuw.pushmenu(encoding_menu)

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to