GNOME.org
 

chronojump r485 - in trunk: . build/data glade images images/mini src src/gui

Author: xaviblas
Date: Wed Apr 15 14:13:31 2009
New Revision: 485
URL: http://svn.gnome.org/viewvc/chronojump?rev=485&view=rev

Log:
-On Linux possible ports are displayed on chronopic connection
-DetectPorts in chronojump_mini (linux) now better formatting
	
-Finish button is bigger (50px minimum)
-Changed infrared icon (put velleman)


Added:
   trunk/images/infrared.jpg   (contents, props changed)
   trunk/images/mini/infrared.jpg   (contents, props changed)
Removed:
   trunk/images/infrared.png
   trunk/images/mini/infrared.png
Modified:
   trunk/Makefile
   trunk/TODO.txt
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/changelog.txt
   trunk/glade/chronojump.glade
   trunk/src/constants.cs
   trunk/src/gui/helpPorts.cs
   trunk/src/gui/preferences.cs
   trunk/src/util.cs

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr 15 14:13:31 2009
@@ -79,7 +79,7 @@
 		-resource:images/chronopic3.jpg,chronopic3.jpg			-resource:images/mini/chronopic3.jpg,mini/chronopic3.jpg \
 		-resource:images/modular_platform_with_chronopic.jpg,modular_platform_with_chronopic.jpg			-resource:images/mini/modular_platform_with_chronopic.jpg,mini/modular_platform_with_chronopic.jpg \
 		-resource:images/plataforma_contactos.jpg,plataforma_contactos.jpg			-resource:images/mini/plataforma_contactos.jpg,mini/plataforma_contactos.jpg \
-		-resource:images/infrared.png,infrared.png			-resource:images/mini/infrared.png,mini/infrared.png \
+		-resource:images/infrared.jpg,infrared.jpg			-resource:images/mini/infrared.jpg,mini/infrared.jpg \
 		-resource:images/stock_bell.png,stock_bell.png \
 		-resource:images/stock_bell_green.png,stock_bell_green.png \
 		-resource:images/stock_bell_red.png,stock_bell_red.png \

Modified: trunk/TODO.txt
==============================================================================
--- trunk/TODO.txt	(original)
+++ trunk/TODO.txt	Wed Apr 15 14:13:31 2009
@@ -1,5 +1,7 @@
 TODO: 
 
+clarify on new/edit user what needs to be completed to show accept button (show icons of attention)
+
 new multichronopic tests:
 - padu runAnalysis (2cp)
 - discrimitative reaction time with two lights and two fotocells (or platforms)
@@ -7,8 +9,6 @@
 better with only two chronopics, if evaluator push cp1, light1 gets on and person has tocross fotocell1 (or platform). Then with two we have all.
 we can also have three or four to have more discriminative
 
-finish button bigger
-change infrared icon (put velleman)
 see flickering on dj eventExecute graphs
 
 fix graph problems on multichronopic (also when there's only a chronopic)
@@ -50,8 +50,6 @@
 intersession stats only have to show one max or avg, not n max or all jumps
 stats all and limit is not updating the treeview stats. 
 
-us Util.DetectPortsLinux in gui/help ports
-
 create a server mini program that tries to do a ping and if it fails, 
 then write something in a file, and another program restarts server
 fo it as to chrons. Record some stat data in another file

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 15 14:13:31 2009
@@ -1,5 +1,12 @@
 CHANGELOG.txt
 
+15 apr 2009 (2)
+	-On Linux possible ports are displayed on chronopic connection
+	-DetectPorts in chronojump_mini (linux) now better formatting
+	
+	-Finish button is bigger (50px minimum)
+	-Changed infrared icon (put velleman)
+
 15 apr 2009
 	Important: created new firmware (unvalidated yet) with 10ms of minimal detected
 	time. We created first the 50ms because chronopic is focussed on jumps

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Wed Apr 15 14:13:31 2009
@@ -14910,7 +14910,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label511">
 			      <property name="visible">True</property>
-			      <property name="label">&lt;i&gt;http://www.gnome.org/projects/chronojump/problems.html&lt;/i&gt;</property>
+			      <property name="label">&lt;i&gt;http://projects.gnome.org/chronojump/problems.html&lt;/i&gt;</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">True</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -18593,6 +18593,7 @@
 
 	  <child>
 	    <widget class="GtkButton" id="button_finish">
+	      <property name="width_request">50</property>
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Finish jump (save jump until this moment)</property>
 	      <property name="can_default">True</property>

Added: trunk/images/infrared.jpg
==============================================================================
Binary file. No diff available.

Added: trunk/images/mini/infrared.jpg
==============================================================================
Binary file. No diff available.

Modified: trunk/src/constants.cs
==============================================================================
--- trunk/src/constants.cs	(original)
+++ trunk/src/constants.cs	Wed Apr 15 14:13:31 2009
@@ -216,7 +216,7 @@
 	public static string FileNameChronopic3 = "chronopic3.jpg";
 	public static string FileNameContactPlatformSteel = "plataforma_contactos.jpg";
 	public static string FileNameContactPlatformModular = "modular_platform_with_chronopic.jpg";
-	public static string FileNameInfrared = "infrared.png";
+	public static string FileNameInfrared = "infrared.jpg";
 	
 	//30 colors defined
 	public static string [] Colors = {

Modified: trunk/src/gui/helpPorts.cs
==============================================================================
--- trunk/src/gui/helpPorts.cs	(original)
+++ trunk/src/gui/helpPorts.cs	Wed Apr 15 14:13:31 2009
@@ -78,7 +78,7 @@
 			Catalog.GetString("More information on <b>Chronojump Manual</b> at section:") + " <b>4.6</b>\n" +
 			"<i>" + Path.GetFullPath(Util.GetManualDir()) + "</i>\n" + 
 			Catalog.GetString("Newer versions will be on this site:") +"\n" + 
-			"<i>http://gnome.org/projects/chronojump/documents.html</i>";
+			"<i>http://projects.gnome.org/chronojump/documents.html</i>";
 		label_manual.UseMarkup = true;
 		
 	}

Modified: trunk/src/gui/preferences.cs
==============================================================================
--- trunk/src/gui/preferences.cs	(original)
+++ trunk/src/gui/preferences.cs	Wed Apr 15 14:13:31 2009
@@ -83,23 +83,28 @@
 		for (int i=1; i <= 257; i ++)
 			comboWindowsOptions[i-1] = "COM" + i;
 
-		UtilGtk.ComboUpdate(combo_port_windows, comboWindowsOptions, comboWindowsOptions[0]);
-		UtilGtk.ComboUpdate(combo_port_linux, Constants.ComboPortLinuxOptions, Constants.ComboPortLinuxOptions[0]);
-		
-
 		if(Util.IsWindows()) {
+			UtilGtk.ComboUpdate(combo_port_windows, comboWindowsOptions, comboWindowsOptions[0]);
+			
 			if(entryChronopic.Length > 0)
 				combo_port_windows.Active = UtilGtk.ComboMakeActive(comboWindowsOptions, entryChronopic);
 			else
 				combo_port_windows.Active = 0; //first option
 		} else {
+			string [] usbSerial = Directory.GetFiles("/dev/", "ttyUSB*");
+			string [] serial = Directory.GetFiles("/dev/", "ttyS*");
+			string [] all = Util.AddArrayString(usbSerial, serial);
+			string [] def = Util.StringToStringArray(Constants.ChronopicDefaultPortLinux);
+			string [] allWithDef = Util.AddArrayString(def, all);
+	
+			UtilGtk.ComboUpdate(combo_port_linux, allWithDef, Constants.ChronopicDefaultPortLinux);
+			
 			if(entryChronopic.Length > 0)
-
-				combo_port_linux.Active = UtilGtk.ComboMakeActive(Constants.ComboPortLinuxOptions, entryChronopic);
+				combo_port_linux.Active = UtilGtk.ComboMakeActive(allWithDef, entryChronopic);
 			else 
 				combo_port_linux.Active = 0; //first option
 		}
-		
+
 		//database and log files stuff
 		label_database.Text = Util.GetDatabaseDir() + System.IO.Path.DirectorySeparatorChar  + "chronojump.db";
 		label_database_temp.Text = Util.GetDatabaseTempDir() + System.IO.Path.DirectorySeparatorChar  + "chronojump.db";
@@ -108,7 +113,8 @@
 	
 	static public PreferencesWindow Show (string entryChronopic, int digitsNumber, bool showHeight, 
 			bool showInitialSpeed, bool showAngle, bool showQIndex, bool showDjIndex,
-			bool askDeletion, bool weightStatsPercent, bool heightPreferred, bool metersSecondsPreferred, string language, bool allowFinishRjAfterTime)
+			bool askDeletion, bool weightStatsPercent, bool heightPreferred, bool metersSecondsPreferred, 
+			string language, bool allowFinishRjAfterTime)
 	{
 		if (PreferencesWindowBox == null) {
 			PreferencesWindowBox = new PreferencesWindow (entryChronopic);

Modified: trunk/src/util.cs
==============================================================================
--- trunk/src/util.cs	(original)
+++ trunk/src/util.cs	Wed Apr 15 14:13:31 2009
@@ -882,6 +882,15 @@
 		}
 		return uniqueString;
 	}
+	
+	//to create an string [] of one member
+	public static string [] StringToStringArray (string str) {
+		string [] ret = new string[1];
+		ret[0] = str;
+		return ret;
+	}
+
+
 
 	public static bool IntToBool (int myInt) {
 		if(myInt == 1)
@@ -962,9 +971,11 @@
 	
 	public static string DetectPortsLinux(bool formatting) {
 		string startStr = "";
+		string midStr = "\n";
 		string endStr = "";
 		if(formatting) {
 			startStr = "<i>";
+			midStr = "\t";
 			endStr = "</i>";
 		}
 		string detected = "";
@@ -972,14 +983,14 @@
 		if(usbSerial.Length > 0) {
 			detected += "\n" + Constants.FoundUSBSerialPortsString + " " + usbSerial.Length + "\n" + startStr;
 			foreach(string myPort in usbSerial)
-				detected += "\t" + myPort;
+				detected += midStr + myPort;
 			detected += endStr;
 		} else {
 			detected += Constants.NotFoundUSBSerialPortsString + "\n";
 			string [] serial = Directory.GetFiles("/dev/", "ttyS*");
 			detected += Constants.FoundSerialPortsString + " " + serial.Length + "\n" + startStr;
 			foreach(string myPort in serial)
-				detected += "\t" + myPort;
+				detected += midStr + myPort;
 			detected += endStr;
 		}
 		return detected;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]