LinGui: make smarter bitrate choice when automatically selecting audio settings

[handbrake-jp/handbrake-jp-git.git] / gtk / src / ghb.ui

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index eb4268f..e599233 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -227,15 +227,15 @@
   </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>
     <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment30">
-    <property name="upper">1200</property>
-    <property name="lower">0</property>
+    <property name="upper">2000</property>
+    <property name="lower">1</property>
     <property name="page_increment">16</property>
     <property name="step_increment">1</property>
     <property name="page_size">0</property>
@@ -544,6 +544,7 @@
             <child>
               <object class="GtkToolButton" id="sourcetoolbutton">
                 <property name="visible">True</property>
+                <property name="is_important">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">Choose Video Source</property>
                 <property name="label" translatable="yes">Source</property>
@@ -557,6 +558,7 @@
             <child>
               <object class="GtkToolButton" id="queue_start1">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">False</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">Start Encoding</property>
@@ -571,6 +573,7 @@
             <child>
               <object class="GtkToolButton" id="queue_pause1">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">False</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">Pause Encoding</property>
@@ -585,6 +588,7 @@
             <child>
               <object class="GtkToolButton" id="queue_add">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">False</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">Add to Queue</property>
@@ -599,6 +603,7 @@
             <child>
               <object class="GtkToggleToolButton" id="show_queue">
                 <property name="visible">True</property>
+                <property name="is_important">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">Show Queue</property>
                 <property name="label" translatable="yes">Show Queue</property>
@@ -612,6 +617,7 @@
             <child>
               <object class="GtkToggleToolButton" id="show_picture">
                 <property name="visible">True</property>
+                <property name="is_important">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">Open Picture Settings and Preview window.  Here you can adjust cropping, resolution, aspect ratio, and filters.</property>
                 <property name="label" translatable="yes">Picture Settings</property>
@@ -625,6 +631,7 @@
             <child>
               <object class="GtkToggleToolButton" id="show_activity">
                 <property name="visible">True</property>
+                <property name="is_important">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">Show Activity Window</property>
                 <property name="label" translatable="yes">Activity Window</property>
@@ -755,7 +762,7 @@
                                     <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="left_padding">8</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox4">
                                         <property name="visible">True</property>
@@ -823,7 +830,7 @@
                                     <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="left_padding">8</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox44">
                                         <property name="visible">True</property>
@@ -868,7 +875,7 @@
                                     <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="left_padding">8</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox42">
                                         <property name="visible">True</property>
@@ -891,7 +898,7 @@
                                             <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>
+                                            <property name="width_chars">8</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1063,7 +1070,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>
@@ -2024,7 +2031,7 @@ FFmpeg's and Theora's scale is more linear.  These encoders do not have a lossle
                                 <property name="n_columns">7</property>
                                 <child>
                                   <object class="GtkComboBox" id="AudioTrack">
-                                    <property name="width_request">215</property>
+                                    <property name="width_request">180</property>
                                     <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="tooltip-text" translatable="yes">List of audio tracks available from your source.</property>
@@ -2204,6 +2211,7 @@ For source audio that has a wide dynamic range (very loud and very soft sequence
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2845,9 +2853,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>
@@ -3584,14 +3592,15 @@ Requires subme >= 6 and trellis >= 1.</property>
                       <object class="GtkToolbar" id="presets_toolbar">
                         <property name="icon-size">2</property>
                         <property name="visible">True</property>
-                        <property name="toolbar_style">both-horiz</property>
                         <property name="show_arrow">False</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="GtkToolButton" id="presets_save">
                             <property name="visible">True</property>
                             <property name="sensitive">True</property>
-                            <property name="is_important">True</property>
+                            <property name="is_important">False</property>
+                            <property name="label" translatable="yes">_Save</property>
+                            <property name="use_underline">True</property>
                             <property name="tooltip-text" translatable="yes">Save current settings to new preset.</property>
                             <property name="icon_name">gtk-save</property>
                             <signal name="clicked" handler="presets_save_clicked_cb"/>
@@ -3604,7 +3613,9 @@ Requires subme >= 6 and trellis >= 1.</property>
                           <object class="GtkToolButton" id="presets_remove">
                             <property name="visible">True</property>
                             <property name="sensitive">True</property>
-                            <property name="is_important">True</property>
+                            <property name="is_important">False</property>
+                            <property name="label" translatable="yes">_Delete</property>
+                            <property name="use_underline">True</property>
                             <property name="tooltip-text" translatable="yes">Delete the currently selected preset.</property>
                             <property name="icon_name">gtk-delete</property>
                             <signal name="clicked" handler="presets_remove_clicked_cb"/>
@@ -4136,57 +4147,31 @@ Requires subme >= 6 and trellis >= 1.</property>
                               <object class="GtkVBox" id="vbox3">
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="constant_rate_factor">
-                                    <property name="label" translatable="yes">Use CRF (Instead of CQP) for Constant Quality encodes</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment59">
+                                  <object class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
-                                    <property name="left_padding">22</property>
+                                    <property name="spacing">4</property>
                                     <child>
-                                      <object class="GtkHBox" id="hbox6">
+                                      <object class="GtkComboBox" id="VideoQualityGranularity">
+                                        <property name="width_request">55</property>
                                         <property name="visible">True</property>
-                                        <property name="spacing">4</property>
-                                        <child>
-                                          <object class="GtkComboBox" id="VideoQualityGranularity">
-                                            <property name="width_request">55</property>
-                                            <property name="visible">True</property>
-                                            <signal name="changed" handler="vqual_granularity_changed_cb"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label85">
-                                            <property name="visible">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Constant Quality fractional granularity</property>
-                                          </object>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
+                                        <signal name="changed" handler="vqual_granularity_changed_cb"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="label85">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Constant Quality fractional granularity</property>
                                       </object>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
@@ -4701,6 +4686,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">
@@ -4715,6 +4701,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <property name="visible">True</property>
           </object>
           <packing>
+            <property name="padding">5</property>
             <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
@@ -4728,8 +4715,8 @@ Requires subme >= 6 and trellis >= 1.</property>
             <property name="shadow_type">GTK_SHADOW_IN</property>
             <child>
               <object class="GtkTextView" id="activity_view">
-                <property name="width_request">400</property>
-                <property name="height_request">500</property>
+                <property name="width_request">600</property>
+                <property name="height_request">600</property>
                 <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>
@@ -4757,6 +4744,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">
@@ -4770,6 +4758,7 @@ Requires subme >= 6 and trellis >= 1.</property>
               <object class="GtkToolButton" id="queue_start2">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="is_important">True</property>
                 <property name="label" translatable="yes">Start</property>
                 <property name="icon_name">hb-play</property>
                 <signal handler="queue_start_clicked_cb" name="clicked"/>
@@ -4781,6 +4770,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <child>
               <object class="GtkToolButton" id="queue_pause2">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">False</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">Pause</property>
@@ -4794,6 +4784,7 @@ Requires subme >= 6 and trellis >= 1.</property>
             <child>
               <object class="GtkToolButton" id="queue_edit">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="sensitive">False</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">Edit</property>
@@ -5758,7 +5749,7 @@ Encoders are most effecient when the video dimensions are aligned to some specif
                                   <object class="GtkEntry" id="PictureDetelecineCustom">
                                     <property name="width_chars">8</property>
                                     <property name="tooltip-text" translatable="yes">Custom detelecine filter string format
-       JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane</property>
+       JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
                                     <signal name="changed" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
@@ -5843,7 +5834,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                                   <object class="GtkEntry" id="PictureDecombCustom">
                                     <property name="width_chars">8</property>
                                     <property name="tooltip-text" translatable="yes">Custom decomb filter string format
-       Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight</property>
+       Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity</property>
                                     <signal name="changed" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
@@ -5887,7 +5878,7 @@ The classic deinterlace filter is applied to all frames. Frames that are not int
                                   <object class="GtkEntry" id="PictureDeinterlaceCustom">
                                     <property name="width_chars">8</property>
                                     <property name="tooltip-text" translatable="yes">Custom deinterlace filter string format
-       YadifMode:YadifParity:McdintMode:McdeintOp</property>
+       YadifMode:YadifParity:McdintMode:McdeintQp</property>
                                     <signal name="changed" handler="setting_widget_changed_cb"/>
                                   </object>
                                   <packing>
@@ -6172,6 +6163,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"/>