From 2842a126445e9a3e44ab44f378eb95ceef312e33 Mon Sep 17 00:00:00 2001
From: Sergio Costas <raster@rastersoft.com>
Date: Sun, 29 Jan 2017 21:35:33 +0100
Subject: [PATCH] Allows to translate and personalize the Play all text in the
 dvd menu

---
 HISTORY.md               |  2 ++
 data/interface/wmenu.ui  | 50 +++++++++++++++++++++++++---------------
 setup.py                 |  2 +-
 src/devedeng/avconv.py   |  2 +-
 src/devedeng/dvd_menu.py | 12 +++++++---
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 5a22e4b..5db6d1d 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,6 @@
 ## History of versions ##
+* version 4.8.7 (2017-01-29)
+  * Allows to translate the "Play all" text in the DVD menu
 * version 4.8.6 (2016-12-14)
   * Now ensures that the average bitrate is never smaller than the minimum bitrate
   * Now the matroska and divx files have the right extension
diff --git a/data/interface/wmenu.ui b/data/interface/wmenu.ui
index 464a1bf..739d830 100644
--- a/data/interface/wmenu.ui
+++ b/data/interface/wmenu.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="margin_bottom">
@@ -471,7 +471,6 @@
                                 <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>
@@ -486,7 +485,6 @@
                                 <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>
                                 <property name="group">left</property>
@@ -502,7 +500,6 @@
                                 <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>
                                 <property name="group">left</property>
@@ -610,7 +607,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Font:</property>
-                                    <property name="xalign">1</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -648,7 +644,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Unselected titles:</property>
-                                    <property name="xalign">1</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -660,7 +655,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Shadows:</property>
-                                    <property name="xalign">1</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -672,7 +666,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Selected title:</property>
-                                    <property name="xalign">1</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -684,7 +677,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Background color:</property>
-                                    <property name="xalign">1</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
@@ -785,13 +777,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">start</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="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -801,7 +793,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="xalign">0</property>
+                                <property name="halign">start</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">menu_show_at_startup</property>
@@ -813,13 +805,35 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="play_all_c">
-                                <property name="label" translatable="yes">Provide "Play All" option</property>
+                              <object class="GtkBox">
                                 <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="can_focus">False</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="play_all_c">
+                                    <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="halign">start</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="GtkEntry" id="playall_text">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
diff --git a/setup.py b/setup.py
index 8dd20d8..3422398 100755
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ except:
 setup(
     name='devedeng',
 
-    version='4.8.6',
+    version='4.8.7',
 
     description='A video DVD creator',
     long_description="A program that allows to create video DVDs",
diff --git a/src/devedeng/avconv.py b/src/devedeng/avconv.py
index ea0275a..731db06 100644
--- a/src/devedeng/avconv.py
+++ b/src/devedeng/avconv.py
@@ -482,7 +482,7 @@ class avconv(devedeng.avbase.avbase):
 
         if file_project.two_pass_encoding == True:
             self.command_var.append("-passlogfile")
-            self.command_var.append(output_file)
+            self.command_var.append(output_file + ".passlog")
             self.command_var.append("-pass")
             if pass2:
                 self.command_var.append("2")
diff --git a/src/devedeng/dvd_menu.py b/src/devedeng/dvd_menu.py
index fdda9e2..c5ed5d3 100644
--- a/src/devedeng/dvd_menu.py
+++ b/src/devedeng/dvd_menu.py
@@ -50,6 +50,8 @@ class dvd_menu(devedeng.interface_manager.interface_manager):
 
         self.add_text("title_text", None, self.update_preview)
 
+        self.add_text("playall_text", _("Play all"), self.update_preview)
+
         self.add_group("position_horizontal", [
                        "left", "center", "right"], "center", self.update_preview)
         self.add_group("at_startup", [
@@ -415,15 +417,19 @@ class dvd_menu(devedeng.interface_manager.interface_manager):
 
         if (self.play_all_c):
             coordinates.append([xl, y - height, xr, y + height, "play_all"])
+            if self.playall_text == "":
+                playalltext = "Play all"
+            else:
+                playalltext = self.playall_text
             if paint_background:
                 self.paint_base(xl, xr, y, 0)
-                self.write_text("Play All", "menu_entry", xl,
+                self.write_text(playalltext, "menu_entry", xl,
                                 xr, y, self.position_horizontal)
             if paint_selected:
-                self.write_text("Play All", "menu_entry_selected",
+                self.write_text(playalltext, "menu_entry_selected",
                                 xl, xr, y, self.position_horizontal)
             if paint_activated:
-                self.write_text("Play All", "menu_entry_activated",
+                self.write_text(playalltext, "menu_entry_activated",
                                 xl, xr, y, self.position_horizontal)
             y += entry_height