GNOME.org
 

[chronojump] release 0.8.9.7

commit a07cb652a8e0a6938bae2d79bfe7366374047abe
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Sep 4 17:10:43 2009 +0200

    release 0.8.9.7
    added licensing for uploaded data on server

 TODO.txt                                   |    2 -
 chronojump_server/bin/chronojumpServer.dll |  Bin 273408 -> 273408 bytes
 glade/chronojump.glade                     |   34 ++++++++++++++++++++++++---
 src/AssemblyInfo.cs                        |    2 +-
 src/execute/jump.cs                        |    6 ++--
 src/execute/multiChronopic.cs              |    2 +-
 src/execute/pulse.cs                       |    2 +-
 src/execute/reactionTime.cs                |    2 +-
 src/exportSession.cs                       |    2 +-
 src/gui/chronojump.cs                      |   17 +++++++++-----
 src/gui/confirm.cs                         |   34 +++++++++++++++++++--------
 src/gui/preferences.cs                     |    2 +-
 12 files changed, 74 insertions(+), 31 deletions(-)
---
diff --git a/TODO.txt b/TODO.txt
index 8504d86..6e466f9 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,8 +4,6 @@ continue with titles and subtitles for all graphs
 fix global, jumper, rjEvolution
 
 check all software (for the Util.TrimDecimals change)
-create accept license on uploading
-add accept license on uploading, and a way to retreive it from server
 
 website velleman put retardo de desactivacion instead of tiempo de respuesta ajustable
 
diff --git a/chronojump_server/bin/chronojumpServer.dll b/chronojump_server/bin/chronojumpServer.dll
index 26ec66a..4daf961 100755
Binary files a/chronojump_server/bin/chronojumpServer.dll and b/chronojump_server/bin/chronojumpServer.dll differ
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index b9b43c4..9ef7096 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3628,7 +3628,7 @@ weight</property>
     <widget class="GtkVBox" id="vbox19">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
+      <property name="spacing">10</property>
 
       <child>
 	<widget class="GtkLabel" id="label1">
@@ -3637,7 +3637,7 @@ weight</property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">True</property>
 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
-	  <property name="wrap">True</property>
+	  <property name="wrap">False</property>
 	  <property name="selectable">False</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
@@ -3656,13 +3656,39 @@ weight</property>
       </child>
 
       <child>
-	<widget class="GtkLabel" id="label2">
+	<widget class="GtkLabel" id="label_link">
 	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
 	  <property name="label" translatable="yes"></property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">True</property>
 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
-	  <property name="wrap">True</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">True</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkLabel" id="label_question">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes"></property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">True</property>
+	  <property name="justify">GTK_JUSTIFY_CENTER</property>
+	  <property name="wrap">False</property>
 	  <property name="selectable">False</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
index 9f0b7f3..221b59b 100755
--- a/src/AssemblyInfo.cs
+++ b/src/AssemblyInfo.cs
@@ -23,7 +23,7 @@ using System.Runtime.CompilerServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("0.8.9.6")]
+[assembly: AssemblyVersion("0.8.9.7")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.
diff --git a/src/execute/jump.cs b/src/execute/jump.cs
index 9dd35f4..e9af6b4 100644
--- a/src/execute/jump.cs
+++ b/src/execute/jump.cs
@@ -140,7 +140,7 @@ public class JumpExecute : EventExecute
 		else {
 			ConfirmWindow confirmWin;		
 			confirmWin = ConfirmWindow.Show( 
-					Catalog.GetString("You are OUT, come inside and press the 'accept' button"), "");
+					Catalog.GetString("You are OUT, come inside and press the 'accept' button"), "", "");
 
 			Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
 
@@ -188,7 +188,7 @@ public class JumpExecute : EventExecute
 		else {
 			ConfirmWindow confirmWin;		
 			confirmWin = ConfirmWindow.Show( 
-					Catalog.GetString("You are IN, please leave the platform, and press the 'accept' button"), "");
+					Catalog.GetString("You are IN, please leave the platform, and press the 'accept' button"), "", "");
 			Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
 
 			//we call again this function
@@ -527,7 +527,7 @@ public class JumpRjExecute : JumpExecute
 				myMessage = Catalog.GetString("You are OUT, please enter the platform, prepare for jump and press the 'accept' button");
 			}
 			ConfirmWindow confirmWin;		
-			confirmWin = ConfirmWindow.Show(myMessage, "");
+			confirmWin = ConfirmWindow.Show(myMessage, "","");
 			Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
 
 			//we call again this function
diff --git a/src/execute/multiChronopic.cs b/src/execute/multiChronopic.cs
index adecdeb..6b975b7 100644
--- a/src/execute/multiChronopic.cs
+++ b/src/execute/multiChronopic.cs
@@ -285,7 +285,7 @@ public class MultiChronopicExecute : EventExecute
 		if(platformsProblems.Length > 0) {
 			ConfirmWindow confirmWin;		
 			confirmWin = ConfirmWindow.Show( 
-					string.Format(Catalog.GetString("There's contact in {0}. Please leave."), platformsProblems), "");
+					string.Format(Catalog.GetString("There's contact in {0}. Please leave."), platformsProblems), "", "");
 
 			Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
 
diff --git a/src/execute/pulse.cs b/src/execute/pulse.cs
index 5556e32..b13ce61 100644
--- a/src/execute/pulse.cs
+++ b/src/execute/pulse.cs
@@ -120,7 +120,7 @@ public class PulseExecute : EventExecute
 			string myMessage = Catalog.GetString("You are IN, please leave the platform, prepare for start, and press the 'accept' button!!");
 
 			ConfirmWindow confirmWin;		
-			confirmWin = ConfirmWindow.Show(myMessage, "");
+			confirmWin = ConfirmWindow.Show(myMessage, "", "");
 			Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
 
 			//we call again this function
diff --git a/src/execute/reactionTime.cs b/src/execute/reactionTime.cs
index 3eee014..7a9fda8 100644
--- a/src/execute/reactionTime.cs
+++ b/src/execute/reactionTime.cs
@@ -118,7 +118,7 @@ public class ReactionTimeExecute : EventExecute
 		else {
 			ConfirmWindow confirmWin;		
 			confirmWin = ConfirmWindow.Show( 
-					Catalog.GetString("You are OUT, come inside and press the 'accept' button"), "");
+					Catalog.GetString("You are OUT, come inside and press the 'accept' button"), "", "");
 			//System.Media.SystemSounds.Beep.Play();
 			Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
 
diff --git a/src/exportSession.cs b/src/exportSession.cs
index a4d6c0f..92e1cb9 100644
--- a/src/exportSession.cs
+++ b/src/exportSession.cs
@@ -96,7 +96,7 @@ public class ExportSession
 					Log.WriteLine(string.Format("File {0} exists with attributes {1}, created at {2}", 
 								fileName, File.GetAttributes(fileName), File.GetCreationTime(fileName)));
 					Log.WriteLine("Overwrite...");
-					ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you want to overwrite file: "), fileName);
+					ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you want to overwrite file: "), "", fileName);
 					confirmWin.Button_accept.Clicked += new EventHandler(on_overwrite_file_accepted);
 				} else {
 					writer = File.CreateText(fileName);
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index c36f484..088aca7 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -529,7 +529,7 @@ public class ChronoJumpWindow
 	
 		if(chronopicPort != Constants.ChronopicDefaultPortWindows &&
 			chronopicPort != Constants.ChronopicDefaultPortLinux) {
-			ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Do you want to connect to Chronopic now?"), "");
+			ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Do you want to connect to Chronopic now?"), "", "");
 			confirmWin.Button_accept.Clicked += new EventHandler(chronopicAtStart);
 		}
 	}
@@ -1056,7 +1056,7 @@ public class ChronoJumpWindow
 		if(evalWin.Changed) {
 			string versionAvailable = Server.Ping(false, "", ""); //false: don't do insertion
 			if(versionAvailable != Constants.ServerOffline) { //false: don't do insertion
-				ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Do you want to upload evaluator data now?"), "");
+				ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Do you want to upload evaluator data now?"), "", "");
 				confirmWin.Button_accept.Clicked += new EventHandler(on_evaluator_upload_accepted);
 			} else 
 				new DialogMessage(Constants.MessageTypes.WARNING, 
@@ -1181,14 +1181,19 @@ public class ChronoJumpWindow
 				if(currentSession.ServerUniqueID == Constants.ServerUndefinedID) 
 					message1 =  
 							Catalog.GetString("Session will be uploaded to server.") + "\n" +  
-							Catalog.GetString("All names of persons in session will be hidden.") + "\n" + 
+							Catalog.GetString("All names and date of birth of persons in session will be hidden.") + "\n\n" + 
 							Catalog.GetString("You can upload again this session if you add more data or persons.");
 				else
 					message1 =  
 							Catalog.GetString("Session has been uploaded to server before.") + "\n" +  
 							Catalog.GetString("Uploading new data.");
 
+				message1 += "\n\n" + Catalog.GetString("All the uploaded data will be licensed as:") + 
+						"\n<b>" + Catalog.GetString("Creative Commons Attribution 3.0") + "</b>";
+
+
 				ConfirmWindow confirmWin = ConfirmWindow.Show(message1, 
+							"<u>http://creativecommons.org/licenses/by/3.0/</u>", //label_link
 							Catalog.GetString("Are you sure you want to upload this session to server?"));
 				confirmWin.Button_accept.Clicked += new EventHandler(on_server_upload_session_accepted);
 			}
@@ -2095,7 +2100,7 @@ public class ChronoJumpWindow
 	
 	private void on_delete_session_activate (object o, EventArgs args) {
 		Log.WriteLine("delete session");
-		ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you want to delete the current session"), Catalog.GetString("and all the session tests?"));
+		ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you want to delete the current session"), "", Catalog.GetString("and all the session tests?"));
 		confirmWin.Button_accept.Clicked += new EventHandler(on_delete_session_accepted);
 	}
 	
@@ -2264,7 +2269,7 @@ public class ChronoJumpWindow
 	private void on_delete_current_person_from_session_activate (object o, EventArgs args) {
 		Log.WriteLine("delete current person from this session");
 		ConfirmWindow confirmWin = ConfirmWindow.Show(
-				Catalog.GetString("Are you sure you want to delete the current person and all his/her tests (jumps, runs, pulses, ...) from this session?\n(His/her personal data and tests in other sessions will remain intact)"), 
+				Catalog.GetString("Are you sure you want to delete the current person and all his/her tests (jumps, runs, pulses, ...) from this session?\n(His/her personal data and tests in other sessions will remain intact)"), "", 
 				Catalog.GetString("Current Person: ") + currentPerson.Name);
 
 		confirmWin.Button_accept.Clicked += new EventHandler(on_delete_current_person_from_session_accepted);
@@ -5347,7 +5352,7 @@ Console.WriteLine("X");
 	private void on_debug_crash_activate (object o, EventArgs args) {
 		bool voluntaryCrashAllowed = false;
 		if(voluntaryCrashAllowed) {
-			ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Done for testing purposes. Chronojump will exit badly"), "Are you sure you want to crash application?");
+			ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Done for testing purposes. Chronojump will exit badly"), "", "Are you sure you want to crash application?");
 			confirmWin.Button_accept.Clicked += new EventHandler(crashing);
 		} else {
 			new DialogMessage(Constants.MessageTypes.INFO, "Currently disabled.");
diff --git a/src/gui/confirm.cs b/src/gui/confirm.cs
index d498d37..468ff87 100644
--- a/src/gui/confirm.cs
+++ b/src/gui/confirm.cs
@@ -31,14 +31,14 @@ public class ConfirmWindowJumpRun
 {
 	[Widget] Gtk.Window confirm_window;
 	[Widget] Gtk.Label label1;
-	[Widget] Gtk.Label label2;
+	[Widget] Gtk.Label label_question;
 	[Widget] Gtk.Button button_accept;
 
 	string table;
 	int uniqueID;
 	static ConfirmWindowJumpRun ConfirmWindowJumpRunBox;
 	
-	public ConfirmWindowJumpRun (string text1, string text2, string table, int uniqueID)
+	public ConfirmWindowJumpRun (string text1, string question, string table, int uniqueID)
 	{
 		//Setup (text, table, uniqueID);
 		Glade.XML gladeXML;
@@ -49,15 +49,15 @@ public class ConfirmWindowJumpRun
 		UtilGtk.IconWindow(confirm_window);
 		
 		label1.Text = text1;
-		label2.Text = text2;
+		label_question.Text = question;
 		this.table = table;
 		this.uniqueID = uniqueID;
 	}
 
-	static public ConfirmWindowJumpRun Show (string text1, string text2, string table, int uniqueID)
+	static public ConfirmWindowJumpRun Show (string text1, string question, string table, int uniqueID)
 	{
 		if (ConfirmWindowJumpRunBox == null) {
-			ConfirmWindowJumpRunBox = new ConfirmWindowJumpRun(text1, text2, table, uniqueID);
+			ConfirmWindowJumpRunBox = new ConfirmWindowJumpRun(text1, question, table, uniqueID);
 		}
 		ConfirmWindowJumpRunBox.confirm_window.Show ();
 		
@@ -97,13 +97,14 @@ public class ConfirmWindow
 {
 	[Widget] Gtk.Window confirm_window;
 	[Widget] Gtk.Label label1;
-	[Widget] Gtk.Label label2;
+	[Widget] Gtk.Label label_link;
+	[Widget] Gtk.Label label_question;
 	[Widget] Gtk.Button button_accept;
 	[Widget] Gtk.Button button_cancel;
 
 	static ConfirmWindow ConfirmWindowBox;
 	
-	public ConfirmWindow (string text1, string text2)
+	public ConfirmWindow (string text1, string link, string question)
 	{
 		Glade.XML gladeXML;
 		gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "confirm_window", null);
@@ -113,13 +114,26 @@ public class ConfirmWindow
 		UtilGtk.IconWindow(confirm_window);
 		
 		label1.Text = text1;
-		label2.Text = text2;
+		label1.UseMarkup = true;
+
+		if(link != "") {
+			label_link.Text = link;
+			label_link.UseMarkup = true;
+		} else
+			label_link.Visible = false;
+
+		if(question != "") {
+			label_question.Text = question;
+			label_question.UseMarkup = true;
+		} else
+			label_question.Visible = false;
+
 	}
 
-	static public ConfirmWindow Show (string text1, string text2)
+	static public ConfirmWindow Show (string text1, string link, string question)
 	{
 		if (ConfirmWindowBox == null) {
-			ConfirmWindowBox = new ConfirmWindow(text1, text2);
+			ConfirmWindowBox = new ConfirmWindow(text1, link, question);
 		}
 		ConfirmWindowBox.confirm_window.Show ();
 		
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 59659cc..f50afc9 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -314,7 +314,7 @@ public class PreferencesWindow {
 					Log.WriteLine(string.Format("File {0} exists with attributes {1}, created at {2}", 
 								fileCopy, File.GetAttributes(fileCopy), File.GetCreationTime(fileCopy)));
 					Log.WriteLine("Overwrite...");
-					ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you want to overwrite file: "), fileCopy);
+					ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString("Are you sure you want to overwrite file: "), "", fileCopy);
 					confirmWin.Button_accept.Clicked += new EventHandler(on_overwrite_file_accepted);
 				} else {
 					File.Copy(fileDB, fileCopy);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]