chronojump r365 - in trunk: . src/gui

[xaviblas svn gnome org]

Author: xaviblas
Date: Mon Feb 25 16:55:32 2008
New Revision: 365
URL: http://svn.gnome.org/viewvc/chronojump?rev=365&view=rev

Log:
restored Makefile
added missing src/gui/generic.cs


Added:
   trunk/src/gui/genericWindow.cs
Modified:
   trunk/Makefile
   trunk/changelog.txt
   trunk/src/gui/chronojump.cs

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Feb 25 16:55:32 2008
@@ -25,7 +25,7 @@
 CHRONOJUMP = chronojump
 
 CHRONOJUMP_MINI = chronojump_mini
-CHRONOJUMP_MINI_VALIDATE = chronojump_mini_validate
+#CHRONOJUMP_MINI_VALIDATE = chronojump_mini_validate
 
 CHRONOJUMP_SERVER = chronojump_server
 
@@ -97,7 +97,7 @@
 #--------Dependences of CHRONOJUMP_MINI
 
 CHRONOJUMP_MINI_DEP = src/chronojump_mini.cs src/chronopic.cs src/util.cs src/constants.cs 
-CHRONOJUMP_MINI_VALIDATE_DEP = src/chronojump_mini_validate.cs src/chronopic.cs src/util.cs src/constants.cs 
+#CHRONOJUMP_MINI_VALIDATE_DEP = src/chronojump_mini_validate.cs src/chronopic.cs src/util.cs src/constants.cs 
 
 #--------Dependences of CHRONOJUMP_SERVER
 
@@ -107,8 +107,8 @@
 #--------Makefiles
 
 #chronojump and chronojump_mini (default if used 'make')
-#all: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg
-all: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg $(CHRONOJUMP_MINI_VALIDATE).prg
+all: $(CHRONOJUMP).prg $(CHRONOJUMP_MINI).prg
+#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)
@@ -131,8 +131,8 @@
 $(CHRONOJUMP_MINI).prg: $(CHRONOJUMP_MINI_DEP)
 	 $(MCS) $(CHRONOJUMP_MINI_DEP) -r:Mono.Posix -out:$(BUILD_DIR)/$(CHRONOJUMP_MINI).prg 
 
-$(CHRONOJUMP_MINI_VALIDATE).prg: $(CHRONOJUMP_MINI_VALIDATE_DEP)
-	 $(MCS) $(CHRONOJUMP_MINI_VALIDATE_DEP) -r:Mono.Posix -out:$(BUILD_DIR)/$(CHRONOJUMP_MINI_VALIDATE).prg 
+#$(CHRONOJUMP_MINI_VALIDATE).prg: $(CHRONOJUMP_MINI_VALIDATE_DEP)
+#	 $(MCS) $(CHRONOJUMP_MINI_VALIDATE_DEP) -r:Mono.Posix -out:$(BUILD_DIR)/$(CHRONOJUMP_MINI_VALIDATE).prg 
    
 
 #------------------------------------

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Mon Feb 25 16:55:32 2008
@@ -1,5 +1,9 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+25 feb 2008 (2)
+	restored Makefile
+	added missing src/gui/generic.cs
+
 25 feb 2008
 	0.62-svn3
 	chronopic.cs now has a public method to flush called Flush

Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs	(original)
+++ trunk/src/gui/chronojump.cs	Mon Feb 25 16:55:32 2008
@@ -294,10 +294,8 @@
 	SessionLoadWindow sessionLoadWin;
 	PersonRecuperateWindow personRecuperateWin; 
 	PersonsRecuperateFromOtherSessionWindow personsRecuperateFromOtherSessionWin; 
-	//PersonAddWindow personAddWin; 
 	PersonAddModifyWindow personAddModifyWin; 
 	PersonAddMultipleWindow personAddMultipleWin; 
-	//PersonModifyWindow personModifyWin; 
 	PersonShowAllEventsWindow personShowAllEventsWin;
 	JumpsMoreWindow jumpsMoreWin;
 	JumpsRjMoreWindow jumpsRjMoreWin;

Added: trunk/src/gui/genericWindow.cs
==============================================================================
--- (empty file)
+++ trunk/src/gui/genericWindow.cs	Mon Feb 25 16:55:32 2008
@@ -0,0 +1,110 @@
+/*
+ * This file is part of ChronoJump
+ *
+ * ChronoJump is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or   
+ *    (at your option) any later version.
+ *    
+ * ChronoJump is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ *    GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Xavier de Blas: 
+ * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
+ */
+
+using System;
+using Gtk;
+using Glade;
+//using Gnome;
+using GLib; //for Value
+//using System.Text; //StringBuilder
+
+
+public class GenericWindow
+{
+	[Widget] Gtk.Window generic_window;
+	[Widget] Gtk.Label label_header;
+	[Widget] Gtk.Label label_generic_name;
+	[Widget] Gtk.Entry entry_value;
+	[Widget] Gtk.SpinButton spinbutton_value;
+	[Widget] Gtk.Button button_accept;
+
+	static GenericWindow GenericWindowBox;
+	
+	public GenericWindow ()
+	{
+		Glade.XML gladeXML;
+		gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "generic_window", null);
+		gladeXML.Autoconnect(this);
+		
+		//put an icon to window
+		UtilGtk.IconWindow(generic_window);
+	}
+
+	static public GenericWindow Show (string textHeader, bool showEntry, bool showSpin)
+	{
+		if (GenericWindowBox == null) {
+			GenericWindowBox = new GenericWindow();
+		}
+		GenericWindowBox.showHideWidgets(showEntry, showSpin);
+		GenericWindowBox.label_header.Text = textHeader;
+
+		GenericWindowBox.generic_window.Show ();
+		
+		return GenericWindowBox;
+	}
+	
+	void showHideWidgets(bool showEntry, bool showSpin) {
+		if(showEntry)
+			entry_value.Show();
+		else
+			entry_value.Hide();
+		
+		if(showSpin)
+			spinbutton_value.Show();
+		else
+			spinbutton_value.Hide();
+	}
+
+	protected void on_button_cancel_clicked (object o, EventArgs args)
+	{
+		GenericWindowBox.generic_window.Hide();
+		GenericWindowBox = null;
+	}
+	
+	protected void on_delete_event (object o, DeleteEventArgs args)
+	{
+		GenericWindowBox.generic_window.Hide();
+		GenericWindowBox = null;
+	}
+
+	protected void on_button_accept_clicked (object o, EventArgs args)
+	{
+		GenericWindowBox.generic_window.Hide();
+		//GenericWindowBox = null;
+	}
+	
+	public Button Button_accept {
+		set { button_accept = value; }
+		get { return button_accept; }
+	}
+
+	public string EntrySelected {
+		get { return entry_value.Text.ToString(); }
+	}
+
+	public int SpinSelected {
+		get { return (int) spinbutton_value.Value; }
+	}
+
+	~GenericWindow() {}
+	
+}
+