LinGui: add option for title numbers to

automatically generated destination names

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2095 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 3e10696c14e551171a9f10f79bd9da14bd20ab20..6d745ed419c08b1a058a5b90ce2302e7662259e5 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -245,33 +245,45 @@ set_destination(signal_user_data_t *ud)
        g_debug("set_destination");
        if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
        {
+               GString *str = g_string_new("");
                gchar *vol_name, *filename, *extension;
                gchar *new_name;
+               gint title;
                
                filename = ghb_settings_get_string(ud->settings, "dest_file");
                extension = ghb_settings_get_string(ud->settings, "FileFormat");
                vol_name = ghb_settings_get_string(ud->settings, "volume_label");
-               if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
+               g_string_append_printf(str, "%s", vol_name);
+               title = ghb_settings_combo_int(ud->settings, "title");
+               if (title >= 0)
                {
-                       gint start, end;
-
-                       start = ghb_settings_get_int(ud->settings, "start_chapter");
-                       end = ghb_settings_get_int(ud->settings, "end_chapter");
-                       if (start == end)
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "title_no_in_destination"))
                        {
-                               new_name = g_strdup_printf("%s-%d.%s", 
-                                       vol_name, start, extension);
+
+                               title = ghb_settings_combo_int(ud->settings, "title");
+                               g_string_append_printf(str, " - %d", title+1);
                        }
-                       else
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "chapters_in_destination"))
                        {
-                               new_name = g_strdup_printf("%s-%d-%d.%s", 
-                                       vol_name, start, end, extension);
+                               gint start, end;
+
+                               if (!ghb_settings_get_boolean(
+                                               ud->settings, "title_no_in_destination"))
+                               {
+                                       g_string_append_printf(str, " -");
+                               }
+                               start = ghb_settings_get_int(ud->settings, "start_chapter");
+                               end = ghb_settings_get_int(ud->settings, "end_chapter");
+                               if (start == end)
+                                       g_string_append_printf(str, " Ch %d", start);
+                               else
+                                       g_string_append_printf(str, " Ch %d-%d", start, end);
                        }
                }
-               else
-               {
-                       new_name = g_strdup_printf("%s.%s", vol_name, extension);
-               }
+               g_string_append_printf(str, ".%s", extension);
+               new_name = g_string_free(str, FALSE);
                ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
                g_free(filename);
                g_free(extension);
@@ -1041,6 +1053,10 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
 
        ghb_set_preview_image (ud);
+       if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
+       {
+               set_destination(ud);
+       }
 }
 
 void

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 9d69a29e40c53f85f24748a16d75aef48c6878f6..aa5b29df7200a5e30251a2960a2ffbe543672fee 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -373,7 +373,7 @@
     <signal handler="window_destroy_event_cb" name="destroy_event"/>
     <signal handler="window_delete_event_cb" name="delete_event"/>
     <child>
-      <object class="GtkVBox" id="vbox_j1">
+      <object class="GtkVBox" id="vbox48">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
@@ -516,7 +516,7 @@
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
                             <child>
-                              <object class="GtkHBox" id="hbox2">
+                              <object class="GtkHBox" id="hbox54">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="spacing">5</property>
@@ -706,7 +706,7 @@
                         <property name="top_padding">6</property>
                         <property name="bottom_padding">6</property>
                         <child>
-                          <object class="GtkHBox" id="hbox_j4">
+                          <object class="GtkHBox" id="hbox67">
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
                             <child>
@@ -771,7 +771,7 @@
                                   <object class="GtkHBox" id="hbox3">
                                     <property name="visible">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="label27">
+                                      <object class="GtkLabel" id="label45">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">Container:</property>
                                       </object>
@@ -888,13 +888,13 @@
                     <property name="spacing">3</property>
 
                     <child>
-                      <object class="GtkAlignment" id="alignment_a">
+                      <object class="GtkAlignment" id="alignment55">
                         <property name="visible">True</property>
                         <property name="top_padding">10</property>
                         <property name="left_padding">10</property>
 
                     <child>
-                      <object class="GtkVBox" id="vbox5">
+                      <object class="GtkVBox" id="vbox43">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                        <property name="spacing">14</property>
@@ -949,7 +949,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label24">
+                                          <object class="GtkLabel" id="label42">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -980,7 +980,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label25">
+                                          <object class="GtkLabel" id="label43">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -1011,7 +1011,7 @@
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="label26">
+                              <object class="GtkLabel" id="label44">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Source Picture Parameters&lt;/b&gt;</property>
@@ -1039,11 +1039,11 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox6">
+                                  <object class="GtkVBox" id="vbox44">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox54">
+                                      <object class="GtkHBox" id="hbox61">
                                         <property name="visible">True</property>
                                         <child>
                                           <object class="GtkLabel" id="label13">
@@ -1146,17 +1146,17 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox7">
+                          <object class="GtkVBox" id="vbox45">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkFrame" id="frame3">
+                              <object class="GtkFrame" id="frame16">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment7">
+                                  <object class="GtkAlignment" id="alignment20">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="top_padding">6</property>
@@ -1164,7 +1164,7 @@
                                     <property name="left_padding">12</property>
                                     <property name="right_padding">2</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox8">
+                                      <object class="GtkVBox" id="vbox46">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1193,7 +1193,7 @@
                                           </object>
                                         </child>
                                         <child>
-                                          <object class="GtkHBox" id="hbox26">
+                                          <object class="GtkHBox" id="hbox68">
                                             <property name="visible">True</property>
                                             <child>
                                               <object class="GtkLabel" id="label15">
@@ -1221,7 +1221,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHBox" id="hbox27">
+                                          <object class="GtkHBox" id="hbox69">
                                             <property name="visible">True</property>
                                             <child>
                                               <object class="GtkLabel" id="label17">
@@ -1281,7 +1281,7 @@
                     </child>
 
                     <child>
-                      <object class="GtkAlignment" id="alignment_b">
+                      <object class="GtkAlignment" id="alignment56">
                         <property name="visible">True</property>
                         <property name="right_padding">10</property>
 
@@ -1290,7 +1290,7 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <object class="GtkLabel" id="label8">
+                          <object class="GtkLabel" id="label73">
                             <property name="visible">True</property>
                           </object>
                           <packing>
@@ -1408,7 +1408,7 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
                     <child>
-                      <object class="GtkVBox" id="vbox_j18">
+                      <object class="GtkVBox" id="vbox47">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
@@ -1434,7 +1434,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label28">
+                                          <object class="GtkLabel" id="label46">
                                             <property name="visible">True</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Video Codec:</property>
@@ -1472,7 +1472,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label29">
+                                          <object class="GtkLabel" id="label47">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -1543,7 +1543,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox20">
+                                      <object class="GtkHBox" id="hbox62">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1585,7 +1585,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox21">
+                                      <object class="GtkHBox" id="hbox56">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1628,7 +1628,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox22">
+                                      <object class="GtkHBox" id="hbox57">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1717,7 +1717,7 @@
                   </object>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="label32">
+                  <object class="GtkLabel" id="label65">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Video</property>
                   </object>
@@ -1750,7 +1750,7 @@
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="spacing">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox23">
+                                  <object class="GtkHBox" id="hbox58">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">5</property>
@@ -1842,7 +1842,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkTable" id="table2">
+                                  <object class="GtkTable" id="table1">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="n_rows">2</property>
@@ -1898,7 +1898,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="label36">
+                                      <object class="GtkLabel" id="label68">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="label" translatable="yes">Codec</property>
@@ -1911,7 +1911,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="label37">
+                                      <object class="GtkLabel" id="label69">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="label" translatable="yes">Bitrate</property>
@@ -2008,18 +2008,18 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hboxj01">
+                      <object class="GtkHBox" id="hbox63">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">5</property>
                         <child>
-                          <object class="GtkFrame" id="framej01">
+                          <object class="GtkFrame" id="frame18">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkAlignment" id="alignmentj01">
+                              <object class="GtkAlignment" id="alignment57">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="top_padding">6</property>
@@ -2027,7 +2027,7 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hboxj02">
+                                  <object class="GtkHBox" id="hbox64">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">5</property>
@@ -2045,7 +2045,7 @@
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="labelj01">
+                              <object class="GtkLabel" id="label74">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Preferred Audio Language&lt;/b&gt;</property>
@@ -2055,13 +2055,13 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="framej02">
+                          <object class="GtkFrame" id="frame19">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkAlignment" id="alignmentj02">
+                              <object class="GtkAlignment" id="alignment58">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="top_padding">6</property>
@@ -2069,7 +2069,7 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hboxj03">
+                                  <object class="GtkHBox" id="hbox65">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">5</property>
@@ -2101,7 +2101,7 @@
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="labelj02">
+                              <object class="GtkLabel" id="label75">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">&lt;b&gt;Subtitles&lt;/b&gt;</property>
@@ -2438,7 +2438,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVSeparator" id="vseparator_j3">
+                      <object class="GtkVSeparator" id="vseparator1">
                         <property name="visible">True</property>
                       </object>
                       <packing>
@@ -2606,7 +2606,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment34">
+                                          <object class="GtkAlignment" id="alignment37">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -3132,10 +3132,10 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkHBox" id="hbox24">
+          <object class="GtkHBox" id="hbox59">
             <property name="visible">True</property>
             <child>
-              <object class="GtkVBox" id="vbox19">
+              <object class="GtkVBox" id="vbox20">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEventBox" id="eventbox1">
@@ -3164,11 +3164,11 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
             </child>
 
                 <child>
-                  <object class="GtkAlignment" id="alignment6">
+                  <object class="GtkAlignment" id="alignment22">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox29">
+                      <object class="GtkVBox" id="vbox42">
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkCheckButton" id="use_source_name">
@@ -3181,19 +3181,56 @@ label.</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
                         </child>
+
                         <child>
-                          <object class="GtkCheckButton" id="chapters_in_destination">
+                          <object class="GtkAlignment" id="alignment6">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text">Add chapter numbers to the 
+                            <property name="left_padding">18</property>
+                            <child>
+                              <object class="GtkVBox" id="vbox29">
+                                <property name="visible">True</property>
+
+                                <child>
+                                  <object class="GtkCheckButton" id="chapters_in_destination">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text">Add chapter numbers to the 
 auto-generated destination name.</property>
-                            <property name="label" translatable="yes">Add chapters to destination name</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="pref_changed_cb"/>
+                                    <property name="label" translatable="yes">Add chapters to destination name</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="title_no_in_destination">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text">Add title number to the 
+auto-generated destination name.</property>
+                                    <property name="label" translatable="yes">Add title # to destination name</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
-                            <property name="position">1</property>
+                              <property name="expand">False</property>
+                              <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -3208,6 +3245,7 @@ non-hidef screens.  </property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -3225,6 +3263,7 @@ the required multiple.</property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -3244,6 +3283,7 @@ this setting.</property>
                             <signal name="toggled" handler="vcodec_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">4</property>
                           </packing>
                         </child>
@@ -3260,16 +3300,17 @@ location as the movie.</property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">5</property>
                           </packing>
                         </child>
 
                         <child>
-                          <object class="GtkAlignment" id="alignment_j6">
+                          <object class="GtkAlignment" id="alignment50">
                             <property name="visible">True</property>
                             <property name="left_padding">4</property>
                             <child>
-                              <object class="GtkHBox" id="hbox_j3">
+                              <object class="GtkHBox" id="hbox66">
                                 <property name="visible">True</property>
                                 <child>
                                   <object class="GtkSpinButton" id="preview_count">
@@ -3287,7 +3328,7 @@ location as the movie.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="label_j3">
+                                  <object class="GtkLabel" id="label77">
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes"> Number of previews </property>
@@ -3302,16 +3343,17 @@ location as the movie.</property>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">6</property>
                           </packing>
                         </child>
 
                         <child>
-                          <object class="GtkAlignment" id="alignment_j6">
+                          <object class="GtkAlignment" id="alignment51">
                             <property name="visible">True</property>
                             <property name="left_padding">4</property>
                             <child>
-                              <object class="GtkHBox" id="hbox1">
+                              <object class="GtkHBox" id="hbox50">
                                 <property name="visible">True</property>
                                 <property name="spacing">4</property>
                                 <child>
@@ -3339,6 +3381,7 @@ location as the movie.</property>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">7</property>
                           </packing>
                         </child>
@@ -3351,6 +3394,7 @@ location as the movie.</property>
                             <signal name="toggled" handler="tweaks_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">8</property>
                           </packing>
                         </child>
@@ -3362,6 +3406,7 @@ location as the movie.</property>
                             <signal name="toggled" handler="hbfd_feature_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">9</property>
                           </packing>
                         </child>
@@ -3875,11 +3920,11 @@ location as the movie.</property>
         <property name="visible">True</property>
         <property name="spacing">4</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox40">
             <property name="visible">True</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkAlignment" id="alignment_j1">
+              <object class="GtkAlignment" id="alignment52">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="xscale">0</property>
@@ -3900,13 +3945,13 @@ location as the movie.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment_j2">
+              <object class="GtkAlignment" id="alignment53">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="left_padding">10</property>
                 <property name="right_padding">10</property>
                 <child>
-                  <object class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox70">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <child>
@@ -3945,7 +3990,7 @@ location as the movie.</property>
                       <object class="GtkVBox" id="live_progress_box">
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkLabel" id="label4">
+                          <object class="GtkLabel" id="label71">
                             <property name="height_request">1</property>
                             <property name="visible">True</property>
                           </object>
@@ -3965,7 +4010,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label5">
+                          <object class="GtkLabel" id="label72">
                             <property name="height_request">1</property>
                             <property name="visible">True</property>
                           </object>
@@ -4031,7 +4076,7 @@ location as the movie.</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox28">
+                      <object class="GtkHBox" id="hbox60">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
@@ -4077,7 +4122,7 @@ location as the movie.</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVSeparator" id="vseparator_j3">
+          <object class="GtkVSeparator" id="vseparator2">
             <property name="visible">True</property>
           </object>
           <packing>
@@ -4087,7 +4132,7 @@ location as the movie.</property>
         </child>
 
         <child>
-          <object class="GtkAlignment" id="alignment_j7">
+          <object class="GtkAlignment" id="alignment54">
             <property name="visible">True</property>
             <property name="top_padding">6</property>
             <property name="bottom_padding">6</property>
@@ -4114,7 +4159,7 @@ location as the movie.</property>
                         <property name="n_rows">5</property>
                         <property name="n_columns">5</property>
                         <child>
-                          <object class="GtkLabel" id="label19">
+                          <object class="GtkLabel" id="label20">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Left</property>
@@ -4127,7 +4172,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label23">
+                          <object class="GtkLabel" id="label41">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="yalign">1</property>
@@ -4350,7 +4395,7 @@ location as the movie.</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">2</property>
                         <child>
-                          <object class="GtkHBox" id="hbox17">
+                          <object class="GtkHBox" id="hbox51">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">4</property>
@@ -4410,7 +4455,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox18">
+                          <object class="GtkHBox" id="hbox71">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
@@ -4433,7 +4478,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox19">
+                          <object class="GtkHBox" id="hbox72">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
@@ -4529,13 +4574,13 @@ location as the movie.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame5">
+              <object class="GtkFrame" id="frame17">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment5">
+                  <object class="GtkAlignment" id="alignment8">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="top_padding">6</property>
@@ -4595,7 +4640,7 @@ location as the movie.</property>
                           <object class="GtkHBox" id="hbox21">
                             <property name="visible">True</property>
                             <child>
-                              <object class="GtkLabel" id="label30">
+                              <object class="GtkLabel" id="label56">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Deblock:</property>
@@ -4607,7 +4652,7 @@ location as the movie.</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="alignment6">
+                              <object class="GtkAlignment" id="alignment14">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="xscale">0.55000001192092896</property>
@@ -4731,7 +4776,7 @@ location as the movie.</property>
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkLabel" id="label33">
+                  <object class="GtkLabel" id="label66">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">&lt;b&gt;Filters&lt;/b&gt;</property>
@@ -5029,10 +5074,10 @@ libxvidcore authors:
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox41">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkLabel" id="label3">
+                  <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="xpad">10</property>
@@ -5059,7 +5104,7 @@ libxvidcore authors:
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame2">
+                  <object class="GtkFrame" id="frame15">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">etched-out</property>

diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index 7c167453f3ca6c28b81e85635959a53f2930be86..98b1e5d6ac397363bf2cc82c444edd58ff4a067e 100644 (file)
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -94,6 +94,8 @@
                <false />
                <key>allow_tweaks</key>
                <false />
+               <key>title_no_in_destination</key>
+               <false />
                <key>chapters_in_destination</key>
                <false />
                <key>default_source</key>

diff --git a/gtk/src/makedeps.c b/gtk/src/makedeps.c
index d3711645ef01b4ce7ea13bc1fbbb42ea77621ea1..308786f481c7b67d3e2df75c65741432e7fdd188 100644 (file)
--- a/gtk/src/makedeps.c
+++ b/gtk/src/makedeps.c
@@ -63,6 +63,7 @@ static dependency_t dep_map[] =
        {"x264_cabac", "x264_trellis", "TRUE", FALSE},
        {"ChapterMarkers", "chapters_list", "TRUE", FALSE},
        {"use_source_name", "chapters_in_destination", "TRUE", FALSE},
+       {"use_source_name", "title_no_in_destination", "TRUE", FALSE},
 };
 
 int

diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 53334463b2e5d893677e9049c6bdd56a4135ed6a..8187e931f7fbf58ed0e86f955a3b6f03ddb5e8a0 100644 (file)
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -520,7 +520,7 @@
 "    <signal handler="window_delete_event_cb" name="de"
 "lete_event"/>\n"
 "    <child>\n"
-"      <object class="GtkVBox" id="vbox_j1">\n"
+"      <object class="GtkVBox" id="vbox48">\n"
 "        <property name="visible">True</property>\n"
 "        <property name="events">GDK_POINTER_MOTION_MASK"
 " | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RE"
@@ -759,7 +759,7 @@
 "ue</property>\n"
 "                            <child>\n"
 "                              <object class="GtkHBox" id=&"
-"quot;hbox2">\n"
+"quot;hbox54">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -1063,7 +1063,7 @@
 ";6</property>\n"
 "                        <child>\n"
 "                          <object class="GtkHBox" id=&quot"
-";hbox_j4">\n"
+";hbox67">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="spacing">12"
@@ -1168,7 +1168,7 @@
 "t;>True</property>\n"
 "                                    <child>\n"
 "                                      <object class="GtkLabel&q"
-"uot; id="label27">\n"
+"uot; id="label45">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="label&q"
@@ -1357,7 +1357,7 @@
 "\n"
 "                    <child>\n"
 "                      <object class="GtkAlignment" id=&quo"
-"t;alignment_a">\n"
+"t;alignment55">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <property name="top_padding">10"
@@ -1367,7 +1367,7 @@
 "\n"
 "                    <child>\n"
 "                      <object class="GtkVBox" id="vbo"
-"x5">\n"
+"x43">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <property name="events">GDK_POI"
@@ -1467,7 +1467,7 @@
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
 "                                          <object class="GtkLab"
-"el" id="label24">\n"
+"el" id="label42">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="eve"
@@ -1517,7 +1517,7 @@
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
 "                                          <object class="GtkLab"
-"el" id="label25">\n"
+"el" id="label43">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="eve"
@@ -1563,7 +1563,7 @@
 "                            </child>\n"
 "                            <child type="label">\n"
 "                              <object class="GtkLabel" id="
-""label26">\n"
+""label44">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -1614,7 +1614,7 @@
 "uot;>2</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkVBox" "
-"id="vbox6">\n"
+"id="vbox44">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
@@ -1622,7 +1622,7 @@
 "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox54">\n"
+"ot; id="hbox61">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <child>\n"
@@ -1780,7 +1780,7 @@
 "                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkVBox" id=&quot"
-";vbox7">\n"
+";vbox45">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -1788,7 +1788,7 @@
 "MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                            <child>\n"
 "                              <object class="GtkFrame" id="
-""frame3">\n"
+""frame16">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -1800,7 +1800,7 @@
 "t;>GTK_SHADOW_NONE</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkAlignment&q"
-"uot; id="alignment7">\n"
+"uot; id="alignment20">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
@@ -1816,7 +1816,7 @@
 "ng">2</property>\n"
 "                                    <child>\n"
 "                                      <object class="GtkVBox&qu"
-"ot; id="vbox8">\n"
+"ot; id="vbox46">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
@@ -1862,7 +1862,7 @@
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkHBo"
-"x" id="hbox26">\n"
+"x" id="hbox68">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <child>\n"
@@ -1904,7 +1904,7 @@
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkHBo"
-"x" id="hbox27">\n"
+"x" id="hbox69">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <child>\n"
@@ -1989,7 +1989,7 @@
 "\n"
 "                    <child>\n"
 "                      <object class="GtkAlignment" id=&quo"
-"t;alignment_b">\n"
+"t;alignment56">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <property name="right_padding">"
@@ -2005,7 +2005,7 @@
 " | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                        <child>\n"
 "                          <object class="GtkLabel" id=&quo"
-"t;label8">\n"
+"t;label73">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                          </object>\n"
@@ -2182,7 +2182,7 @@
 "\n"
 "                    <child>\n"
 "                      <object class="GtkVBox" id="vbo"
-"x_j18">\n"
+"x47">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <property name="events">GDK_POI"
@@ -2234,7 +2234,7 @@
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
 "                                          <object class="GtkLab"
-"el" id="label28">\n"
+"el" id="label46">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="xal"
@@ -2294,7 +2294,7 @@
 "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n"
 "                                        <child>\n"
 "                                          <object class="GtkLab"
-"el" id="label29">\n"
+"el" id="label47">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="eve"
@@ -2413,7 +2413,7 @@
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox20">\n"
+"ot; id="hbox62">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
@@ -2484,7 +2484,7 @@
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox21">\n"
+"ot; id="hbox56">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
@@ -2557,7 +2557,7 @@
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkHBox&qu"
-"ot; id="hbox22">\n"
+"ot; id="hbox57">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
@@ -2699,8 +2699,8 @@
 "                  </object>\n"
 "                </child>\n"
 "                <child type="tab">\n"
-"                  <object class="GtkLabel" id="label3"
-"2">\n"
+"                  <object class="GtkLabel" id="label6"
+"5">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="label" translatable=&q"
@@ -2761,7 +2761,7 @@
 "t;2</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkHBox" "
-"id="hbox23">\n"
+"id="hbox58">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
@@ -2920,7 +2920,7 @@
 "                                </child>\n"
 "                                <child>\n"
 "                                  <object class="GtkTable""
-" id="table2">\n"
+" id="table1">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
@@ -3016,7 +3016,7 @@
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkLabel&q"
-"uot; id="label36">\n"
+"uot; id="label68">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
@@ -3038,7 +3038,7 @@
 "                                    </child>\n"
 "                                    <child>\n"
 "                                      <object class="GtkLabel&q"
-"uot; id="label37">\n"
+"uot; id="label69">\n"
 "                                        <property name="visible"
 "">True</property>\n"
 "                                        <property name="events&"
@@ -3197,7 +3197,7 @@
 "                    </child>\n"
 "                    <child>\n"
 "                      <object class="GtkHBox" id="hbo"
-"xj01">\n"
+"x63">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <property name="events">GDK_POI"
@@ -3207,7 +3207,7 @@
 "property>\n"
 "                        <child>\n"
 "                          <object class="GtkFrame" id=&quo"
-"t;framej01">\n"
+"t;frame18">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -3219,7 +3219,7 @@
 "t;none</property>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
-" id="alignmentj01">\n"
+" id="alignment57">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -3235,7 +3235,7 @@
 "uot;>2</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkHBox" "
-"id="hboxj02">\n"
+"id="hbox64">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
@@ -3264,7 +3264,7 @@
 "                            </child>\n"
 "                            <child type="label">\n"
 "                              <object class="GtkLabel" id="
-""labelj01">\n"
+""label74">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -3281,7 +3281,7 @@
 "                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkFrame" id=&quo"
-"t;framej02">\n"
+"t;frame19">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -3293,7 +3293,7 @@
 "t;none</property>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
-" id="alignmentj02">\n"
+" id="alignment58">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -3309,7 +3309,7 @@
 "uot;>2</property>\n"
 "                                <child>\n"
 "                                  <object class="GtkHBox" "
-"id="hboxj03">\n"
+"id="hbox65">\n"
 "                                    <property name="visible&quo"
 "t;>True</property>\n"
 "                                    <property name="events&quot"
@@ -3363,7 +3363,7 @@
 "                            </child>\n"
 "                            <child type="label">\n"
 "                              <object class="GtkLabel" id="
-""labelj02">\n"
+""label75">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="events"&gt"
@@ -3943,7 +3943,7 @@
 "                    </child>\n"
 "                    <child>\n"
 "                      <object class="GtkVSeparator" id=&qu"
-"ot;vseparator_j3">\n"
+"ot;vseparator1">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                      </object>\n"
@@ -4241,7 +4241,7 @@
 "                                        </child>\n"
 "                                        <child>\n"
 "                                          <object class="GtkAli"
-"gnment" id="alignment34">\n"
+"gnment" id="alignment37">\n"
 "                                            <property name="vis"
 "ible">True</property>\n"
 "                                            <property name="eve"
@@ -5117,12 +5117,12 @@
 "        <property name="visible">True</property>\n"
 "        <property name="spacing">2</property>\n"
 "        <child>\n"
-"          <object class="GtkHBox" id="hbox24"&gt"
+"          <object class="GtkHBox" id="hbox59"&gt"
 ";\n"
 "            <property name="visible">True</property&"
 "gt;\n"
 "            <child>\n"
-"              <object class="GtkVBox" id="vbox19&quot"
+"              <object class="GtkVBox" id="vbox20&quot"
 ";>\n"
 "                <property name="visible">True</prope"
 "rty>\n"
@@ -5168,14 +5168,14 @@
 "\n"
 "                <child>\n"
 "                  <object class="GtkAlignment" id="al"
-"ignment6">\n"
+"ignment22">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="left_padding">12&lt"
 ";/property>\n"
 "                    <child>\n"
 "                      <object class="GtkVBox" id="vbo"
-"x29">\n"
+"x42">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <child>\n"
@@ -5197,28 +5197,85 @@
 "                            <signal name="toggled" handler"
 "="pref_changed_cb"/>\n"
 "                          </object>\n"
+"                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
+"                          </packing>\n"
 "                        </child>\n"
+"\n"
 "                        <child>\n"
-"                          <object class="GtkCheckButton" i"
-"d="chapters_in_destination">\n"
+"                          <object class="GtkAlignment" id="
+""alignment6">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
-"                            <property name="can_focus">"
-"True</property>\n"
-"                            <property name="tooltip_text"&"
-"gt;Add chapter numbers to the \n"
+"                            <property name="left_padding"&"
+"gt;18</property>\n"
+"                            <child>\n"
+"                              <object class="GtkVBox" id=&"
+"quot;vbox29">\n"
+"                                <property name="visible"&g"
+"t;True</property>\n"
+"\n"
+"                                <child>\n"
+"                                  <object class="GtkCheckButton"
+"" id="chapters_in_destination">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="can_focus&q"
+"uot;>True</property>\n"
+"                                    <property name="tooltip_tex"
+"t">Add chapter numbers to the \n"
 "auto-generated destination name.</property>\n"
-"                            <property name="label" transla"
-"table="yes">Add chapters to destination name</property&"
-"gt;\n"
-"                            <property name="draw_indicator&quot"
+"                                    <property name="label""
+" translatable="yes">Add chapters to destination name</p"
+"roperty>\n"
+"                                    <property name="active&quot"
 ";>True</property>\n"
-"                            <signal name="toggled" handler"
-"="pref_changed_cb"/>\n"
+"                                    <property name="draw_indica"
+"tor">True</property>\n"
+"                                    <signal name="toggled""
+" handler="pref_changed_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                                <child>\n"
+"                                  <object class="GtkCheckButton"
+"" id="title_no_in_destination">\n"
+"                                    <property name="visible&quo"
+"t;>True</property>\n"
+"                                    <property name="can_focus&q"
+"uot;>True</property>\n"
+"                                    <property name="tooltip_tex"
+"t">Add title number to the \n"
+"auto-generated destination name.</property>\n"
+"                                    <property name="label""
+" translatable="yes">Add title # to destination name</pr"
+"operty>\n"
+"                                    <property name="active&quot"
+";>True</property>\n"
+"                                    <property name="draw_indica"
+"tor">True</property>\n"
+"                                    <signal name="toggled""
+" handler="pref_changed_cb"/>\n"
+"                                  </object>\n"
+"                                  <packing>\n"
+"                                    <property name="expand&quot"
+";>False</property>\n"
+"                                    <property name="position&qu"
+"ot;>1</property>\n"
+"                                  </packing>\n"
+"                                </child>\n"
+"                              </object>\n"
+"                            </child>\n"
 "                          </object>\n"
 "                          <packing>\n"
-"                            <property name="position">1"
-"</property>\n"
+"                              <property name="expand">F"
+"alse</property>\n"
+"                              <property name="position"&gt"
+";1</property>\n"
 "                          </packing>\n"
 "                        </child>\n"
 "                        <child>\n"
@@ -5241,6 +5298,8 @@
 "="pref_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">2"
 "</property>\n"
 "                          </packing>\n"
@@ -5266,6 +5325,8 @@
 "="pref_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">3"
 "</property>\n"
 "                          </packing>\n"
@@ -5293,6 +5354,8 @@
 "="vcodec_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">4"
 "</property>\n"
 "                          </packing>\n"
@@ -5318,6 +5381,8 @@
 "="pref_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">5"
 "</property>\n"
 "                          </packing>\n"
@@ -5325,14 +5390,14 @@
 "\n"
 "                        <child>\n"
 "                          <object class="GtkAlignment" id="
-""alignment_j6">\n"
+""alignment50">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="left_padding"&"
 "gt;4</property>\n"
 "                            <child>\n"
 "                              <object class="GtkHBox" id=&"
-"quot;hbox_j3">\n"
+"quot;hbox66">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <child>\n"
@@ -5362,7 +5427,7 @@
 "                                </child>\n"
 "                                <child>\n"
 "                                  <object class="GtkLabel""
-" id="label_j3">\n"
+" id="label77">\n"
 "                                    <property name="justify&quo"
 "t;>GTK_JUSTIFY_LEFT</property>\n"
 "                                    <property name="visible&quo"
@@ -5383,6 +5448,8 @@
 "                            </child>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">6"
 "</property>\n"
 "                          </packing>\n"
@@ -5390,14 +5457,14 @@
 "\n"
 "                        <child>\n"
 "                          <object class="GtkAlignment" id="
-""alignment_j6">\n"
+""alignment51">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="left_padding"&"
 "gt;4</property>\n"
 "                            <child>\n"
 "                              <object class="GtkHBox" id=&"
-"quot;hbox1">\n"
+"quot;hbox50">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="spacing"&g"
@@ -5438,6 +5505,8 @@
 "                            </child>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">7"
 "</property>\n"
 "                          </packing>\n"
@@ -5456,6 +5525,8 @@
 "="tweaks_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">8"
 "</property>\n"
 "                          </packing>\n"
@@ -5473,6 +5544,8 @@
 "="hbfd_feature_changed_cb"/>\n"
 "                          </object>\n"
 "                          <packing>\n"
+"                            <property name="expand">Fal"
+"se</property>\n"
 "                            <property name="position">9"
 "</property>\n"
 "                          </packing>\n"
@@ -6301,15 +6374,15 @@
 "        <property name="visible">True</property>\n"
 "        <property name="spacing">4</property>\n"
 "        <child>\n"
-"          <object class="GtkVBox" id="vbox1">"
-"\n"
+"          <object class="GtkVBox" id="vbox40"&gt"
+";\n"
 "            <property name="visible">True</property&"
 "gt;\n"
 "            <property name="spacing">5</property>"
 "\n"
 "            <child>\n"
 "              <object class="GtkAlignment" id="alignm"
-"ent_j1">\n"
+"ent52">\n"
 "                <property name="visible">True</prope"
 "rty>\n"
 "                <property name="events">GDK_POINTER_MOT"
@@ -6344,7 +6417,7 @@
 "            </child>\n"
 "            <child>\n"
 "              <object class="GtkAlignment" id="alignm"
-"ent_j2">\n"
+"ent53">\n"
 "                <property name="visible">True</prope"
 "rty>\n"
 "                <property name="events">GDK_POINTER_MOT"
@@ -6355,8 +6428,8 @@
 "                <property name="right_padding">10</p"
 "roperty>\n"
 "                <child>\n"
-"                  <object class="GtkHBox" id="hbox3&q"
-"uot;>\n"
+"                  <object class="GtkHBox" id="hbox70&"
+"quot;>\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="spacing">5</prop"
@@ -6419,7 +6492,7 @@
 "t;/property>\n"
 "                        <child>\n"
 "                          <object class="GtkLabel" id=&quo"
-"t;label4">\n"
+"t;label71">\n"
 "                            <property name="height_request&quot"
 ";>1</property>\n"
 "                            <property name="visible">Tr"
@@ -6450,7 +6523,7 @@
 "                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkLabel" id=&quo"
-"t;label5">\n"
+"t;label72">\n"
 "                            <property name="height_request&quot"
 ";>1</property>\n"
 "                            <property name="visible">Tr"
@@ -6551,7 +6624,7 @@
 "                    </child>\n"
 "                    <child>\n"
 "                      <object class="GtkHBox" id="hbo"
-"x28">\n"
+"x60">\n"
 "                        <property name="visible">True&l"
 "t;/property>\n"
 "                        <property name="spacing">2</"
@@ -6619,7 +6692,7 @@
 "        </child>\n"
 "        <child>\n"
 "          <object class="GtkVSeparator" id="vseparato"
-"r_j3">\n"
+"r2">\n"
 "            <property name="visible">True</property&"
 "gt;\n"
 "          </object>\n"
@@ -6632,8 +6705,8 @@
 "        </child>\n"
 "\n"
 "        <child>\n"
-"          <object class="GtkAlignment" id="alignment_"
-"j7">\n"
+"          <object class="GtkAlignment" id="alignment5"
+"4">\n"
 "            <property name="visible">True</property&"
 "gt;\n"
 "            <property name="top_padding">6</property"
@@ -6684,7 +6757,7 @@
 ";/property>\n"
 "                        <child>\n"
 "                          <object class="GtkLabel" id=&quo"
-"t;label19">\n"
+"t;label20">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -6706,7 +6779,7 @@
 "                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkLabel" id=&quo"
-"t;label23">\n"
+"t;label41">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -7053,7 +7126,7 @@
 "property>\n"
 "                        <child>\n"
 "                          <object class="GtkHBox" id=&quot"
-";hbox17">\n"
+";hbox51">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -7153,7 +7226,7 @@
 "                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkHBox" id=&quot"
-";hbox18">\n"
+";hbox71">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -7190,7 +7263,7 @@
 "                        </child>\n"
 "                        <child>\n"
 "                          <object class="GtkHBox" id=&quot"
-";hbox19">\n"
+";hbox72">\n"
 "                            <property name="visible">Tr"
 "ue</property>\n"
 "                            <property name="events">GDK"
@@ -7348,8 +7421,8 @@
 "              </packing>\n"
 "            </child>\n"
 "            <child>\n"
-"              <object class="GtkFrame" id="frame5&quo"
-"t;>\n"
+"              <object class="GtkFrame" id="frame17&qu"
+"ot;>\n"
 "                <property name="visible">True</prope"
 "rty>\n"
 "                <property name="events">GDK_POINTER_MOT"
@@ -7361,7 +7434,7 @@
 "roperty>\n"
 "                <child>\n"
 "                  <object class="GtkAlignment" id="al"
-"ignment5">\n"
+"ignment8">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="events">GDK_POINTER"
@@ -7467,7 +7540,7 @@
 "ue</property>\n"
 "                            <child>\n"
 "                              <object class="GtkLabel" id="
-""label30">\n"
+""label56">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="xalign"&gt"
@@ -7486,7 +7559,7 @@
 "                            </child>\n"
 "                            <child>\n"
 "                              <object class="GtkAlignment""
-" id="alignment6">\n"
+" id="alignment14">\n"
 "                                <property name="visible"&g"
 "t;True</property>\n"
 "                                <property name="xalign"&gt"
@@ -7683,8 +7756,8 @@
 "                  </object>\n"
 "                </child>\n"
 "                <child type="label">\n"
-"                  <object class="GtkLabel" id="label3"
-"3">\n"
+"                  <object class="GtkLabel" id="label6"
+"6">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="events">GDK_POINTER"
@@ -8051,13 +8124,13 @@
 "              </packing>\n"
 "            </child>\n"
 "            <child>\n"
-"              <object class="GtkVBox" id="vbox1""
-">\n"
+"              <object class="GtkVBox" id="vbox41&quot"
+";>\n"
 "                <property name="visible">True</prope"
 "rty>\n"
 "                <child>\n"
-"                  <object class="GtkLabel" id="label3"
-"">\n"
+"                  <object class="GtkLabel" id="label2"
+"2">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="xalign">0</prope"
@@ -8102,8 +8175,8 @@
 "                  </packing>\n"
 "                </child>\n"
 "                <child>\n"
-"                  <object class="GtkFrame" id="frame2"
-"">\n"
+"                  <object class="GtkFrame" id="frame1"
+"5">\n"
 "                    <property name="visible">True</p"
 "roperty>\n"
 "                    <property name="label_xalign">0<"
@@ -10833,6 +10906,8 @@
 "                      <true />\n"
 "                      <key>show_presets</key>\n"
 "                      <false />\n"
+"                      <key>title_no_in_destination</key>\n"
+"                      <false />\n"
 "                      <key>update_skip_version</key>\n"
 "                      <integer>0</integer>\n"
 "                      <key>use_source_name</key>\n"
@@ -12655,6 +12730,7 @@
 "              <key>use_source_name</key>\n"
 "              <array>\n"
 "                      <string>chapters_in_destination</string>\n"
+"                      <string>title_no_in_destination</string>\n"
 "              </array>\n"
 "              <key>vquality_type_bitrate</key>\n"
 "              <array>\n"
@@ -12996,6 +13072,14 @@
 "                              <true />\n"
 "                      </array>\n"
 "              </array>\n"
+"              <key>title_no_in_destination</key>\n"
+"              <array>\n"
+"                      <array>\n"
+"                              <string>use_source_name</string>\n"
+"                              <string>TRUE</string>\n"
+"                              <false />\n"
+"                      </array>\n"
+"              </array>\n"
 "              <key>tweak_PictureDeinterlace</key>\n"
 "              <array>\n"
 "                      <array>\n"

diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index 5f11666126b275e7b73cae4e322c4d146a2a11d4..da361728b264de746ca8c80faf6abbd6dccaf3a0 100644 (file)
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -378,7 +378,7 @@
     <signal handler="window_destroy_event_cb" name="destroy_event"/>
     <signal handler="window_delete_event_cb" name="delete_event"/>
     <child>
-      <object class="GtkVBox" id="vbox_j1">
+      <object class="GtkVBox" id="vbox48">
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
@@ -521,7 +521,7 @@
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
                             <child>
-                              <object class="GtkHBox" id="hbox2">
+                              <object class="GtkHBox" id="hbox54">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="spacing">5</property>
@@ -711,7 +711,7 @@
                         <property name="top_padding">6</property>
                         <property name="bottom_padding">6</property>
                         <child>
-                          <object class="GtkHBox" id="hbox_j4">
+                          <object class="GtkHBox" id="hbox67">
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
                             <child>
@@ -776,7 +776,7 @@
                                   <object class="GtkHBox" id="hbox3">
                                     <property name="visible">True</property>
                                     <child>
-                                      <object class="GtkLabel" id="label27">
+                                      <object class="GtkLabel" id="label45">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">Container:</property>
                                       </object>
@@ -893,13 +893,13 @@
                     <property name="spacing">3</property>
 
                     <child>
-                      <object class="GtkAlignment" id="alignment_a">
+                      <object class="GtkAlignment" id="alignment55">
                         <property name="visible">True</property>
                         <property name="top_padding">10</property>
                         <property name="left_padding">10</property>
 
                     <child>
-                      <object class="GtkVBox" id="vbox5">
+                      <object class="GtkVBox" id="vbox43">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                        <property name="spacing">14</property>
@@ -954,7 +954,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label24">
+                                          <object class="GtkLabel" id="label42">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -985,7 +985,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label25">
+                                          <object class="GtkLabel" id="label43">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -1016,7 +1016,7 @@
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="label26">
+                              <object class="GtkLabel" id="label44">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes"><b>Source Picture Parameters</b></property>
@@ -1044,11 +1044,11 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox6">
+                                  <object class="GtkVBox" id="vbox44">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox54">
+                                      <object class="GtkHBox" id="hbox61">
                                         <property name="visible">True</property>
                                         <child>
                                           <object class="GtkLabel" id="label13">
@@ -1151,17 +1151,17 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox7">
+                          <object class="GtkVBox" id="vbox45">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkFrame" id="frame3">
+                              <object class="GtkFrame" id="frame16">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">GTK_SHADOW_NONE</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment7">
+                                  <object class="GtkAlignment" id="alignment20">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="top_padding">6</property>
@@ -1169,7 +1169,7 @@
                                     <property name="left_padding">12</property>
                                     <property name="right_padding">2</property>
                                     <child>
-                                      <object class="GtkVBox" id="vbox8">
+                                      <object class="GtkVBox" id="vbox46">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1198,7 +1198,7 @@
                                           </object>
                                         </child>
                                         <child>
-                                          <object class="GtkHBox" id="hbox26">
+                                          <object class="GtkHBox" id="hbox68">
                                             <property name="visible">True</property>
                                             <child>
                                               <object class="GtkLabel" id="label15">
@@ -1226,7 +1226,7 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHBox" id="hbox27">
+                                          <object class="GtkHBox" id="hbox69">
                                             <property name="visible">True</property>
                                             <child>
                                               <object class="GtkLabel" id="label17">
@@ -1286,7 +1286,7 @@
                     </child>
 
                     <child>
-                      <object class="GtkAlignment" id="alignment_b">
+                      <object class="GtkAlignment" id="alignment56">
                         <property name="visible">True</property>
                         <property name="right_padding">10</property>
 
@@ -1295,7 +1295,7 @@
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
-                          <object class="GtkLabel" id="label8">
+                          <object class="GtkLabel" id="label73">
                             <property name="visible">True</property>
                           </object>
                           <packing>
@@ -1413,7 +1413,7 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
                     <child>
-                      <object class="GtkVBox" id="vbox_j18">
+                      <object class="GtkVBox" id="vbox47">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <child>
@@ -1439,7 +1439,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label28">
+                                          <object class="GtkLabel" id="label46">
                                             <property name="visible">True</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Video Codec:</property>
@@ -1477,7 +1477,7 @@
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
-                                          <object class="GtkLabel" id="label29">
+                                          <object class="GtkLabel" id="label47">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -1548,7 +1548,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox20">
+                                      <object class="GtkHBox" id="hbox62">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1590,7 +1590,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox21">
+                                      <object class="GtkHBox" id="hbox56">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1633,7 +1633,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox22">
+                                      <object class="GtkHBox" id="hbox57">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
@@ -1722,7 +1722,7 @@
                   </object>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="label32">
+                  <object class="GtkLabel" id="label65">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Video</property>
                   </object>
@@ -1755,7 +1755,7 @@
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="spacing">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox23">
+                                  <object class="GtkHBox" id="hbox58">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">5</property>
@@ -1847,7 +1847,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkTable" id="table2">
+                                  <object class="GtkTable" id="table1">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="n_rows">2</property>
@@ -1903,7 +1903,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="label36">
+                                      <object class="GtkLabel" id="label68">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="label" translatable="yes">Codec</property>
@@ -1916,7 +1916,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="label37">
+                                      <object class="GtkLabel" id="label69">
                                         <property name="visible">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="label" translatable="yes">Bitrate</property>
@@ -2013,18 +2013,18 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hboxj01">
+                      <object class="GtkHBox" id="hbox63">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">5</property>
                         <child>
-                          <object class="GtkFrame" id="framej01">
+                          <object class="GtkFrame" id="frame18">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkAlignment" id="alignmentj01">
+                              <object class="GtkAlignment" id="alignment57">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="top_padding">6</property>
@@ -2032,7 +2032,7 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hboxj02">
+                                  <object class="GtkHBox" id="hbox64">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">5</property>
@@ -2050,7 +2050,7 @@
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="labelj01">
+                              <object class="GtkLabel" id="label74">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes"><b>Preferred Audio Language</b></property>
@@ -2060,13 +2060,13 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="framej02">
+                          <object class="GtkFrame" id="frame19">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label_xalign">0</property>
                             <property name="shadow_type">none</property>
                             <child>
-                              <object class="GtkAlignment" id="alignmentj02">
+                              <object class="GtkAlignment" id="alignment58">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="top_padding">6</property>
@@ -2074,7 +2074,7 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkHBox" id="hboxj03">
+                                  <object class="GtkHBox" id="hbox65">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">5</property>
@@ -2106,7 +2106,7 @@
                               </object>
                             </child>
                             <child type="label">
-                              <object class="GtkLabel" id="labelj02">
+                              <object class="GtkLabel" id="label75">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes"><b>Subtitles</b></property>
@@ -2443,7 +2443,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVSeparator" id="vseparator_j3">
+                      <object class="GtkVSeparator" id="vseparator1">
                         <property name="visible">True</property>
                       </object>
                       <packing>
@@ -2611,7 +2611,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkAlignment" id="alignment34">
+                                          <object class="GtkAlignment" id="alignment37">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
@@ -3137,10 +3137,10 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkHBox" id="hbox24">
+          <object class="GtkHBox" id="hbox59">
             <property name="visible">True</property>
             <child>
-              <object class="GtkVBox" id="vbox19">
+              <object class="GtkVBox" id="vbox20">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkEventBox" id="eventbox1">
@@ -3169,11 +3169,11 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
             </child>
 
                 <child>
-                  <object class="GtkAlignment" id="alignment6">
+                  <object class="GtkAlignment" id="alignment22">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkVBox" id="vbox29">
+                      <object class="GtkVBox" id="vbox42">
                         <property name="visible">True</property>
                         <child>
                           <object class="GtkCheckButton" id="use_source_name">
@@ -3186,19 +3186,56 @@ label.</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
                         </child>
+
                         <child>
-                          <object class="GtkCheckButton" id="chapters_in_destination">
+                          <object class="GtkAlignment" id="alignment6">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text">Add chapter numbers to the 
+                            <property name="left_padding">18</property>
+                            <child>
+                              <object class="GtkVBox" id="vbox29">
+                                <property name="visible">True</property>
+
+                                <child>
+                                  <object class="GtkCheckButton" id="chapters_in_destination">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text">Add chapter numbers to the 
 auto-generated destination name.</property>
-                            <property name="label" translatable="yes">Add chapters to destination name</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="pref_changed_cb"/>
+                                    <property name="label" translatable="yes">Add chapters to destination name</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="title_no_in_destination">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text">Add title number to the 
+auto-generated destination name.</property>
+                                    <property name="label" translatable="yes">Add title # to destination name</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="pref_changed_cb"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
-                            <property name="position">1</property>
+                              <property name="expand">False</property>
+                              <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -3213,6 +3250,7 @@ non-hidef screens.  </property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -3230,6 +3268,7 @@ the required multiple.</property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -3249,6 +3288,7 @@ this setting.</property>
                             <signal name="toggled" handler="vcodec_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">4</property>
                           </packing>
                         </child>
@@ -3265,16 +3305,17 @@ location as the movie.</property>
                             <signal name="toggled" handler="pref_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">5</property>
                           </packing>
                         </child>
 
                         <child>
-                          <object class="GtkAlignment" id="alignment_j6">
+                          <object class="GtkAlignment" id="alignment50">
                             <property name="visible">True</property>
                             <property name="left_padding">4</property>
                             <child>
-                              <object class="GtkHBox" id="hbox_j3">
+                              <object class="GtkHBox" id="hbox66">
                                 <property name="visible">True</property>
                                 <child>
                                   <object class="GtkSpinButton" id="preview_count">
@@ -3292,7 +3333,7 @@ location as the movie.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="label_j3">
+                                  <object class="GtkLabel" id="label77">
                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes"> Number of previews </property>
@@ -3307,16 +3348,17 @@ location as the movie.</property>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">6</property>
                           </packing>
                         </child>
 
                         <child>
-                          <object class="GtkAlignment" id="alignment_j6">
+                          <object class="GtkAlignment" id="alignment51">
                             <property name="visible">True</property>
                             <property name="left_padding">4</property>
                             <child>
-                              <object class="GtkHBox" id="hbox1">
+                              <object class="GtkHBox" id="hbox50">
                                 <property name="visible">True</property>
                                 <property name="spacing">4</property>
                                 <child>
@@ -3344,6 +3386,7 @@ location as the movie.</property>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">7</property>
                           </packing>
                         </child>
@@ -3356,6 +3399,7 @@ location as the movie.</property>
                             <signal name="toggled" handler="tweaks_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">8</property>
                           </packing>
                         </child>
@@ -3367,6 +3411,7 @@ location as the movie.</property>
                             <signal name="toggled" handler="hbfd_feature_changed_cb"/>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">9</property>
                           </packing>
                         </child>
@@ -3880,11 +3925,11 @@ location as the movie.</property>
         <property name="visible">True</property>
         <property name="spacing">4</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkVBox" id="vbox40">
             <property name="visible">True</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkAlignment" id="alignment_j1">
+              <object class="GtkAlignment" id="alignment52">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="xscale">0</property>
@@ -3905,13 +3950,13 @@ location as the movie.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment_j2">
+              <object class="GtkAlignment" id="alignment53">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="left_padding">10</property>
                 <property name="right_padding">10</property>
                 <child>
-                  <object class="GtkHBox" id="hbox3">
+                  <object class="GtkHBox" id="hbox70">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <child>
@@ -3950,7 +3995,7 @@ location as the movie.</property>
                       <object class="GtkVBox" id="live_progress_box">
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkLabel" id="label4">
+                          <object class="GtkLabel" id="label71">
                             <property name="height_request">1</property>
                             <property name="visible">True</property>
                           </object>
@@ -3970,7 +4015,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label5">
+                          <object class="GtkLabel" id="label72">
                             <property name="height_request">1</property>
                             <property name="visible">True</property>
                           </object>
@@ -4036,7 +4081,7 @@ location as the movie.</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox28">
+                      <object class="GtkHBox" id="hbox60">
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
@@ -4082,7 +4127,7 @@ location as the movie.</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVSeparator" id="vseparator_j3">
+          <object class="GtkVSeparator" id="vseparator2">
             <property name="visible">True</property>
           </object>
           <packing>
@@ -4092,7 +4137,7 @@ location as the movie.</property>
         </child>
 
         <child>
-          <object class="GtkAlignment" id="alignment_j7">
+          <object class="GtkAlignment" id="alignment54">
             <property name="visible">True</property>
             <property name="top_padding">6</property>
             <property name="bottom_padding">6</property>
@@ -4119,7 +4164,7 @@ location as the movie.</property>
                         <property name="n_rows">5</property>
                         <property name="n_columns">5</property>
                         <child>
-                          <object class="GtkLabel" id="label19">
+                          <object class="GtkLabel" id="label20">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="label" translatable="yes">Left</property>
@@ -4132,7 +4177,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label23">
+                          <object class="GtkLabel" id="label41">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="yalign">1</property>
@@ -4355,7 +4400,7 @@ location as the movie.</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">2</property>
                         <child>
-                          <object class="GtkHBox" id="hbox17">
+                          <object class="GtkHBox" id="hbox51">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="spacing">4</property>
@@ -4415,7 +4460,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox18">
+                          <object class="GtkHBox" id="hbox71">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
@@ -4438,7 +4483,7 @@ location as the movie.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox19">
+                          <object class="GtkHBox" id="hbox72">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
@@ -4534,13 +4579,13 @@ location as the movie.</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame5">
+              <object class="GtkFrame" id="frame17">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment5">
+                  <object class="GtkAlignment" id="alignment8">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="top_padding">6</property>
@@ -4600,7 +4645,7 @@ location as the movie.</property>
                           <object class="GtkHBox" id="hbox21">
                             <property name="visible">True</property>
                             <child>
-                              <object class="GtkLabel" id="label30">
+                              <object class="GtkLabel" id="label56">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Deblock:</property>
@@ -4612,7 +4657,7 @@ location as the movie.</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="alignment6">
+                              <object class="GtkAlignment" id="alignment14">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="xscale">0.55000001192092896</property>
@@ -4736,7 +4781,7 @@ location as the movie.</property>
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkLabel" id="label33">
+                  <object class="GtkLabel" id="label66">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes"><b>Filters</b></property>
@@ -5034,10 +5079,10 @@ libxvidcore authors:
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="vbox41">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkLabel" id="label3">
+                  <object class="GtkLabel" id="label22">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="xpad">10</property>
@@ -5064,7 +5109,7 @@ libxvidcore authors:
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame2">
+                  <object class="GtkFrame" id="frame15">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">etched-out</property>
@@ -5374,6 +5419,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
                        <true />
                        <key>show_presets</key>
                        <false />
+                       <key>title_no_in_destination</key>
+                       <false />
                        <key>update_skip_version</key>
                        <integer>0</integer>
                        <key>use_source_name</key>
@@ -7154,6 +7201,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
                <key>use_source_name</key>
                <array>
                        <string>chapters_in_destination</string>
+                       <string>title_no_in_destination</string>
                </array>
                <key>vquality_type_bitrate</key>
                <array>
@@ -7495,6 +7543,14 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
                                <true />
                        </array>
                </array>
+               <key>title_no_in_destination</key>
+               <array>
+                       <array>
+                               <string>use_source_name</string>
+                               <string>TRUE</string>
+                               <false />
+                       </array>
+               </array>
                <key>tweak_PictureDeinterlace</key>
                <array>
                        <array>

diff --git a/gtk/src/widget_deps b/gtk/src/widget_deps
index 797b239b52f21f7ab24d34387f8dbdac927f2694..c3df7f5cc3ff043bcd32b1379eb99596fd6ba905 100644 (file)
--- a/gtk/src/widget_deps
+++ b/gtk/src/widget_deps
@@ -74,6 +74,7 @@
        <key>use_source_name</key>
        <array>
                <string>chapters_in_destination</string>
+               <string>title_no_in_destination</string>
        </array>
        <key>vquality_type_bitrate</key>
        <array>

diff --git a/gtk/src/widget_reverse_deps b/gtk/src/widget_reverse_deps
index 0c767d5d0cdc87061c52e972e58af9975171efa1..5128ffea1f41fd4179a1675b85e26536c21a478c 100644 (file)
--- a/gtk/src/widget_reverse_deps
+++ b/gtk/src/widget_reverse_deps
@@ -310,6 +310,14 @@
                        <true />
                </array>
        </array>
+       <key>title_no_in_destination</key>
+       <array>
+               <array>
+                       <string>use_source_name</string>
+                       <string>TRUE</string>
+                       <false />
+               </array>
+       </array>
        <key>tweak_PictureDeinterlace</key>
        <array>
                <array>