X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fghb.ui;h=102214c0f2d6c06821bfcac7e1da5c4cb8d46f5d;hb=9460d9624a5cf24126bc39605bc47d43330fcdf4;hp=f4e61db70aa073a45eb5f7ff039e82904e2a62d8;hpb=116b8c1202913a7333298664b5859f5d873213dd;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index f4e61db7..102214c0 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -227,7 +227,7 @@
   </object>
   <object class="GtkAdjustment" id="adjustment29">
     <property name="upper">2000</property>
-    <property name="lower">0</property>
+    <property name="lower">1</property>
     <property name="page_increment">16</property>
     <property name="step_increment">1</property>
     <property name="page_size">0</property>
@@ -235,7 +235,7 @@
   </object>
   <object class="GtkAdjustment" id="adjustment30">
     <property name="upper">2000</property>
-    <property name="lower">0</property>
+    <property name="lower">1</property>
     <property name="page_increment">16</property>
     <property name="step_increment">1</property>
     <property name="page_size">0</property>
@@ -249,6 +249,22 @@
     <property name="page_size">0</property>
     <property name="value">0</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment32">
+    <property name="upper">99999</property>
+    <property name="lower">0</property>
+    <property name="page_increment">60</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">99999</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment33">
+    <property name="upper">99999</property>
+    <property name="lower">1</property>
+    <property name="page_increment">60</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
   <object class="GtkAdjustment" id="preview_progress_adj">
     <property name="upper">100</property>
     <property name="lower">0</property>
@@ -671,7 +687,7 @@
                     <child>
                       <object class="GtkVBox" id="vbox16">
                         <property name="visible">True</property>
-                        <property name="spacing">6</property>
+                        <property name="spacing">2</property>
                         <child>
                           <object class="GtkHBox" id="hbox54">
                             <property name="visible">True</property>
@@ -726,24 +742,44 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkAlignment" id="alignment65">
+                          <object class="GtkTable" id="table7">
                             <property name="visible">True</property>
-                            <property name="left_padding">6</property>
-                            <property name="bottom_padding">6</property>
+                            <property name="n_rows">2</property>
+                            <property name="n_columns">2</property>
+                            <property name="column-spacing">5</property>
                             <child>
-                              <object class="GtkHBox" id="hbox5">
+                              <object class="GtkAlignment" id="alignment72">
                                 <property name="visible">True</property>
-                                <property name="spacing">4</property>
+                                <property name="top_padding">6</property>
+                                <property name="left_padding">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label20">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Title</property>
+                                    <property name="xalign">0.1</property>
+                                    <property name="label" translatable="yes">Title:</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox42">
+                                <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="GtkAlignment" id="alignment75">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="xscale">0</property>
+                                    <property name="yscale">0</property>
                                 <child>
                                   <object class="GtkComboBox" id="title">
                                     <property name="visible">True</property>
@@ -751,86 +787,17 @@
                                     <property name="tooltip-text" translatable="yes">Set the title to encode. By default the longest title is chosen.  This is often the feature title of a DVD.</property>
                                     <signal handler="title_changed_cb" name="changed"/>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkAlignment" id="chapter_box">
-                                    <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>
-                                    <property name="xscale">0</property>
-                                    <property name="left_padding">16</property>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox4">
-                                        <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="label4">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Chapters</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="start_chapter">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">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="tooltip-text" translatable="yes">Set the first chapter to encode.</property>
-                                            <property name="adjustment">adjustment1</property>
-                                            <signal handler="start_chapter_changed_cb" name="value_changed"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label5">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes"> through </property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" id="end_chapter">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">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="tooltip-text" translatable="yes">Set the last chapter to encode.</property>
-                                            <property name="adjustment">adjustment2</property>
-                                            <signal handler="end_chapter_changed_cb" name="value_changed"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">3</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
+
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
-                                  </packing>
                                 </child>
+
                                 <child>
-                                  <object class="GtkAlignment" id="alignment47">
+                                  <object class="GtkAlignment" id="alignment73">
                                     <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>
+                                    <property name="xalign">1</property>
                                     <property name="xscale">0</property>
-                                    <property name="left_padding">16</property>
+                                    <property name="yscale">0</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox44">
                                         <property name="visible">True</property>
@@ -844,7 +811,7 @@
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
-                                            <property name="position">4</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
@@ -858,54 +825,111 @@
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="position">5</property>
+                                            <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">3</property>
-                                  </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                              </packing>
+                            </child>
+
+                            <child>
+                              <object class="GtkAlignment" id="alignment74">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
                                 <child>
-                                  <object class="GtkAlignment" id="alignment41">
+                                  <object class="GtkHBox" id="hbox48">
                                     <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>
-                                    <property name="xscale">0</property>
-                                    <property name="left_padding">16</property>
+                                    <property name="spacing">5</property>
+
+                                    <child>
+                                      <object class="GtkComboBox" id="PtoPType">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip-text" translatable="yes">Format to mux encoded tracks to.</property>
+                                        <signal handler="ptop_widget_changed_cb" name="changed"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
                                     <child>
-                                      <object class="GtkHBox" id="hbox42">
+                                      <object class="GtkSpinButton" id="start_point">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">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">7</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label6">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0.10000000149011612</property>
-                                            <property name="label" translatable="yes">Duration:</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="title_duration">
-                                            <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>
-                                            <property name="label" translatable="yes">hh:mm:ss</property>
-                                            <property name="width_chars">10</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
+                                        <property name="tooltip-text" translatable="yes">Set the first chapter to encode.</property>
+                                        <property name="adjustment">adjustment1</property>
+                                        <signal handler="start_point_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                            		    <property name="expand">False</property>
+                            		    <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label56">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">through</property>
+                                      </object>
+                                      <packing>
+                            		    <property name="expand">False</property>
+                            		    <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" id="end_point">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">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="tooltip-text" translatable="yes">Set the last chapter to encode.</property>
+                                        <property name="adjustment">adjustment2</property>
+                                        <signal handler="end_point_changed_cb" name="value_changed"/>
+                                      </object>
+                                      <packing>
+                            		    <property name="expand">False</property>
+                            		    <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                <child>
+                                  <object class="GtkHBox" id="hbox47">
+                                    <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">7</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label6">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0.1</property>
+                                        <property name="label" translatable="yes">Duration:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="title_duration">
+                                        <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>
+                                        <property name="label" translatable="yes">hh:mm:ss</property>
+                                        <property name="width_chars">8</property>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
@@ -913,7 +937,15 @@
                                     <property name="position">4</property>
                                   </packing>
                                 </child>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -941,7 +973,7 @@
                             <property name="visible">True</property>
                             <property name="spacing">12</property>
                             <child>
-                              <object class="GtkTable" id="table3">
+                              <object class="GtkTable" id="table4">
                                 <property name="visible">True</property>
                                 <property name="n_rows">2</property>
                                 <property name="n_columns">2</property>
@@ -951,6 +983,7 @@
                                 <child>
                                   <object class="GtkFileChooserButton" id="dest_dir">
                                     <property name="visible">True</property>
+                                    <property name="local-only">False</property>
                                     <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                     <property name="title" translatable="yes">Destination Directory</property>
                                     <property name="tooltip-text" translatable="yes">Destination directory for your encode.</property>
@@ -1070,7 +1103,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="Mp4LargeFile">
-                                    <property name="label" translatable="yes">Large file size (&gt;4GB)</property>
+                                    <property name="label" translatable="yes">Large file (&gt;4GB)</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -2472,6 +2505,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                                 <child>
                                   <object class="GtkFileChooserButton" id="SrtFile">
                                     <property name="visible">True</property>
+                                    <property name="local-only">False</property>
                                     <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
                                     <property name="title" translatable="yes">Srt File</property>
                                     <property name="tooltip-text" translatable="yes">Select the SRT file to import.</property>
@@ -2853,9 +2887,9 @@ This option can improve compression efficiency. Use 'Optimal' if you can afford
 You can edit these and add additional options.  
 
 Default values will not be shown. The defaults are:
-ref=1:mixed-refs=0:bframes=0:direct=spatial:b-pyramid=0:
-weightb=0:me=hex:merange=16:subme=6:analyse=some:8x8dct=0:
-deblock=0,0:trellis=0:psy-rd=1,0:no-fast-pskip=0:
+ref=3:mixed-refs=1:bframes=3:direct=spatial:b-pyramid=0:
+weightb=1:me=hex:merange=16:subme=7:analyse=some:8x8dct=1:
+deblock=0,0:trellis=1:psy-rd=1,0:no-fast-pskip=0:
 no-dct-decimate=0:cabac=1</property>
                                         <property name="wrap_mode">GTK_WRAP_CHAR</property>
                                         <property name="accepts_tab">False</property>
@@ -4686,6 +4720,7 @@ Requires subme >= 6 and trellis >= 1.</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="transient-for">hb_window</property>
     <signal handler="activity_window_delete_cb" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox37">
@@ -4743,6 +4778,7 @@ Requires subme >= 6 and trellis >= 1.</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
+    <property name="transient-for">hb_window</property>
     <signal handler="queue_window_delete_cb" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox34">
@@ -6161,6 +6197,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="resizable">False</property>
+    <property name="transient-for">hb_window</property>
     <property name="events">GDK_STRUCTURE_MASK | GDK_POINTER_MOTION_MASK</property>
     <signal handler="preview_configure_cb" name="configure-event"/>
     <signal handler="preview_window_delete_cb" name="delete_event"/>
@@ -6554,7 +6591,9 @@ libx264 authors:
   </object>
   <object class="GtkFileChooserDialog" id="source_dialog">
     <property name="border_width">5</property>
+    <property name="local-only">False</property>
     <property name="modal">True</property>
+    <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
@@ -6607,7 +6646,7 @@ libx264 authors:
             </child>
             <child>
               <object class="GtkCheckButton" id="source_folder_flag">
-                <property name="label" translatable="yes">Open VIDEO_TS folder</property>
+                <property name="label" translatable="yes">Open folder (DVD or batch)</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>