X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fsrc%2Fghb.ui;h=53174bf195713462991e19731d8d65b68c2f8da0;hb=fa148e2e3a3d2e89bcc482999f3442b2dc454bf5;hp=db1590f3b8845a02b9818aa221163fd400ac4f80;hpb=fdb09bb478a03a07f7de8c19a1ee4d75832533c8;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index db1590f3..53174bf1 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -121,22 +121,6 @@
     <property name="page_size">0</property>
     <property name="value">20.25</property>
   </object>
-  <object class="GtkAdjustment" id="adjustment6">
-    <property name="upper">4</property>
-    <property name="lower">0</property>
-    <property name="page_increment">1</property>
-    <property name="step_increment">0.2</property>
-    <property name="page_size">0</property>
-    <property name="value">2.6</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment7">
-    <property name="upper">4</property>
-    <property name="lower">1</property>
-    <property name="page_increment">0.20000000000000001</property>
-    <property name="step_increment">0.20000000000000001</property>
-    <property name="page_size">0</property>
-    <property name="value">2.3999999999999999</property>
-  </object>
   <object class="GtkAdjustment" id="adjustment8">
     <property name="upper">16</property>
     <property name="lower">1</property>
@@ -181,7 +165,7 @@
     <property name="upper">1</property>
     <property name="lower">0</property>
     <property name="page_increment">0.5</property>
-    <property name="step_increment">0.1</property>
+    <property name="step_increment">0.05</property>
     <property name="page_size">0</property>
     <property name="value">0</property>
   </object>
@@ -249,24 +233,8 @@
     <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="adjustment34">
-    <property name="upper">1</property>
+    <property name="upper">2</property>
     <property name="lower">0</property>
     <property name="page_increment">0.5</property>
     <property name="step_increment">0.1</property>
@@ -1789,6 +1757,21 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkCheckButton" id="VideoFrameratePFR">
+                                <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">Enables variable framerate output with a peak rate determined by the framerate setting</property>
+                                <property name="label" translatable="yes">Peak Framerate (VFR)</property>
+                                <property name="draw_indicator">True</property>
+                                <signal handler="setting_widget_changed_cb" name="toggled"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkCheckButton" id="VideoTwoPass">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -1800,7 +1783,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="position">2</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
@@ -1823,7 +1806,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="position">3</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                           </object>
@@ -3246,6 +3229,7 @@ Optimal mode gets slower as the maximum number of B-Frames increases, but makes
                                                 <property name="restrict_to_fill_level">False</property>
                                                 <property name="value_pos">GTK_POS_RIGHT</property>
                                                 <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                <signal name="format_value" handler="x264_format_slider_cb"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -3276,6 +3260,7 @@ Optimal mode gets slower as the maximum number of B-Frames increases, but makes
                                                 <property name="restrict_to_fill_level">False</property>
                                                 <property name="value_pos">GTK_POS_RIGHT</property>
                                                 <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                <signal name="format_value" handler="x264_format_slider_cb"/>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">1</property>
@@ -3305,9 +3290,11 @@ Optimal mode gets slower as the maximum number of B-Frames increases, but makes
                                                 <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">Psychovisual trellis is an experimental algorithm to further improve sharpness and detail retention beyond what Psychovisual RD does.  Recommended values are around 0.2, though higher values may help for very grainy video or lower bitrate encodes.  Not recommended for cel animation and other sharp-edged graphics.</property>
                                                 <property name="adjustment">adjustment23</property>
+                                                <property name="digits">2</property>
                                                 <property name="restrict_to_fill_level">False</property>
                                                 <property name="value_pos">GTK_POS_RIGHT</property>
-                                                <signal handler="x264_widget_changed_cb" name="value_changed"/>
+                                                <signal handler="x264_slider_changed_cb" name="value_changed"/>
+                                                <signal name="format_value" handler="x264_format_slider_cb"/>
                                               </object>
                                               <packing>
                                                 <property name="top_attach">2</property>