[gnome-subtitles] Fixed custom menu items which use stock images



commit ce5e17af5574247b2d318ba0bd85375748c11291
Author: Pedro Castro <mail pedrocastro org>
Date:   Sun May 31 18:18:47 2009 +0100

    Fixed custom menu items which use stock images
---
 src/Glade/MainWindow.glade |  348 +++++++++++++++++++++++++++-----------------
 1 files changed, 212 insertions(+), 136 deletions(-)

diff --git a/src/Glade/MainWindow.glade b/src/Glade/MainWindow.glade
index 4d8f8ea..499cff5 100644
--- a/src/Glade/MainWindow.glade
+++ b/src/Glade/MainWindow.glade
@@ -1,12 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Mar  8 19:27:05 2009 
-	Version: 3.0.1
-	Date: Thu Dec  7 16:42:10 2006
-	User: noup
-	Host: nouplab
--->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window">
     <property name="title">Gnome Subtitles</property>
     <signal name="size_allocate" handler="OnSizeAllocated"/>
@@ -26,8 +21,8 @@
                   <widget class="GtkMenu" id="fileMenu">
                     <child>
                       <widget class="GtkImageMenuItem" id="fileNew">
-                        <property name="visible">True</property>
                         <property name="label">gtk-new</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileNew"/>
@@ -35,8 +30,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="fileOpen">
-                        <property name="visible">True</property>
                         <property name="label">gtk-open</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileOpen"/>
@@ -44,9 +39,9 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="fileSave">
+                        <property name="label">gtk-save</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-save</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileSave"/>
@@ -54,13 +49,13 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="fileSaveAs">
+                        <property name="label">gtk-save-as</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-save-as</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileSaveAs"/>
-                        <accelerator key="S" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="S" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -81,82 +76,92 @@
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
                               <widget class="GtkImageMenuItem" id="fileTranslationNew">
+                                <property name="label" translatable="yes">_New</property>
                                 <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">_New</property>
                                 <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnFileTranslationNew"/>
                                 <child internal-child="image">
-                                  <widget class="GtkImage" id="fileTranslationNewMenuItemImage">
+                                  <widget class="GtkImage" id="fileTranslationNewImage">
+                                    <property name="visible">True</property>
                                     <property name="stock">gtk-new</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="fileTranslationOpen">
+                                <property name="label" translatable="yes">_Open</property>
                                 <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">_Open</property>
                                 <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnFileTranslationOpen"/>
                                 <child internal-child="image">
-                                  <widget class="GtkImage" id="fileTranslationOpenMenuItemImage">
+                                  <widget class="GtkImage" id="fileTranslationOpenImage">
+                                    <property name="visible">True</property>
                                     <property name="stock">gtk-open</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="fileTranslationSave">
+                                <property name="label" translatable="yes">_Save</property>
                                 <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">_Save</property>
                                 <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnFileTranslationSave"/>
-                                <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                                 <child internal-child="image">
-                                  <widget class="GtkImage" id="filetranslationSaveMenuItemImage">
+                                  <widget class="GtkImage" id="fileTranslationSaveImage">
+                                    <property name="visible">True</property>
                                     <property name="stock">gtk-save</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="fileTranslationSaveAs">
+                                <property name="label" translatable="yes">Save _As</property>
                                 <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">Save _As</property>
                                 <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnFileTranslationSaveAs"/>
-                                <accelerator key="T" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="T" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                                 <child internal-child="image">
-                                  <widget class="GtkImage" id="fileTranslationSaveAsMenuItemImage">
+                                  <widget class="GtkImage" id="fileTranslationSaveAsImage">
+                                    <property name="visible">True</property>
                                     <property name="stock">gtk-save-as</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="fileTranslationClose">
+                                <property name="label" translatable="yes">_Close</property>
                                 <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">_Close</property>
                                 <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnFileTranslationClose"/>
                                 <child internal-child="image">
-                                  <widget class="GtkImage" id="fileTranslationCloseMenuItemImage">
+                                  <widget class="GtkImage" id="fileTranslationCloseImage">
+                                    <property name="visible">True</property>
                                     <property name="stock">gtk-close</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -181,9 +186,9 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="fileProperties">
+                        <property name="label">gtk-properties</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-properties</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileProperties"/>
@@ -196,9 +201,9 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="fileClose">
+                        <property name="label">gtk-close</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-close</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileClose"/>
@@ -206,8 +211,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="fileQuit">
-                        <property name="visible">True</property>
                         <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnFileQuit"/>
@@ -226,25 +231,25 @@
                   <widget class="GtkMenu" id="editMenu">
                     <child>
                       <widget class="GtkImageMenuItem" id="editUndo">
+                        <property name="label">gtk-undo</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-undo</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnEditUndo"/>
-                        <accelerator key="Z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="Z" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="editRedo">
+                        <property name="label">gtk-redo</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-redo</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnEditRedo"/>
-                        <accelerator key="Z" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
-                        <accelerator key="Y" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="Y" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="Z" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -254,9 +259,9 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="editCut">
+                        <property name="label">gtk-cut</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-cut</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnEditCut"/>
@@ -264,9 +269,9 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="editCopy">
+                        <property name="label">gtk-copy</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-copy</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnEditCopy"/>
@@ -274,9 +279,9 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="editPaste">
+                        <property name="label">gtk-paste</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-paste</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnEditPaste"/>
@@ -301,7 +306,7 @@
                                 <property name="label" translatable="yes">_Bold</property>
                                 <property name="use_underline">True</property>
                                 <signal name="toggled" handler="OnEditFormatBold"/>
-                                <accelerator key="B" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="B" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -311,7 +316,7 @@
                                 <property name="label" translatable="yes">_Italic</property>
                                 <property name="use_underline">True</property>
                                 <signal name="toggled" handler="OnEditFormatItalic"/>
-                                <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -321,7 +326,7 @@
                                 <property name="label" translatable="yes">_Underline</property>
                                 <property name="use_underline">True</property>
                                 <signal name="toggled" handler="OnEditFormatUnderline"/>
-                                <accelerator key="U" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="U" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                           </widget>
@@ -342,34 +347,35 @@
                           <widget class="GtkMenu" id="editInsertSubtitleMenu">
                             <child>
                               <widget class="GtkImageMenuItem" id="editInsertSubtitleBefore">
+                                <property name="label" translatable="yes">_Before</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="label" translatable="yes">_Before</property>
                                 <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnEditInsertSubtitleBefore"/>
-                                <accelerator key="Return" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="Return" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                                 <child internal-child="image">
                                   <widget class="GtkImage" id="editInsertSubtitleBeforeImage">
                                     <property name="visible">True</property>
                                     <property name="stock">gtk-go-up</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="editInsertSubtitleAfter">
+                                <property name="label" translatable="yes">_After</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="label" translatable="yes">_After</property>
-                                <property name="use_underline">True</property>
+                                <property name="use_stock">False</property>
                                 <signal name="activate" handler="OnEditInsertSubtitleAfter"/>
-                                <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                                <accelerator key="Return" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                                 <child internal-child="image">
                                   <widget class="GtkImage" id="editInsertSubtitleAfterImage">
                                     <property name="visible">True</property>
                                     <property name="stock">gtk-go-down</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="icon-size">1</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -380,16 +386,17 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="editDeleteSubtitles">
+                        <property name="label" translatable="yes">_Delete Subtitles</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">_Delete Subtitles</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnEditDeleteSubtitles"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="deleteSubtitlesMenuItemImage">
+                          <widget class="GtkImage" id="editDeleteSubtitlesImage">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-remove</property>
-                            <property name="icon_size">1</property>
+                            <property name="stock">gtk-delete</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -401,14 +408,16 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="editPreferences">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">Pr_eferences</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnEditPreferences"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="editPreferencesMenuItemImage">
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
                             <property name="stock">gtk-preferences</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -507,9 +516,9 @@
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkImageMenuItem" id="searchFind">
+                        <property name="label">gtk-find</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-find</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnSearchFind"/>
@@ -522,8 +531,8 @@
                         <property name="label" translatable="yes">Find Ne_xt</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="OnSearchFindNext"/>
-                        <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <accelerator key="F3" modifiers="" signal="activate"/>
+                        <accelerator key="g" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="F3" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -533,8 +542,8 @@
                         <property name="label" translatable="yes">Find Pre_vious</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="OnSearchFindPrevious"/>
-                        <accelerator key="G" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
-                        <accelerator key="F3" modifiers="GDK_SHIFT_MASK" signal="activate"/>
+                        <accelerator key="g" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <accelerator key="F3" signal="activate" modifiers="GDK_SHIFT_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -544,18 +553,18 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="searchReplace">
+                        <property name="label" translatable="yes">_Replace</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">_Replace</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnSearchReplace"/>
-                        <accelerator key="H" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="H" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="searchReplaceImage">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-find-and-replace</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -749,29 +758,33 @@
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkImageMenuItem" id="videoOpen">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">_Open</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnVideoOpen"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="videoOpenMenuItemImage">
+                          <widget class="GtkImage" id="videoOpenImage">
+                            <property name="visible">True</property>
                             <property name="stock">gtk-open</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="videoClose">
+                        <property name="label" translatable="yes">_Close</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">_Close</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnVideoClose"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="videoCloseMenuItemImage">
+                          <widget class="GtkImage" id="videoCloseImage">
+                            <property name="visible">True</property>
                             <property name="stock">gtk-close</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -783,45 +796,59 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="videoPlayPause">
+                        <property name="label" translatable="yes">_Play / Pause</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">_Play / Pause</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnVideoPlayPause"/>
-                        <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <accelerator key="F5" modifiers="" signal="activate"/>
+                        <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="F5" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="videoPlayPauseImage">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-media-play</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="videoRewind">
+                        <property name="label">R_ewind</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-media-rewind</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnVideoRewind"/>
-                        <accelerator key="K" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <accelerator key="F6" modifiers="" signal="activate"/>
+                        <accelerator key="k" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="F6" signal="activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="videoRewindImage">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-media-rewind</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="videoForward">
+                        <property name="label">_Forward</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label">gtk-media-forward</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnVideoForward"/>
-                        <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                        <accelerator key="F7" modifiers="" signal="activate"/>
+                        <accelerator key="i" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="F7" signal="activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="videoForwardImage">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-media-forward</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
                       </widget>
                     </child>
                     <child>
@@ -831,16 +858,17 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="videoSeekTo">
+                        <property name="label" translatable="yes">_Seek to...</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">_Seek to...</property>
-                        <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnVideoSeekTo"/>
-                        <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="g" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="videoSeekToMenuItemImage">
+                          <widget class="GtkImage" id="videoSeekToImage">
+                            <property name="visible">True</property>
                             <property name="stock">gtk-jump-to</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -866,7 +894,7 @@
                         <property name="label" translatable="yes">Set Subtitle St_art</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="OnVideoSetSubtitleStart"/>
-                        <accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="D" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -876,7 +904,7 @@
                         <property name="label" translatable="yes">Set Subtitle En_d</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="OnVideoSetSubtitleEnd"/>
-                        <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                   </widget>
@@ -936,17 +964,16 @@
                   <widget class="GtkMenu" id="helpMenu">
                     <child>
                       <widget class="GtkImageMenuItem" id="helpContents">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">_Contents</property>
-                        <property name="use_underline">True</property>
+                        <property name="visible">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnHelpContents"/>
-                        <accelerator key="F1" modifiers="" signal="activate"/>
+                        <accelerator key="F1" signal="activate"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="contentsMenuItemImage">
+                          <widget class="GtkImage" id="helpContentsImage">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-help</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -958,30 +985,32 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="helpRequestFeature">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">Request a _Feature</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnHelpRequestFeature"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="requestFeatureMenuItemImage">
+                          <widget class="GtkImage" id="helpRequestFeatureImage">
                             <property name="visible">True</property>
                             <property name="stock">gtk-dialog-info</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="helpReportBug">
-                        <property name="visible">True</property>
                         <property name="label" translatable="yes">Report a _Bug</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="OnHelpReportBug"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="reportBugMenuItemImage">
+                          <widget class="GtkImage" id="helpReportBugImage">
                             <property name="visible">True</property>
                             <property name="stock">gtk-dialog-warning</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -993,8 +1022,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="helpAbout">
-                        <property name="visible">True</property>
                         <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="OnHelpAbout"/>
@@ -1007,13 +1036,12 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <widget class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="icon_size">GTK_ICON_SIZE_SMALL_TOOLBAR</property>
             <child>
               <widget class="GtkToolButton" id="newToolButton">
                 <property name="visible">True</property>
@@ -1022,6 +1050,7 @@
                 <signal name="clicked" handler="OnFileNew"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1033,6 +1062,7 @@
                 <signal name="clicked" handler="OnFileOpen"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1045,6 +1075,7 @@
                 <signal name="clicked" handler="OnFileSave"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1052,6 +1083,9 @@
               <widget class="GtkSeparatorToolItem" id="toolbarSeparator1">
                 <property name="visible">True</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="undoToolButton">
@@ -1061,6 +1095,7 @@
                 <signal name="clicked" handler="OnEditUndo"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1072,6 +1107,7 @@
                 <signal name="clicked" handler="OnEditRedo"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1079,6 +1115,9 @@
               <widget class="GtkSeparatorToolItem" id="toolbarSeparator2">
                 <property name="visible">True</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="cutToolButton">
@@ -1088,6 +1127,7 @@
                 <signal name="clicked" handler="OnEditCut"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1099,6 +1139,7 @@
                 <signal name="clicked" handler="OnEditCopy"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1110,6 +1151,7 @@
                 <signal name="clicked" handler="OnEditPaste"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1117,6 +1159,9 @@
               <widget class="GtkSeparatorToolItem" id="toolbarSeparator3">
                 <property name="visible">True</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkToolButton" id="insertSubtitleToolButton">
@@ -1127,6 +1172,7 @@
                 <signal name="clicked" handler="OnEditInsertSubtitleAfter"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1139,6 +1185,7 @@
                 <signal name="clicked" handler="OnEditDeleteSubtitles"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1146,6 +1193,9 @@
               <widget class="GtkSeparatorToolItem" id="toolbarSeparator4">
                 <property name="visible">True</property>
               </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkToggleToolButton" id="boldToolButton">
@@ -1155,6 +1205,7 @@
                 <signal name="toggled" handler="OnEditFormatBold"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1166,6 +1217,7 @@
                 <signal name="toggled" handler="OnEditFormatItalic"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1177,6 +1229,7 @@
                 <signal name="toggled" handler="OnEditFormatUnderline"/>
               </widget>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -1212,6 +1265,9 @@
                             <property name="label" translatable="yes">&lt;b&gt;Time&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkLabel" id="videoControlsPositionValueLabel">
@@ -1250,6 +1306,7 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -1271,8 +1328,8 @@
                           <widget class="GtkButton" id="videoSetSubtitleStartButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="response_id">0</property>
+                            <property name="receives_default">False</property>
+                            <property name="relief">none</property>
                             <signal name="clicked" handler="OnVideoSetSubtitleStart"/>
                             <child>
                               <widget class="GtkImage" id="videoSetSubtitleStartButtonImage">
@@ -1286,14 +1343,15 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkButton" id="videoSetSubtitleEndButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="response_id">0</property>
+                            <property name="receives_default">False</property>
+                            <property name="relief">none</property>
                             <signal name="clicked" handler="OnVideoSetSubtitleEnd"/>
                             <child>
                               <widget class="GtkImage" id="videoSetSubtitleEndButtonImage">
@@ -1321,6 +1379,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1350,19 +1409,23 @@
                                 <child>
                                   <widget class="GtkLabel" id="videoSubtitle">
                                     <property name="visible">True</property>
-                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                    <property name="justify">center</property>
                                   </widget>
                                 </child>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                           </widget>
                         </child>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkHBox" id="videoPlaybackHBox">
@@ -1377,8 +1440,8 @@
                               <widget class="GtkToggleButton" id="videoPlayPauseButton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="relief">GTK_RELIEF_NONE</property>
-                                <property name="response_id">0</property>
+                                <property name="receives_default">False</property>
+                                <property name="relief">none</property>
                                 <child>
                                   <widget class="GtkAlignment" id="playPauseButtonAlignment">
                                     <property name="visible">True</property>
@@ -1392,18 +1455,19 @@
                                           <widget class="GtkImage" id="playPauseButtonPlayImage">
                                             <property name="visible">True</property>
                                             <property name="stock">gtk-media-play</property>
-                                            <property name="icon_size">1</property>
+                                            <property name="icon-size">1</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <widget class="GtkImage" id="playPauseButtonPauseImage">
                                             <property name="visible">True</property>
                                             <property name="stock">gtk-media-pause</property>
-                                            <property name="icon_size">1</property>
+                                            <property name="icon-size">1</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1419,6 +1483,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -1430,30 +1495,33 @@
                                   <widget class="GtkButton" id="videoRewindButton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="relief">GTK_RELIEF_NONE</property>
-                                    <property name="response_id">0</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="relief">none</property>
                                     <signal name="clicked" handler="OnVideoRewind"/>
                                     <child>
                                       <widget class="GtkImage" id="rewindButtonImage">
                                         <property name="visible">True</property>
                                         <property name="stock">gtk-media-rewind</property>
-                                        <property name="icon_size">1</property>
+                                        <property name="icon-size">1</property>
                                       </widget>
                                     </child>
                                   </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkButton" id="videoForwardButton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="relief">GTK_RELIEF_NONE</property>
-                                    <property name="response_id">0</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="relief">none</property>
                                     <signal name="clicked" handler="OnVideoForward"/>
                                     <child>
                                       <widget class="GtkImage" id="forwardButtonImage">
                                         <property name="visible">True</property>
                                         <property name="stock">gtk-media-forward</property>
-                                        <property name="icon_size">1</property>
+                                        <property name="icon-size">1</property>
                                       </widget>
                                     </child>
                                   </widget>
@@ -1470,6 +1538,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -1477,7 +1546,7 @@
                             <property name="visible">True</property>
                             <property name="adjustment">0 0 100 0.5 10 10</property>
                             <property name="draw_value">False</property>
-                            <property name="value_pos">GTK_POS_BOTTOM</property>
+                            <property name="value_pos">bottom</property>
                           </widget>
                           <packing>
                             <property name="position">1</property>
@@ -1510,9 +1579,9 @@
                   <widget class="GtkScrolledWindow" id="subtitleViewScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_OUT</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
+                    <property name="shadow_type">out</property>
                     <child>
                       <widget class="GtkTreeView" id="subtitleView">
                         <property name="visible">True</property>
@@ -1526,6 +1595,9 @@
                       </widget>
                     </child>
                   </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkHBox" id="subtitleEdit">
@@ -1625,21 +1697,22 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkScrolledWindow" id="subtitleEditTextScrolledWindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <widget class="GtkTextView" id="subtitleEditText">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="pixels_above_lines">10</property>
-                            <property name="justification">GTK_JUSTIFY_CENTER</property>
+                            <property name="justification">center</property>
                             <property name="accepts_tab">False</property>
                           </widget>
                         </child>
@@ -1651,15 +1724,15 @@
                     <child>
                       <widget class="GtkScrolledWindow" id="subtitleEditTranslationScrolledWindow">
                         <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <widget class="GtkTextView" id="subtitleEditTranslation">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="pixels_above_lines">10</property>
-                            <property name="justification">GTK_JUSTIFY_CENTER</property>
+                            <property name="justification">center</property>
                             <property name="accepts_tab">False</property>
                           </widget>
                         </child>
@@ -1693,6 +1766,9 @@
                 <property name="visible">True</property>
                 <property name="has_resize_grip">False</property>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkStatusbar" id="positionStatusbar">



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]