From a9b8d4bb2b6bd45c75281d85f54f6c607f7b9500 Mon Sep 17 00:00:00 2001 From: glenntanner3 Date: Tue, 28 Apr 2015 16:04:32 -0400 Subject: [PATCH] Update UI to include a 'Play All' option.Add 'play_all' group for UI.Pass 'play_all_opt' to dvdauthor. --- data/interface/wmenu.ui | 92 +++++++++++++++++++++++++---- src/devedeng/dvd_menu.py | 1 + src/devedeng/dvdauthor_converter.py | 2 +- src/devedeng/project.py | 6 +- 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/data/interface/wmenu.ui b/data/interface/wmenu.ui index 543e3d1..df2ee93 100644 --- a/data/interface/wmenu.ui +++ b/data/interface/wmenu.ui @@ -39,7 +39,6 @@ True center False - False True @@ -75,8 +74,8 @@ True False - 1 Text: + 1 0 @@ -87,8 +86,8 @@ True False - 1 Font: + 1 0 @@ -99,8 +98,8 @@ True False - 1 Text color: + 1 2 @@ -111,8 +110,8 @@ True False - 1 Shadow color: + 1 2 @@ -170,8 +169,8 @@ True False - 1 Vertical position (percent): + 1 0 @@ -196,8 +195,8 @@ True False - 1 Horizontal position (percent): + 1 0 @@ -610,8 +609,8 @@ True False - 1 Font: + 1 False @@ -648,8 +647,8 @@ True False - 1 Unselected titles: + 1 0 @@ -660,8 +659,8 @@ True False - 1 Shadows: + 1 0 @@ -672,8 +671,8 @@ True False - 1 Selected title: + 1 2 @@ -684,8 +683,8 @@ True False - 1 Background color: + 1 2 @@ -832,6 +831,73 @@ 5 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + Provide "Play All" option + True + True + False + 0 + True + True + + + False + True + 0 + + + + + Don't provide "Play All" option + True + True + False + 0 + True + menu_play_all + + + False + True + 1 + + + + + + + + + True + False + <b>Play all option</b> + True + + + + + False + True + 6 + + True @@ -920,7 +986,7 @@ False True - 6 + 7 diff --git a/src/devedeng/dvd_menu.py b/src/devedeng/dvd_menu.py index 4a8c1d1..f35f0e5 100644 --- a/src/devedeng/dvd_menu.py +++ b/src/devedeng/dvd_menu.py @@ -47,6 +47,7 @@ class dvd_menu(devedeng.interface_manager.interface_manager): self.add_group("position_horizontal", ["left", "center", "right"], "center", self.update_preview) self.add_group("at_startup", ["menu_show_at_startup", "play_first_title_at_startup"], "menu_show_at_startup") + self.add_group("play_all", ["menu_play_all", "menu_no_play_all"], "menu_play_all") self.add_integer_adjustment("sound_length", 30) diff --git a/src/devedeng/dvdauthor_converter.py b/src/devedeng/dvdauthor_converter.py index 03c4590..17b1270 100644 --- a/src/devedeng/dvdauthor_converter.py +++ b/src/devedeng/dvdauthor_converter.py @@ -29,7 +29,7 @@ class dvdauthor_converter(devedeng.executor.executor): self.config = devedeng.configuration_data.configuration.get_config() - def create_dvd_project (self, path, name, file_movies, menu_entries, start_with_menu): + def create_dvd_project (self, path, name, file_movies, menu_entries, start_with_menu, play_all_opt): movie_path = os.path.join(path,"dvd_tree") try: diff --git a/src/devedeng/project.py b/src/devedeng/project.py index dd792be..6b525d9 100644 --- a/src/devedeng/project.py +++ b/src/devedeng/project.py @@ -525,8 +525,12 @@ class devede_project: start_with_menu = True else: start_with_menu = False + if (self.menu.play_all == "menu_show_at_startup"): + play_all_opt = True + else: + play_all_opt = False dvdauthor = devedeng.dvdauthor_converter.dvdauthor_converter() - dvdauthor.create_dvd_project(data.path, data.name, file_movies, menu_entries, start_with_menu) + dvdauthor.create_dvd_project(data.path, data.name, file_movies, menu_entries, start_with_menu, play_all_opt) # dvdauthor must wait until all the files have been converted for element in final_dependencies: dvdauthor.add_dependency(element)