gnome-subtitles r1047 - in trunk/src: Glade GnomeSubtitles/Ui

[pcastro svn gnome org]

Author: pcastro
Date: Sat Sep 13 00:16:58 2008
New Revision: 1047
URL: http://svn.gnome.org/viewvc/gnome-subtitles?rev=1047&view=rev

Log:
Updated the toolbar buttons. Applied a patch from Arx Cruz (fixes bug 
#530833).
Added Insert subtitle and Delete subtitles toolbar buttons. Removed the 
Find and Replace buttons. Changed the image of the Delete Subtitles 
menuitem.


Modified:
   trunk/src/Glade/MainWindow.glade
   trunk/src/GnomeSubtitles/Ui/Menus.cs
   trunk/src/GnomeSubtitles/Ui/WidgetNames.cs

Modified: trunk/src/Glade/MainWindow.glade
==============================================================================
--- trunk/src/Glade/MainWindow.glade	(original)
+++ trunk/src/Glade/MainWindow.glade	Sat Sep 13 00:16:58 2008
@@ -1,6 +1,6 @@
 <?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 Jun  8 00:08:15 2008 
+<!--Generated with glade3 3.4.5 on Sat Sep 13 01:12:39 2008 
 	Version: 3.0.1
 	Date: Thu Dec  7 16:42:10 2006
 	User: noup
@@ -378,7 +378,7 @@
                         <child internal-child="image">
                           <widget class="GtkImage" id="deleteSubtitlesMenuItemImage">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-delete</property>
+                            <property name="stock">gtk-remove</property>
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
@@ -1103,10 +1103,12 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="findToolButton">
+              <widget class="GtkToolButton" id="insertSubtitleToolButton">
                 <property name="visible">True</property>
-                <property name="stock_id">gtk-find</property>
-                <signal name="clicked" handler="OnSearchFind"/>
+                <property name="sensitive">False</property>
+                <property name="label" translatable="yes">Insert</property>
+                <property name="stock_id">gtk-add</property>
+                <signal name="clicked" handler="OnEditInsertSubtitleAfter"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -1114,11 +1116,12 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="replaceToolButton">
+              <widget class="GtkToolButton" id="deleteSubtitlesToolButton">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Replace</property>
-                <property name="stock_id">gtk-find-and-replace</property>
-                <signal name="clicked" handler="OnSearchReplace"/>
+                <property name="sensitive">False</property>
+                <property name="label" translatable="yes">Delete</property>
+                <property name="stock_id">gtk-remove</property>
+                <signal name="clicked" handler="OnEditDeleteSubtitles"/>
               </widget>
               <packing>
                 <property name="expand">False</property>

Modified: trunk/src/GnomeSubtitles/Ui/Menus.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Ui/Menus.cs	(original)
+++ trunk/src/GnomeSubtitles/Ui/Menus.cs	Sat Sep 13 00:16:58 2008
@@ -216,6 +216,7 @@
 		SetStylesSensitivity(sensitivity);
 		SetSensitivity(WidgetNames.EditDeleteSubtitles, sensitivity);
 		SetSensitivity(WidgetNames.EditInsertSubtitleBefore, sensitivity);
+		SetSensitivity(WidgetNames.DeleteSubtitlesButton, sensitivity);
 	}
 	
 	/// <summary>Sets the sensitivity depending on exactly 1 selected subtitle.</summary>
@@ -264,8 +265,7 @@
 		SetSensitivity(WidgetNames.CutButton, false);
 		SetSensitivity(WidgetNames.CopyButton, false);
 		SetSensitivity(WidgetNames.PasteButton, false);
-		SetSensitivity(WidgetNames.FindButton, false);
-		SetSensitivity(WidgetNames.ReplaceButton, false);
+		SetSensitivity(WidgetNames.InsertSubtitleButton, false);
 		SetSensitivity(WidgetNames.BoldButton, false);
 		SetSensitivity(WidgetNames.ItalicButton, false);
 		SetSensitivity(WidgetNames.UnderlineButton, false);
@@ -300,8 +300,8 @@
 			
 			/* Toolbar */
 			SetSensitivity(WidgetNames.SaveButton, true);
-			SetSensitivity(WidgetNames.FindButton, true);
-			SetSensitivity(WidgetNames.ReplaceButton, true);
+			SetSensitivity(WidgetNames.InsertSubtitleButton, true);
+			SetSensitivity(WidgetNames.DeleteSubtitlesButton, true);
 			/* Common for Format Menu and Toolbar*/
 			SetStylesSensitivity(true);
 		}
@@ -327,6 +327,7 @@
 			/* Toolbar */
 			SetSensitivity(WidgetNames.UndoButton, false);
 			SetSensitivity(WidgetNames.RedoButton, false);
+			SetSensitivity(WidgetNames.DeleteSubtitlesButton, false);
 			SetSensitivity(WidgetNames.CutButton, false);
 			SetSensitivity(WidgetNames.CopyButton, false);
 			SetSensitivity(WidgetNames.PasteButton, false);

Modified: trunk/src/GnomeSubtitles/Ui/WidgetNames.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Ui/WidgetNames.cs	(original)
+++ trunk/src/GnomeSubtitles/Ui/WidgetNames.cs	Sat Sep 13 00:16:58 2008
@@ -93,12 +93,12 @@
 	public const string CutButton = "cutToolButton";
 	public const string CopyButton = "copyToolButton";
 	public const string PasteButton = "pasteToolButton";
-	public const string FindButton = "findToolButton";
-	public const string ReplaceButton = "replaceToolButton";
+	public const string InsertSubtitleButton = "insertSubtitleToolButton";
+	public const string DeleteSubtitlesButton = "deleteSubtitlesToolButton";
 	public const string BoldButton = "boldToolButton";
 	public const string ItalicButton = "italicToolButton";
 	public const string UnderlineButton = "underlineToolButton";
-	
+		
 	/* Video */
 	public const string VideoAreaHBox = "videoAreaHBox";
 	public const string VideoTimingsVBox = "videoTimingsVBox";