luna/devedeng-extended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update UI to include a 'Play All' option.Add 'play_all' group for UI.Pass 'play_all_opt' to dvdauthor.

Browse source
This commit is contained in:
glenntanner3 2015-04-28 16:04:32 -04:00
parent db0156a460
commit a9b8d4bb2b
4 changed files with 86 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

92
data/interface/wmenu.ui
View file

@ -39,7 +39,6 @@
<property name="modal">True</property>
<property name="window_position">center</property>
<property name="deletable">False</property>
<property name="has_resize_grip">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
@ -75,8 +74,8 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Text:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -87,8 +86,8 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Font:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -99,8 +98,8 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Text color:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@ -111,8 +110,8 @@
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Shadow color:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@ -170,8 +169,8 @@
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Vertical position (percent):</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -196,8 +195,8 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Horizontal position (percent):</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -610,8 +609,8 @@
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Font:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@ -648,8 +647,8 @@
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Unselected titles:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -660,8 +659,8 @@
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Shadows:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -672,8 +671,8 @@
<object class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Selected title:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@ -684,8 +683,8 @@
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Background color:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">2</property>
@ -832,6 +831,73 @@
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="menu_play_all">
<property name="label" translatable="yes">Provide "Play All" option</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="menu_no_play_all">
<property name="label" translatable="yes">Don't provide "Play All" option</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">menu_play_all</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Play all option&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame_preview_controls">
<property name="visible">True</property>
@ -920,7 +986,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
<property name="position">7</property>
</packing>
</child>
</object>

1
src/devedeng/dvd_menu.py
View file

@ -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)

2
src/devedeng/dvdauthor_converter.py
View file

@ -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:

6
src/devedeng/project.py
View file

@ -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)