gnome-subtitles r993 - in trunk: . src/Glade src/GnomeSubtitles/Dialogs

[pcastro svn gnome org]

Author: pcastro
Date: Sat Jun  7 21:54:02 2008
New Revision: 993
URL: http://svn.gnome.org/viewvc/gnome-subtitles?rev=993&view=rev

Log:
Updated the selection labels.


Modified:
   trunk/configure.ac
   trunk/src/Glade/TimingsShiftDialog.glade
   trunk/src/GnomeSubtitles/Dialogs/TimingsShiftDialog.cs

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jun  7 21:54:02 2008
@@ -1,5 +1,5 @@
 AC_PREREQ(2.58)
-AC_INIT(gnome-subtitles, 0.8, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-subtitles)
+AC_INIT(gnome-subtitles, 0.9, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-subtitles)
 
 GNOME_COMMON_INIT
 

Modified: trunk/src/Glade/TimingsShiftDialog.glade
==============================================================================
--- trunk/src/Glade/TimingsShiftDialog.glade	(original)
+++ trunk/src/Glade/TimingsShiftDialog.glade	Sat Jun  7 21:54:02 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.2.0 on Wed Jun 13 00:23:01 2007 by noup nouplab
+<!--Generated with glade3 3.4.5 on Sat Jun  7 22:47:11 2008 
 	Version: 3.0.1
 	Date: Thu Dec  7 16:42:10 2006
 	User: noup
@@ -52,6 +52,7 @@
                     <child>
                       <widget class="GtkButton" id="clearButton">
                         <property name="visible">True</property>
+                        <property name="response_id">0</property>
                         <signal name="clicked" handler="OnClear"/>
                         <child>
                           <widget class="GtkImage" id="clearButtonImage">
@@ -93,7 +94,7 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
-              <widget class="GtkAlignment" id="alignment">
+              <widget class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="border_width">4</property>
                 <property name="left_padding">12</property>
@@ -107,6 +108,7 @@
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">All subtitles</property>
                         <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </widget>
@@ -121,6 +123,7 @@
                         <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Selected subtitles</property>
                         <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">allSubtitlesRadioButton</property>
                       </widget>
@@ -131,11 +134,12 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="selectedSubtitleToFirstRadioButton">
+                      <widget class="GtkRadioButton" id="fromFirstSubtitleToSelectionRadioButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes" comments="This means to apply the shift command from the selected subtitle to the first subtitle.">Selected subtitle to first</property>
+                        <property name="label" translatable="yes" comments="This means to apply the shift command from the selected subtitle to the first subtitle.">From first subtitle to selection</property>
                         <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">allSubtitlesRadioButton</property>
                       </widget>
@@ -146,11 +150,12 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkRadioButton" id="selectedSubtitleToLastRadioButton">
+                      <widget class="GtkRadioButton" id="fromSelectionToLastSubtitleRadioButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes" comments="This means to apply the shift command from the selected subtitle to the last subtitle.">Selected subtitle to last</property>
+                        <property name="label" translatable="yes" comments="This means to apply the shift command from the selected subtitle to the last subtitle.">From selection to last subtitle</property>
                         <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">allSubtitlesRadioButton</property>
                       </widget>
@@ -200,7 +205,7 @@
                 <property name="has_default">True</property>
                 <property name="response_id">-5</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment">
+                  <widget class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="xscale">0</property>
                     <property name="yscale">0</property>

Modified: trunk/src/GnomeSubtitles/Dialogs/TimingsShiftDialog.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Dialogs/TimingsShiftDialog.cs	(original)
+++ trunk/src/GnomeSubtitles/Dialogs/TimingsShiftDialog.cs	Sat Jun  7 21:54:02 2008
@@ -1,6 +1,6 @@
 /*
  * This file is part of Gnome Subtitles.
- * Copyright (C) 2006-2007 Pedro Castro
+ * Copyright (C) 2006-2008 Pedro Castro
  *
  * Gnome Subtitles is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@
 	[WidgetAttribute] private SpinButton spinButton;
 	[WidgetAttribute] private RadioButton allSubtitlesRadioButton;
 	[WidgetAttribute] private RadioButton selectedSubtitlesRadioButton;
-	[WidgetAttribute] private RadioButton selectedSubtitleToFirstRadioButton;
-	[WidgetAttribute] private RadioButton selectedSubtitleToLastRadioButton;
+	[WidgetAttribute] private RadioButton fromFirstSubtitleToSelectionRadioButton;
+	[WidgetAttribute] private RadioButton fromSelectionToLastSubtitleRadioButton;
 
 	public TimingsShiftDialog () : base(gladeFilename, true, true){
 		InitSpinButton();
@@ -76,8 +76,8 @@
 	
 	private void UpdateFromSelection () {
 		bool sensitive = (Global.GUI.View.Selection.Count == 1);
-		selectedSubtitleToFirstRadioButton.Sensitive = sensitive;
-		selectedSubtitleToLastRadioButton.Sensitive = sensitive;
+		fromFirstSubtitleToSelectionRadioButton.Sensitive = sensitive;
+		fromSelectionToLastSubtitleRadioButton.Sensitive = sensitive;
 		
 		if ((!sensitive) && (!allSubtitlesRadioButton.Active) && (!selectedSubtitlesRadioButton.Active))
 			selectedSubtitlesRadioButton.Active = true;
@@ -116,7 +116,7 @@
 			return SelectionIntended.All;
 		else if (selectedSubtitlesRadioButton.Active)
 			return SelectionIntended.Simple;
-		else if (selectedSubtitleToFirstRadioButton.Active)
+		else if (fromFirstSubtitleToSelectionRadioButton.Active)
 			return SelectionIntended.SimpleToFirst;
 		else
 			return SelectionIntended.SimpleToLast;