X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fsrc%2Fghb.ui;h=608743f4ade8b7ede844ea2d3ba23b8731c64809;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=5c8ad72dd4e5f2ae4f2aefae7e3ce0b88d686bcd;hpb=c6a1ffbae21414f9ae59e67e16df137007828144;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 5c8ad72d..608743f4 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -284,17 +284,17 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="source1">
+          <object class="GtkAction" id="source_action">
             <property name="stock_id">gtk-open</property>
-            <property name="name">source1</property>
+            <property name="name">source_action</property>
             <property name="label">_Source</property>
             <signal handler="source_button_clicked_cb" name="activate"/>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="source_single">
+          <object class="GtkAction" id="source_single_action">
             <property name="icon-name">gtk-open</property>
-            <property name="name">source_single</property>
+            <property name="name">source_single_action</property>
             <property name="label">Single _Title</property>
             <signal handler="single_title_source_cb" name="activate"/>
           </object>
@@ -426,8 +426,8 @@
     <ui>
       <menubar name="menubar1">
         <menu action="menuitem1">
-          <menuitem action="source1"/>
-          <menuitem action="source_single"/>
+          <menuitem action="source_action"/>
+          <menuitem action="source_single_action"/>
           <menuitem action="destination1"/>
           <separator/>
           <menuitem action="preferences"/>
@@ -462,21 +462,23 @@
 
   <object class="GtkMenu" id="presets_menu">
     <child>
-      <object class="GtkImageMenuItem" id="presets_save">
-        <property name="label">gtk-save</property>
+      <object class="GtkImageMenuItem" id="presets_default">
+        <property name="label">_Make Default</property>
+        <property name="image">image12</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
-        <signal name="activate" handler="presets_save_clicked_cb"/>
+        <signal name="activate" handler="presets_default_clicked_cb"/>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="presets_remove">
-        <property name="label">gtk-delete</property>
+      <object class="GtkImageMenuItem" id="presets_new_folder">
+        <property name="label" translatable="yes">New _Folder</property>
+        <property name="use-underline">True</property>
         <property name="visible">True</property>
-        <property name="use_underline">True</property>
         <property name="use_stock">True</property>
-        <signal name="activate" handler="presets_remove_clicked_cb"/>
+        <property name="image">image11</property>
+        <signal name="activate" handler="presets_new_folder_clicked_cb"/>
       </object>
     </child>
     <child>
@@ -484,7 +486,7 @@
         <property name="label" translatable="yes">_Export</property>
         <property name="use-underline">True</property>
         <property name="visible">True</property>
-        <property name="image">image1</property>
+        <property name="image">image13</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="preset_export_clicked_cb"/>
       </object>
@@ -494,14 +496,15 @@
         <property name="label" translatable="yes">_Import</property>
         <property name="use-underline">True</property>
         <property name="visible">True</property>
-        <property name="image">image5</property>
+        <property name="image">image14</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="preset_import_clicked_cb"/>
       </object>
     </child>
     <child>
       <object class="GtkImageMenuItem" id="presets_restore">
-        <property name="label">gtk-refresh</property>
+        <property name="label" translatable="yes">_Update Built-in Presets</property>
+        <property name="image">image15</property>
         <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
@@ -539,7 +542,7 @@
             <property name="visible">True</property>
             <property name="icon_size">5</property>
             <child>
-              <object class="GtkToolButton" id="toolbutton1">
+              <object class="GtkToolButton" id="sourcetoolbutton">
                 <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">Choose Video Source</property>
@@ -1511,26 +1514,19 @@
                     <child>
                       <object class="GtkAlignment" id="alignment56">
                         <property name="visible">True</property>
-                        <property name="right_padding">10</property>
+                        <property name="right_padding">12</property>
+                        <property name="top_padding">12</property>
 
                     <child>
                       <object class="GtkVBox" id="vbox9">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <object class="GtkLabel" id="label73">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
 
                         <child>
                           <object class="GtkFrame" id="frame8">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment19">
                                 <property name="visible">True</property>
@@ -1539,8 +1535,8 @@
                                 <property name="right_padding">4</property>
                                 <child>
                                   <object class="GtkImage" id="preview_button_image">
-                                    <property name="width_request">240</property>
-                                    <property name="height_request">120</property>
+                                    <property name="width_request">400</property>
+                                    <property name="height_request">200</property>
                                     <property name="visible">True</property>
                                     <property name="icon_name">hb-icon</property>
                                     <property name="icon-size">6</property>
@@ -1549,13 +1545,6 @@
                                 </child>
                               </object>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label21">
-                                <property name="visible">True</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
-
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1564,6 +1553,11 @@
                           </packing>
                         </child>
 
+                    <child>
+                      <object class="GtkAlignment" id="alignment57">
+                        <property name="visible">True</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
                         <child>
                           <object class="GtkHBox" id="hbox7">
                             <property name="visible">True</property>
@@ -1575,7 +1569,7 @@
                                 <property name="justify">right</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -1588,26 +1582,22 @@
                                 <property name="label" translatable="yes">--</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
 
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                         </child>
+
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+
                       </object>
                     </child>
 
@@ -3453,7 +3443,7 @@ no-dct-decimate=0:cabac=1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="alignment66">
+              <object class="GtkAlignment" id="alignment71">
                 <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="left_padding">12</property>
@@ -3530,14 +3520,26 @@ no-dct-decimate=0:cabac=1</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_default">
+                          <object class="GtkToolButton" id="presets_save">
                             <property name="visible">True</property>
                             <property name="sensitive">True</property>
                             <property name="is_important">True</property>
-                            <property name="label" translatable="yes">Default</property>
-                            <property name="tooltip-text" translatable="yes">Make the current preset the default.</property>
-                            <property name="icon_name">gtk-apply</property>
-                            <signal handler="presets_default_clicked_cb" name="clicked"/>
+                            <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"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkToolButton" id="presets_remove">
+                            <property name="visible">True</property>
+                            <property name="sensitive">True</property>
+                            <property name="is_important">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"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -4014,15 +4016,23 @@ no-dct-decimate=0:cabac=1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox63">
+                          <object class="GtkAlignment" id="alignment70">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="spacing">4</property>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="yscale">0</property>
+                            <property name="left_padding">12</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
                             <child>
-                              <placeholder/>
+                              <object class="GtkCheckButton" id="AddCC">
+                                <property name="label" translatable="yes">Add Closed Captions when available</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="active">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="pref_changed_cb"/>
+                              </object>
                             </child>
                           </object>
                           <packing>
@@ -4038,7 +4048,7 @@ no-dct-decimate=0:cabac=1</property>
                     <child type="tab">
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Audio</property>
+                        <property name="label" translatable="yes">Audio/Subtitles</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -4267,6 +4277,29 @@ no-dct-decimate=0:cabac=1</property>
                           </packing>
                         </child>
                         <child>
+                          <object class="GtkAlignment" id="alignment48">
+                            <property name="visible">True</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkCheckButton" id="AutoScan">
+                                <property name="label" translatable="yes">Automatically Scan DVD when loaded</property>
+                                <property name="tooltip-text" translatable="yes">Scans the DVD whenever a new disc is loaded</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="pref_changed_cb"/>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkAlignment" id="hidden_prefs">
                             <property name="visible">True</property>
                             <property name="top_padding">6</property>
@@ -4306,7 +4339,7 @@ no-dct-decimate=0:cabac=1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">4</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
                       </object>
@@ -4498,7 +4531,6 @@ no-dct-decimate=0:cabac=1</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>
@@ -4549,43 +4581,6 @@ no-dct-decimate=0:cabac=1</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>
@@ -6590,12 +6585,24 @@ libx264 authors:
       <action-widget response="-3">source_ok</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image1">
+  <object class="GtkImage" id="image11">
+    <property name="visible">True</property>
+    <property name="stock">gtk-new</property>
+  </object>
+  <object class="GtkImage" id="image12">
+    <property name="visible">True</property>
+    <property name="stock">gtk-apply</property>
+  </object>
+  <object class="GtkImage" id="image13">
     <property name="visible">True</property>
     <property name="stock">gtk-save-as</property>
   </object>
-  <object class="GtkImage" id="image5">
+  <object class="GtkImage" id="image14">
     <property name="visible">True</property>
     <property name="stock">gtk-open</property>
   </object>
+  <object class="GtkImage" id="image15">
+    <property name="visible">True</property>
+    <property name="stock">gtk-refresh</property>
+  </object>
 </interface>