OSDN Git Service

(root) / handbrake-jp / handbrake-jp-git.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LinGui: Make preset key/values mostly align with macui presets.
[handbrake-jp/handbrake-jp-git.git] / gtk / src / ghb.ui
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 594388b..d1b0486 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -114,12 +114,12 @@
     <property name="value">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment5">
-    <property name="upper">100</property>
+    <property name="upper">1</property>
     <property name="lower">0</property>
-    <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">0.1</property>
     <property name="page_size">0</property>
-    <property name="value">63</property>
+    <property name="value">0.63</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
     <property name="upper">4</property>
@@ -153,6 +153,14 @@
     <property name="page_size">1</property>
     <property name="value">0</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment20">
+    <property name="upper">15</property>
+    <property name="lower">4</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
   <object class="GtkUIManager" id="uimanager1">
     <child>
       <object class="GtkActionGroup" id="actiongroup1">
@@ -715,6 +723,8 @@
                                     <property name="tooltip-text" translatable="yes">Destination path with file name for output.</property>
                                     <property name="width_chars">41</property>
                                     <signal handler="destination_entry_changed_cb" name="changed"/>
+                                    <signal handler="destination_grab_cb" name="grab-focus" after="yes"/>
+                                    <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -786,7 +796,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkComboBox" id="container">
+                                  <object class="GtkComboBox" id="FileFormat">
                                     <property name="visible">True</property>
                                     <property name="tooltip-text" translatable="yes">Output file container type</property>
                                     <signal handler="container_changed_cb" name="changed"/>
@@ -803,11 +813,11 @@
                                     <property name="xalign">0.10000000149011612</property>
                                     <property name="xscale">0</property>
                                     <child>
-                                      <object class="GtkCheckButton" id="ipod_file">
+                                      <object class="GtkCheckButton" id="Mp4iPodCompatible">
                                         <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="label" translatable="yes">IPod File</property>
+                                        <property name="label" translatable="yes">iPod 5G Support</property>
                                         <property name="draw_indicator">True</property>
                                         <signal handler="setting_widget_changed_cb" name="toggled"/>
                                       </object>
@@ -819,11 +829,11 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="http_optimize_mp4">
+                                  <object class="GtkCheckButton" id="Mp4HttpOptimize">
                                     <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="label" translatable="yes">HTTP Optimized MP4</property>
+                                    <property name="label" translatable="yes">Web optimized</property>
                                     <property name="draw_indicator">True</property>
                                     <signal handler="http_opt_changed_cb" name="toggled"/>
                                   </object>
@@ -833,12 +843,12 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="large_mp4">
+                                  <object class="GtkCheckButton" id="Mp4LargeFile">
                                     <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">Caution: This option will likely break device compatiblity with all but the AppleTV Take 2. Checking this box enables a 64 bit mp4 file which can be over 4 GB.</property>
-                                    <property name="label" translatable="yes">Large MP4 Files (&gt;4GB)</property>
+                                    <property name="label" translatable="yes">Large file size (&gt;4GB)</property>
                                     <property name="draw_indicator">True</property>
                                     <signal handler="setting_widget_changed_cb" name="toggled"/>
                                   </object>
@@ -858,7 +868,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Destination&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;&lt;u&gt;D&lt;/u&gt;estination&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -933,6 +943,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>
                                             <property name="label" translatable="yes">--</property>
+                                            <property name="width_chars">15</property>
                                           </object>
                                           <packing>
                                             <property name="position">1</property>
@@ -1291,7 +1302,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="GtkCheckButton" id="grayscale">
+                                      <object class="GtkCheckButton" id="VideoGrayScale">
                                         <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>
@@ -1304,7 +1315,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="detelecine">
+                                      <object class="GtkCheckButton" id="PictureDetelecine">
                                         <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>
@@ -1319,7 +1330,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="decomb">
+                                      <object class="GtkCheckButton" id="PictureDecomb">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">De-Comb</property>
@@ -1334,17 +1345,43 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="deblock">
+                                      <object class="GtkHBox" id="hbox25">
                                         <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="label" translatable="yes">Deblock</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="setting_widget_changed_cb" name="toggled"/>
-                                        <signal handler="tweak_setting_cb" name="button-press-event"/>
+                                        <child>
+                                          <object class="GtkLabel" id="label41">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Deblock:</property>
+                                            <property name="width_chars">10</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment20">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="xscale">0.55</property>
+                                            <child>
+                                              <object class="GtkHScale" id="PictureDeblock">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="tooltip-text" translatable="yes">This is a filter that gets applied before encoding.  If the source looks blocky before encoding, you may want to use this.</property>
+                                                <property name="adjustment">adjustment20</property>
+                                                <property name="digits">0</property>
+                                                <property name="value_pos">GTK_POS_RIGHT</property>
+                                                <signal handler="setting_widget_changed_cb" name="value_changed"/>
+                                                <signal handler="format_deblock_cb" name="format-value"/>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -1353,29 +1390,22 @@
                                         <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="GtkEventBox" id="tweak_deinterlace">
+                                          <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
-                                            <property name="visible_window">False</property>
-                                            <property name="above_child">True</property>
-                                            <signal name="button_press_event" handler="tweak_setting_cb"/>
-                                            <child>
-                                              <object class="GtkLabel" id="label20">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="selectable">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="xalign">0</property>
-                                                <property name="label" translatable="yes">Deinterlace:</property>
-                                                <property name="width_chars">10</property>
-                                              </object>
-                                            </child>
+                                            <property name="can_focus">True</property>
+                                            <property name="selectable">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="xalign">0</property>
+                                            <property name="label" translatable="yes">Deinterlace:</property>
+                                            <property name="width_chars">10</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkComboBox" id="deinterlace">
+                                          <object class="GtkComboBox" id="PictureDeinterlace">
+                                            <property name="width_request">100</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>
                                             <signal handler="setting_widget_changed_cb" name="changed"/>
@@ -1386,6 +1416,24 @@
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkComboBoxEntry" id="tweak_PictureDeinterlace">
+                                            <property name="visible">False</property>
+                                            <signal handler="setting_widget_changed_cb" name="changed"/>
+                                            <child internal-child="entry">
+                                              <object class="GtkEntry" id="comboboxentry-entry1">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="width_chars">15</property>
+                                                <signal handler="deint_tweak_focus_out_cb" name="focus_out_event"/>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1398,28 +1446,21 @@
                                         <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="GtkEventBox" id="tweak_denoise">
+                                          <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
-                                            <property name="visible_window">False</property>
-                                            <property name="above_child">True</property>
-                                            <signal name="button_press_event" handler="tweak_setting_cb"/>
-                                            <child>
-                                              <object class="GtkLabel" id="label21">
-                                                <property name="visible">True</property>
-                                                <property name="selectable">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">Denoise:</property>
-                                                <property name="width_chars">10</property>
-                                              </object>
-                                            </child>
+                                            <property name="selectable">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">Denoise:</property>
+                                            <property name="width_chars">10</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkComboBox" id="denoise">
+                                          <object class="GtkComboBox" id="PictureDenoise">
+                                            <property name="width_request">100</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>
                                             <signal handler="setting_widget_changed_cb" name="changed"/>
@@ -1430,6 +1471,24 @@
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkComboBoxEntry" id="tweak_PictureDenoise">
+                                            <property name="visible">False</property>
+                                            <signal handler="setting_widget_changed_cb" name="changed"/>
+                                            <child internal-child="entry">
+                                              <object class="GtkEntry" id="comboboxentry-entry2">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="width_chars">15</property>
+                                                <signal handler="denoise_tweak_focus_out_cb" name="focus_out_event"/>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1586,7 +1645,7 @@
                                             <property name="xalign">0</property>
                                             <property name="xscale">0</property>
                                             <child>
-                                              <object class="GtkComboBox" id="video_codec">
+                                              <object class="GtkComboBox" id="VideoEncoder">
                                                 <property name="visible">True</property>
                                                 <signal handler="vcodec_changed_cb" name="changed"/>
                                               </object>
@@ -1625,7 +1684,7 @@
                                             <property name="xalign">0</property>
                                             <property name="xscale">0</property>
                                             <child>
-                                              <object class="GtkComboBox" id="framerate">
+                                              <object class="GtkComboBox" id="VideoFramerate">
                                                 <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>
                                                 <signal handler="setting_widget_changed_cb" name="changed"/>
@@ -1644,22 +1703,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="variable_frame_rate">
-                                        <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="label" translatable="yes">Variable Frame Rate</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="vfr_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="two_pass">
+                                      <object class="GtkCheckButton" id="VideoTwoPass">
                                         <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>
@@ -1668,7 +1712,7 @@
                                         <signal handler="setting_widget_changed_cb" name="toggled"/>
                                       </object>
                                       <packing>
-                                        <property name="position">3</property>
+                                        <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1677,7 +1721,7 @@
                                         <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.23999999463558197</property>
                                         <child>
-                                          <object class="GtkCheckButton" id="turbo">
+                                          <object class="GtkCheckButton" id="VideoTurboTwoPass">
                                             <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>
@@ -1689,7 +1733,7 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="position">4</property>
+                                        <property name="position">3</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -1767,7 +1811,7 @@
                                             <property name="xalign">0.11999999731779099</property>
                                             <property name="xscale">0.10000000149011612</property>
                                             <child>
-                                              <object class="GtkSpinButton" id="video_bitrate">
+                                              <object class="GtkSpinButton" id="VideoAvgBitrate">
                                                 <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>
@@ -1807,7 +1851,7 @@
                                             <property name="xalign">0.11999999731779099</property>
                                             <property name="xscale">0.10000000149011612</property>
                                             <child>
-                                              <object class="GtkSpinButton" id="video_target_size">
+                                              <object class="GtkSpinButton" id="VideoTargetSize">
                                                 <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>
@@ -1845,14 +1889,15 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHScale" id="video_quality">
+                                          <object class="GtkHScale" id="VideoQualitySlider">
                                             <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="adjustment">adjustment5</property>
-                                            <property name="digits">0</property>
+                                            <property name="digits">3</property>
                                             <property name="value_pos">GTK_POS_RIGHT</property>
                                             <signal handler="setting_widget_changed_cb" name="value_changed"/>
+                                            <signal handler="format_vquality_cb" name="format-value"/>
                                           </object>
                                           <packing>
                                             <property name="position">1</property>
@@ -2012,7 +2057,7 @@
                                               </object>
                                             </child>
                                             <child>
-                                              <object class="GtkHScale" id="audio_drc">
+                                              <object class="GtkHScale" id="AudioTrackDRCSlider">
                                                 <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>
@@ -2045,7 +2090,7 @@
                                     <property name="n_rows">2</property>
                                     <property name="n_columns">5</property>
                                     <child>
-                                      <object class="GtkComboBox" id="audio_track">
+                                      <object class="GtkComboBox" id="AudioTrack">
                                         <property name="width_request">215</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>
@@ -2057,7 +2102,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="audio_codec">
+                                      <object class="GtkComboBox" id="AudioEncoder">
                                         <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>
                                         <signal handler="audio_codec_changed_cb" name="changed"/>
@@ -2071,7 +2116,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="audio_rate">
+                                      <object class="GtkComboBox" id="AudioSamplerate">
                                         <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>
                                         <signal handler="audio_widget_changed_cb" name="changed"/>
@@ -2147,10 +2192,10 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="audio_mix">
+                                      <object class="GtkComboBox" id="AudioMixdown">
                                         <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>
-                                        <signal handler="audio_widget_changed_cb" name="changed"/>
+                                        <signal handler="audio_mix_changed_cb" name="changed"/>
                                       </object>
                                       <packing>
                                         <property name="left_attach">4</property>
@@ -2161,7 +2206,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="audio_bitrate">
+                                      <object class="GtkComboBox" id="AudioBitrate">
                                         <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>
                                         <signal handler="audio_widget_changed_cb" name="changed"/>
@@ -2230,7 +2275,7 @@
                                     <property name="spacing">5</property>
 
                                     <child>
-                                      <object class="GtkComboBox" id="source_audio_lang">
+                                      <object class="GtkComboBox" id="SourceAudioLang">
                                         <property name="width_request">150</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>
@@ -2272,7 +2317,7 @@
                                     <property name="spacing">5</property>
 
                                     <child>
-                                      <object class="GtkComboBox" id="subtitle_lang">
+                                      <object class="GtkComboBox" id="Subtitles">
                                         <property name="width_request">150</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>
@@ -2280,7 +2325,7 @@
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="forced_subtitles">
+                                      <object class="GtkCheckButton" id="SubtitlesForced">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="has_tooltip">True</property>
@@ -2554,39 +2599,6 @@
                                         <property name="right_attach">2</property>
                                       </packing>
                                     </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="x264_brdo">
-                                        <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">When B-frame rate distortion optimization is enabled, x264 tries several different methods of compression for each part of a frame, and chooses the one that looks the best. You need to use a subpixel motion estimation refinement level of 6 or 7 for this to work.</property>
-                                        <property name="label" translatable="yes">B-Frame Rate Distortion</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="x264_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="x264_bime">
-                                        <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">When bidrectional motion estimation refinement is activated, x264 will optimize motion vectors both forwards and backwards in time. This improves quality, and while it slows down encoding, it does not make playback any more difficult.</property>
-                                        <property name="label" translatable="yes">Bidirectional Refinement</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="x264_widget_changed_cb" name="toggled"/>
-                                      </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>
@@ -2627,7 +2639,7 @@
                                 <property name="left_padding">12</property>
                                 <property name="right_padding">2</property>
                                 <child>
-                                  <object class="GtkTextView" id="x264_options">
+                                  <object class="GtkTextView" id="x264Option">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                         <property name="tooltip-text" translatable="yes">Your selected options will appear here. 
@@ -2635,7 +2647,7 @@ 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:brdo=0:bime=0:me=hex:merange=16:subme=5:
+weightb=0:me=hex:merange=16:subme=5:
 analyse=some:8x8dct=0:deblock=0,0:trellis=0:
 no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                     <property name="wrap_mode">GTK_WRAP_CHAR</property>
@@ -2793,7 +2805,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                               <object class="GtkComboBox" id="x264_subme">
                                                 <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">Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 7 is highest quality and slowest.  5 or 6 are commonly used values.</property>
+                                                <property name="tooltip-text" translatable="yes">Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 9 is highest quality and slowest.  5 or 6 are commonly used values.</property>
                                                 <signal handler="x264_widget_changed_cb" name="changed"/>
                                               </object>
                                             </child>
@@ -3074,7 +3086,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                       <object class="GtkHBox" id="hbox30">
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkCheckButton" id="chapter_markers">
+                          <object class="GtkCheckButton" id="ChapterMarkers">
                             <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>
@@ -3111,6 +3123,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="headers_clickable">True</property>
                             <property name="rules_hint">True</property>
+                            <property name="enable-search">False</property>
                           </object>
                         </child>
                       </object>
@@ -3278,6 +3291,25 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkButton" id="presets_restore">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip-text" translatable="yes">Reload HandBrakes standard presets</property>
+                                <property name="relief">GTK_RELIEF_NONE</property>
+                                <signal handler="presets_restore_clicked_cb" name="clicked"/>
+                                <child>
+                                  <object class="GtkImage" id="image7">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-refresh</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -3314,97 +3346,153 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
-    <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox6">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkFrame" id="frame16">
+          <object class="GtkHBox" id="hbox24">
             <property name="visible">True</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
             <child>
-              <object class="GtkAlignment" id="alignment2">
+              <object class="GtkVBox" id="vbox19">
                 <property name="visible">True</property>
-                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="vbox29">
+                  <object class="GtkEventBox" id="eventbox1">
                     <property name="visible">True</property>
+                    <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
+                    <property name="visible_window">False</property>
+                    <property name="above_child">True</property>
+                    <signal name="button_press_event" handler="easter_egg_cb"/>
                     <child>
-                      <object class="GtkCheckButton" id="use_source_name">
+                      <object class="GtkImage" id="image3">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">The destination filename will be automatically
-generated from the source filename or volume
-label.</property>
-                        <property name="label" translatable="yes">Derive destination name from source</property>
-                        <property name="draw_indicator">True</property>
-                        <signal handler="pref_changed_cb" name="toggled"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="linear_vquality">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">x264 uses a different scale for video quality than
-other codecs.  This adjusts the scale so that 
-similar values give similar quality across all the
-video codecs.</property>
-                        <property name="label" translatable="yes">Adjust x264 video quality scale</property>
-                        <property name="draw_indicator">True</property>
-                        <signal handler="pref_changed_cb" name="toggled"/>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="icon_size">6</property>
+                        <property name="icon_name">hb-icon</property>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame16">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment6">
+                    <property name="visible">True</property>
+                    <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkCheckButton" id="noscale">
+                      <object class="GtkVBox" id="vbox29">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">When picture settings require that the image 
+                        <child>
+                          <object class="GtkCheckButton" id="use_source_name">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text">The destination filename will be automatically
+generated from the source filename or volume
+label.</property>
+                            <property name="label" translatable="yes">Automatically generate destination</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="pref_changed_cb"/>
+                          </object>
+                        </child>
+                        <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"/>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="noscale">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text">When picture settings require that the image 
 dimensions be rounded to some multiple number
 of pixels. This setting will crop a few extra pixels
 instead of doing exact cropping and scaling to
 the required multiple.</property>
-                        <property name="label" translatable="yes">Loose cropping</property>
-                        <property name="draw_indicator">True</property>
-                        <signal handler="pref_changed_cb" name="toggled"/>
-                      </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="directqp">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip-text" translatable="yes">HandBrake allows entry of QP/CRF values for x264 
+                            <property name="label" translatable="yes">Loose cropping</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="pref_changed_cb"/>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="directqp">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text">HandBrake allows entry of QP/CRF values for x264 
 and FFMPEG instead of the percentage metric.
 This preference is associated with the current
 preset only.
 
 You *MUST* save the current preset to preserve
 this setting.</property>
-                        <property name="label" translatable="yes">Allow direct QP/CRF</property>
-                        <property name="draw_indicator">True</property>
-                        <signal handler="vcodec_changed_cb" name="toggled"/>
+                            <property name="label" translatable="yes">Allow direct QP/CRF</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="vcodec_changed_cb"/>
+                          </object>
+                          <packing>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="allow_tweaks">
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Allow Tweaks</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="tweaks_changed_cb"/>
+                          </object>
+                          <packing>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="hbfd_feature">
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Allow HandBrake For Dummies</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="hbfd_feature_changed_cb"/>
+                          </object>
+                          <packing>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label18">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Preferences&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
               </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Preferences&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -3559,7 +3647,7 @@ this setting.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="preset_name">
+                  <object class="GtkEntry" id="PresetName">
                     <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>
@@ -3567,6 +3655,7 @@ this setting.</property>
                     <property name="activates_default">True</property>
                     <property name="width_chars">30</property>
                     <property name="truncate_multiline">True</property>
+                    <signal handler="preset_name_changed_cb" name="changed"/>
                   </object>
                   <packing>
                     <property name="position">1</property>
@@ -3592,8 +3681,8 @@ this setting.</property>
                     <property name="left_padding">12</property>
                     <property name="right_padding">4</property>
                     <child>
-                      <object class="GtkTextView" id="preset_description">
-                        <property name="height_request">50</property>
+                      <object class="GtkTextView" id="PresetDescription">
+                        <property name="height_request">60</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>
@@ -3617,6 +3706,43 @@ this setting.</property>
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHBox" id="hbox43">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkRadioButton" id="preset_type_folder">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Folder</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="preset_type_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="preset_type_normal">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Preset</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">preset_type_folder</property>
+                    <signal name="toggled" handler="preset_type_changed_cb"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
@@ -3677,6 +3803,16 @@ this setting.</property>
           <placeholder/>
         </child>
         <child>
+          <object class="GtkLabel" id="activity_location">
+            <property name="justify">GTK_JUSTIFY_LEFT</property>
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkScrolledWindow" id="activity_scroll">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -3697,7 +3833,7 @@ this setting.</property>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -3760,6 +3896,19 @@ this setting.</property>
                 <property name="expand">False</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToolButton" id="queue_edit">
+                <property name="visible">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>
+                <property name="icon_name">hb-edit</property>
+                <signal handler="queue_edit_clicked_cb" name="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -3778,8 +3927,13 @@ this setting.</property>
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="queue_status">
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
                     <property name="visible">True</property>
                   </object>
+                  <packing>
+                    <property name="padding">10</property>
+                    <property name="expand">False</property>
+                  </packing>
                 </child>
                 <child>
                   <placeholder/>
@@ -3795,6 +3949,7 @@ this setting.</property>
           </object>
           <packing>
             <property name="position">1</property>
+            <property name="expand">False</property>
           </packing>
         </child>
         <child>
@@ -3806,18 +3961,21 @@ this setting.</property>
             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
             <child>
               <object class="GtkTreeView" id="queue_list">
-                <property name="width_request">640</property>
+                <property name="width_request">900</property>
                 <property name="height_request">300</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>
                 <property name="headers_visible">False</property>
-                <property name="headers_clickable">True</property>
+                <property name="headers_clickable">False</property>
+                <property name="hover_expand">False</property>
+                <signal handler="queue_key_press_cb" name="key-press-event"/>
               </object>
             </child>
           </object>
           <packing>
             <property name="position">2</property>
+            <property name="expand">True</property>
           </packing>
         </child>
         <child>
@@ -3974,7 +4132,7 @@ this setting.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="crop_left">
+                                  <object class="GtkSpinButton" id="PictureLeftCrop">
                                     <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>
@@ -4004,7 +4162,7 @@ this setting.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="crop_top">
+                                  <object class="GtkSpinButton" id="PictureTopCrop">
                                     <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>
@@ -4020,7 +4178,7 @@ this setting.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="crop_bottom">
+                                  <object class="GtkSpinButton" id="PictureBottomCrop">
                                     <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>
@@ -4036,7 +4194,7 @@ this setting.</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="crop_right">
+                                  <object class="GtkSpinButton" id="PictureRightCrop">
                                     <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>
@@ -4073,7 +4231,7 @@ this setting.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="autocrop">
+                          <object class="GtkCheckButton" id="PictureAutoCrop">
                             <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>
@@ -4197,7 +4355,7 @@ this setting.</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>
                             <child>
-                              <object class="GtkCheckButton" id="round_dimensions">
+                              <object class="GtkCheckButton" id="ModDimensions">
                                 <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>
@@ -4239,7 +4397,7 @@ adjusted to keep the video's original aspect ratio.</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="keep_aspect">
+                              <object class="GtkCheckButton" id="PictureKeepRatio">
                                 <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>
githubのコードからのfolk
About OSDN
Find Software
Develop Software
Help