chronojump r382 - in trunk: . build/data glade src src/gui

[xaviblas svn gnome org]

Author: xaviblas
Date: Wed Apr 23 15:24:38 2008
New Revision: 382
URL: http://svn.gnome.org/viewvc/chronojump?rev=382&view=rev

Log:
Fixed bug in personAddMultiple when it's different than 10
Fixed bug in export to CSV (decimals were 0)
Info about Chronojump Manual when Chronopic connection fails and at helpPorts


Modified:
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/changelog.txt
   trunk/glade/chronojump.glade
   trunk/src/exportSession.cs
   trunk/src/gui/chronojump.cs
   trunk/src/gui/chronopicConnection.cs
   trunk/src/gui/person.cs

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Wed Apr 23 15:24:38 2008
@@ -1,5 +1,11 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+23 apr 2008
+	Fixed bug in personAddMultiple when it's different than 10
+	Fixed bug in export to CSV (decimals were 0)
+	Info about Chronojump Manual when Chronopic connection fails and at
+	helpPorts
+
 16 apr 2008
 	installer done. Fixed bug: 514593
 	-mono on linux now checked with "which mono"

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Wed Apr 23 15:24:38 2008
@@ -12614,7 +12614,6 @@
 
 	  <child>
 	    <widget class="GtkLabel" id="label205">
-	      <property name="width_request">250</property>
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">This dialog explains wich ports are suitable to be connected with chronopic</property>
 	      <property name="use_underline">False</property>
@@ -12731,7 +12730,8 @@
 	  <child>
 	    <widget class="GtkLabel" id="label467">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">More information on  Chronojump Manual</property>
+	      <property name="label" translatable="yes">More information on Chronojump Manual
+(available at 'docs' on install directory and in Chronojump website)</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -21156,6 +21156,32 @@
       </child>
 
       <child>
+	<widget class="GtkLabel" id="label_manual">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">More information on Chronojump Manual
+(available at 'docs' on install directory and in Chronojump website)</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">False</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</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="GtkHButtonBox" id="hbuttonbox38">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>

Modified: trunk/src/exportSession.cs
==============================================================================
--- trunk/src/exportSession.cs	(original)
+++ trunk/src/exportSession.cs	Wed Apr 23 15:24:38 2008
@@ -51,9 +51,10 @@
 	}
 
 	//public ExportSession(Session mySession, Gtk.Window app1, Gnome.AppBar mainAppbar) 
-	public ExportSession(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar) 
+	public ExportSession(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar, int prefsDigitsNumber) 
 	{
 		this.mySession = mySession;
+		this.prefsDigitsNumber = prefsDigitsNumber;
 		myAppbar = mainAppbar;
 		
 		checkFile("none");
@@ -679,9 +680,10 @@
 public class ExportSessionCSV : ExportSession 
 {
 	
-	public ExportSessionCSV(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar) 
+	public ExportSessionCSV(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar, int prefsDigitsNumber) 
 	{
 		this.mySession = mySession;
+		this.prefsDigitsNumber = prefsDigitsNumber;
 		myAppbar = mainAppbar;
 		checkFile("CSV");
 	}
@@ -721,10 +723,11 @@
 {
 	private XmlTextWriter xr;
 		
-	public ExportSessionXML(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar) 
+	public ExportSessionXML(Session mySession, Gtk.Window app1, Gtk.Statusbar mainAppbar, int prefsDigitsNumber) 
 	//public ExportXML(Session mySession, Gtk.Window app1) 
 	{
 		this.mySession = mySession;
+		this.prefsDigitsNumber = prefsDigitsNumber;
 		//this.app1 = app1;
 		myAppbar = mainAppbar;
 		

Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs	(original)
+++ trunk/src/gui/chronojump.cs	Wed Apr 23 15:24:38 2008
@@ -1657,9 +1657,9 @@
 	
 	private void on_export_session_activate(object o, EventArgs args) {
 		if (o == (object) menuitem_export_csv) {
-			new ExportSessionCSV(currentSession, app1, appbar2);
+			new ExportSessionCSV(currentSession, app1, appbar2, prefsDigitsNumber);
 		} else if (o == (object) menuitem_export_xml) {
-			new ExportSessionXML(currentSession, app1, appbar2);
+			new ExportSessionXML(currentSession, app1, appbar2, prefsDigitsNumber);
 		} else {
 			Console.WriteLine("Error exporting");
 		}

Modified: trunk/src/gui/chronopicConnection.cs
==============================================================================
--- trunk/src/gui/chronopicConnection.cs	(original)
+++ trunk/src/gui/chronopicConnection.cs	Wed Apr 23 15:24:38 2008
@@ -35,6 +35,7 @@
 	[Widget] Gtk.ProgressBar progressbar1;
 	[Widget] Gtk.Label label_title;
 	[Widget] Gtk.Label label_feedback;
+	[Widget] Gtk.Label label_manual;
 	[Widget] Gtk.Button button_cancel;
 	[Widget] Gtk.Button button_close;
 
@@ -63,6 +64,7 @@
 	}
 
 	private void initialize() {
+		label_manual.Hide();
 		button_cancel.Sensitive = true;
 		button_close.Sensitive = false;
 		label_title.Sensitive = true;
@@ -91,6 +93,9 @@
 		label_feedback.Text = message;
 		button_cancel.Sensitive = false;
 		button_close.Sensitive = true;
+
+		//show info about Chronojump Manual
+		label_manual.Show();
 	}
 
 	private void on_button_cancel_clicked (object o, EventArgs args)

Modified: trunk/src/gui/person.cs
==============================================================================
--- trunk/src/gui/person.cs	(original)
+++ trunk/src/gui/person.cs	Wed Apr 23 15:24:38 2008
@@ -1206,7 +1206,7 @@
 			bool repeated = false;
 			if(Util.RemoveTilde(newNames[i].ToString()).Length > 0) {
 				int j;
-				for(j=i+1; j<10 && !repeated; j++) {
+				for(j=i+1; j < newNames.Count && !repeated; j++) {
 					if( Util.RemoveTilde(newNames[i].ToString()) == Util.RemoveTilde(newNames[j].ToString()) ) {
 						repeated = true;
 					}