X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fghb.ui;h=8319f0e5bec14d125af3aa904d701ebdc752483e;hb=b9de509bdbecf022aeade8c57e33e7ffe3f56cf6;hp=4b45d7d4a1d63641aaa669b324c15aa9888b1a8b;hpb=7b9d3288f374fc0f7714805f3e26e461d086cdff;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 4b45d7d4..8319f0e5 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -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>
@@ -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>
@@ -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>
+                                  <object class="GtkHBox" id="hbox6">
                                     <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">
-                                    <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>
@@ -4771,6 +4756,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"/>
@@ -4782,6 +4768,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>
@@ -4795,6 +4782,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>