chronojump r438 - in trunk: . build/data chronojump_server chronojump_server/bin glade src src/gui src/sqlite

From: xaviblas svn gnome org
To: svn-commits-list gnome org
Subject: chronojump r438 - in trunk: . build/data chronojump_server chronojump_server/bin glade src src/gui src/sqlite
Date: Tue, 13 Jan 2009 21:44:35 +0000 (UTC)
Author: xaviblas
Date: Tue Jan 13 21:44:35 2009
New Revision: 438
URL: http://svn.gnome.org/viewvc/chronojump?rev=438&view=rev

Log:
0.8.1.1
on gui preferences, port windows and linux with combobox

0.8.1
splash now ends better
managing a.m., p.m. time formats
server can compile again


Modified:
   trunk/Makefile
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/version.txt
   trunk/changelog.txt
   trunk/chronojump_server/bin/chronojumpServer.dll
   trunk/chronojump_server/compile_wsdl.sh
   trunk/glade/chronojump.glade
   trunk/src/chronojump.cs
   trunk/src/gui/chronojump.cs
   trunk/src/gui/preferences.cs
   trunk/src/sqlite/main.cs
   trunk/src/util.cs
   trunk/version.txt

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Jan 13 21:44:35 2009
@@ -106,7 +106,7 @@
 
 #--------Dependences of CHRONOJUMP_SERVER
 
-CHRONOJUMP_SERVER_DEP = chronojump_server/chronojumpServerCSharp.cs src/sqlite/*.cs src/util.cs src/person.cs src/event.cs src/jump.cs src/run.cs src/pulse.cs src/reactionTime.cs src/session.cs src/eventType.cs src/jumpType.cs src/runType.cs src/pulseType.cs src/constants.cs
+CHRONOJUMP_SERVER_DEP = chronojump_server/chronojumpServerCSharp.cs src/sqlite/*.cs src/util.cs src/person.cs src/event.cs src/jump.cs src/run.cs src/pulse.cs src/reactionTime.cs src/session.cs src/eventType.cs src/jumpType.cs src/runType.cs src/pulseType.cs src/sport.cs src/constants.cs src/log.cs 
 
 
 #--------Makefiles
@@ -116,7 +116,8 @@
 #all: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg $(CHRONOJUMP_MINI_VALIDATE).prg
 
 #chronojump, chronojump_mini and server (use 'make server')
-server: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg $(CHRONOJUMP_SERVER)
+#server: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg $(CHRONOJUMP_SERVER)
+server: $(CHRONOJUMP_SERVER)
 
 
 #-------------------------------

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/build/data/version.txt
==============================================================================
--- trunk/build/data/version.txt	(original)
+++ trunk/build/data/version.txt	Tue Jan 13 21:44:35 2009
@@ -1 +1 @@
-0.8
+0.8.1.1

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Tue Jan 13 21:44:35 2009
@@ -1,3 +1,12 @@
+13 jan 2008
+	0.8.1.1
+	on gui preferences, port windows and linux with combobox
+
+	0.8.1
+	splash now ends better
+	managing a.m., p.m. time formats
+	server can compile again
+
 25 dec 2008
 	screen height to adapt to ultralaptops:
 	-app1 gets maximized

Modified: trunk/chronojump_server/bin/chronojumpServer.dll
==============================================================================
Binary files. No diff available.

Modified: trunk/chronojump_server/compile_wsdl.sh
==============================================================================
--- trunk/chronojump_server/compile_wsdl.sh	(original)
+++ trunk/chronojump_server/compile_wsdl.sh	Tue Jan 13 21:44:35 2009
@@ -6,4 +6,4 @@
 sleep 3
 
 echo compiling wsdl
-wsdl http://localhost:8080/chronojumpServer.asmx
+wsdl2 http://localhost:8080/chronojumpServer.asmx

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Tue Jan 13 21:44:35 2009
@@ -2145,80 +2145,18 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkEntry" id="entry_chronopic">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">20</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		      <property name="width_chars">13</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox_port_windows">
+		    <widget class="GtkHBox" id="hbox_port_linux">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox283">
+			<widget class="GtkComboBox" id="combo_port_linux">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label533">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">COM</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">True</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="spin_com_windows">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">True</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">1 1 257 1 10 10</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			  <property name="items">/dev/ttyUSB?
+</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -2229,6 +2167,45 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkComboBox" id="combo_port_windows">
+		      <property name="visible">True</property>
+		      <property name="items">COM?</property>
+		      <property name="add_tearoffs">False</property>
+		      <property name="focus_on_click">True</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_port">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes"></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>

Modified: trunk/src/chronojump.cs
==============================================================================
--- trunk/src/chronojump.cs	(original)
+++ trunk/src/chronojump.cs	Tue Jan 13 21:44:35 2009
@@ -340,6 +340,8 @@
 	}
 	
 	private void on_splash_ended(object o, EventArgs args) {
+		Log.WriteLine("splash screen going to END");
+		fakeSplashButton.Clicked -= new EventHandler(on_splash_ended);
 		splashWin.Destroy();
 		Log.WriteLine("splash screen ENDED!");
 		readMessageToStart();

Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs	(original)
+++ trunk/src/gui/chronojump.cs	Tue Jan 13 21:44:35 2009
@@ -420,12 +420,7 @@
 		changeTestImage("", "", "LOGO");
 				
 		//new DialogMessage(Constants.MessageTypes.INFO, UtilGtk.ScreenHeightFitted(false).ToString() );
-
-		/*
-		int app1X, app1Y;
-		app1.GetSize(out app1X, out app1Y);
-		app1.Resize(app1X, UtilGtk.ScreenHeightFitted(true));
-		*/
+		//UtilGtk.ResizeIfNeeded(stats_window);
 		app1.Maximize();
 
 		cpRunning = false;
@@ -4390,7 +4385,7 @@
 	 */
 
 	private void on_debug_crash_activate (object o, EventArgs args) {
-		bool voluntaryCrashAllowed = false;
+		bool voluntaryCrashAllowed = true;
 		if(voluntaryCrashAllowed) {
 			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);

Modified: trunk/src/gui/preferences.cs
==============================================================================
--- trunk/src/gui/preferences.cs	(original)
+++ trunk/src/gui/preferences.cs	Tue Jan 13 21:44:35 2009
@@ -32,9 +32,8 @@
 	
 	[Widget] Gtk.Window preferences;
 
-	[Widget] Gtk.Entry entry_chronopic;
-	[Widget] Gtk.Box hbox_port_windows;
-	[Widget] Gtk.SpinButton spin_com_windows;
+	[Widget] Gtk.ComboBox combo_port_linux;
+	[Widget] Gtk.ComboBox combo_port_windows;
 
 	[Widget] Gtk.Label label_database;
 	[Widget] Gtk.Label label_database_temp;
@@ -67,7 +66,21 @@
 	//dialogMessage
 	private string languageIni;
 
+	string [] comboLinuxOptions = {
+		"/dev/ttyUSB?", 
+		"/dev/ttyUSB0", 
+		"/dev/ttyUSB1", 
+		"/dev/ttyUSB2", 
+		"/dev/ttyUSB3", 
+		"/dev/ttyS0", 
+		"/dev/ttyS1", 
+		"/dev/ttyS2", 
+		"/dev/ttyS3", 
+	};
 		
+	string [] comboWindowsOptions;
+	
+
 	PreferencesWindow (string entryChronopic) {
 		Glade.XML gladeXML;
 		gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "preferences", null);
@@ -75,23 +88,34 @@
 		
 		//put an icon to window
 		UtilGtk.IconWindow(preferences);
+
+		//combo port stuff
+		comboWindowsOptions = new string[257];
+		int count = 0;
+		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, comboLinuxOptions, comboLinuxOptions[0]);
 		
+
 		if(Util.IsWindows()) {
-			if(entryChronopic.Length > 0 && entryChronopic != Constants.ChronopicDefaultPortWindows) //default port windows is COM? (show a COM1)
-				spin_com_windows.Value =  Convert.ToInt32(entryChronopic.Substring(
-							3, entryChronopic.Length -3)); //eg: 'COM21', character 3 to end will be '21'
+			if(entryChronopic.Length > 0)
+				combo_port_windows.Active = UtilGtk.ComboMakeActive(comboWindowsOptions, entryChronopic);
 			else
-				spin_com_windows.Value =  1;
+				combo_port_windows.Active = 0; //first option
 		} else {
-			if(entryChronopic.Length > 0) {
-				entry_chronopic.Text = entryChronopic;
-			}
+			if(entryChronopic.Length > 0)
+
+				combo_port_linux.Active = UtilGtk.ComboMakeActive(comboLinuxOptions, 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";
 		label_logs.Text = Log.GetDir();
-		
 	}
 	
 	static public PreferencesWindow Show (string entryChronopic, int digitsNumber, bool showHeight, 
@@ -103,11 +127,11 @@
 		}
 
 		if(Util.IsWindows()) {
-			PreferencesWindowBox.hbox_port_windows.Show();
-			PreferencesWindowBox.entry_chronopic.Hide();
+			PreferencesWindowBox.combo_port_linux.Hide();
+			PreferencesWindowBox.combo_port_windows.Show();
 		} else {
-			PreferencesWindowBox.hbox_port_windows.Hide();
-			PreferencesWindowBox.entry_chronopic.Show();
+			PreferencesWindowBox.combo_port_windows.Hide();
+			PreferencesWindowBox.combo_port_linux.Show();
 		}
 
 		PreferencesWindowBox.languageIni = language;
@@ -250,10 +274,12 @@
 	{
 		/* the falses are for the dbcon that is not opened */
 
+		
 		if(Util.IsWindows()) 
-			SqlitePreferences.Update("chronopicPort", "COM" + spin_com_windows.Text.ToString(), false);
+			SqlitePreferences.Update("chronopicPort", UtilGtk.ComboGetActive(combo_port_windows), false);
 		else
-			SqlitePreferences.Update("chronopicPort", entry_chronopic.Text.ToString(), false);
+			SqlitePreferences.Update("chronopicPort", UtilGtk.ComboGetActive(combo_port_linux), false);
+		//SqlitePreferences.Update("chronopicPort", label_port.Text.ToString(), false);
 		
 		SqlitePreferences.Update("digitsNumber", spinbutton_decimals.Value.ToString(), false);
 		SqlitePreferences.Update("showHeight", PreferencesWindowBox.checkbutton_height.Active.ToString(), false);
@@ -297,6 +323,7 @@
 		PreferencesWindowBox = null;
 	}
 
+
 	private void on_button_help_clicked (object o, EventArgs args) {
 		new HelpPorts();
 	}

Modified: trunk/src/sqlite/main.cs
==============================================================================
--- trunk/src/sqlite/main.cs	(original)
+++ trunk/src/sqlite/main.cs	Tue Jan 13 21:44:35 2009
@@ -205,6 +205,15 @@
 
 		creatingBlankDatabase = true; 
 	}
+	
+	public static bool DisConnect() {
+		try {
+			dbcon.Close();
+		} catch {
+			return false;
+		}
+		return true;
+	}
 
 	public static void CreateFile()
 	{

Modified: trunk/src/util.cs
==============================================================================
--- trunk/src/util.cs	(original)
+++ trunk/src/util.cs	Tue Jan 13 21:44:35 2009
@@ -637,6 +637,8 @@
 		myStringBuilder.Replace(" ", "_"); //replace the ' ' (date-hour separator) for '_' 
 		myStringBuilder.Replace("/", "-"); //replace the '/' (date separator) for '-' 
 		myStringBuilder.Replace(":", "-"); //replace the ':' (hour separator) for '-'
+		myStringBuilder.Replace(".", ""); //delete the '.' in a.m.: 13-01-2009_02-05-43_a.m.
+
 		return myStringBuilder.ToString();
 	}
 

Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt	(original)
+++ trunk/version.txt	Tue Jan 13 21:44:35 2009
@@ -1 +1 @@
-0.8
+0.8.1.1
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]