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

[xaviblas svn gnome org]

Author: xaviblas
Date: Thu Apr 16 13:47:49 2009
New Revision: 487
URL: http://svn.gnome.org/viewvc/chronojump?rev=487&view=rev

Log:
calendar has a new calendar icon


Added:
   trunk/images/calendar.png   (contents, props changed)
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/gui/chronojump.cs
   trunk/src/gui/person.cs

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Apr 16 13:47:49 2009
@@ -95,6 +95,7 @@
 		-resource:images/gtk-zoom-in.png,gtk-zoom-in.png \
 		-resource:images/gtk-zoom-in-with-text.png,gtk-zoom-in-with-text.png \
 		-resource:images/chronojump_320.png,chronojump_320.png \
+		-resource:images/calendar.png,calendar.png \
 		
 #-resource:images/gtk-zoom-out.png,gtk-zoom-out.png \
 

Modified: trunk/TODO.txt
==============================================================================
--- trunk/TODO.txt	(original)
+++ trunk/TODO.txt	Thu Apr 16 13:47:49 2009
@@ -1,6 +1,5 @@
 TODO: 
 
-
 new multichronopic tests:
 - padu runAnalysis (2cp)
 - discrimitative reaction time with two lights and two fotocells (or platforms)

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	Thu Apr 16 13:47:49 2009
@@ -1,5 +1,7 @@
 CHANGELOG.txt
 
+16 apr 2009
+	calendar has a new calendar icon
 	
 15 apr 2009 (3)
 	Clarified on new/edit user what needs to be completed to show accept

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Thu Apr 16 13:47:49 2009
@@ -59,7 +59,7 @@
 	  <property name="n_rows">11</property>
 	  <property name="n_columns">3</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">4</property>
+	  <property name="row_spacing">6</property>
 	  <property name="column_spacing">8</property>
 
 	  <child>
@@ -426,14 +426,24 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkButton" id="button_change_date">
+		<widget class="GtkButton" id="button_calendar">
 		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Change date</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">change</property>
-		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_button_change_date_clicked" last_modification_time="Mon, 18 Sep 2006 12:15:33 GMT"/>
+		  <signal name="clicked" handler="on_button_calendar_clicked" last_modification_time="Thu, 16 Apr 2009 10:47:50 GMT"/>
+		  <accelerator key="z" modifiers="0" signal="clicked"/>
+
+		  <child>
+		    <widget class="GtkImage" id="image_calendar">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>

Added: trunk/images/calendar.png
==============================================================================
Binary file. No diff available.

Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs	(original)
+++ trunk/src/gui/chronojump.cs	Thu Apr 16 13:47:49 2009
@@ -515,7 +515,6 @@
 		//	appbar2.Push ( 1, recuperatedString );
 
 		rand = new Random(40);
-		//volumeOn = true;
 	
 		putNonStandardIcons();	
 	
@@ -764,6 +763,7 @@
 			volumeOn = false;
 		changeVolumeButton(volumeOn);
 		
+		//volumeOn = true;
 	
 		//change language works on windows. On Linux let's change the locale
 		//if(Util.IsWindows())

Modified: trunk/src/gui/person.cs
==============================================================================
--- trunk/src/gui/person.cs	(original)
+++ trunk/src/gui/person.cs	Thu Apr 16 13:47:49 2009
@@ -20,6 +20,7 @@
 
 using System;
 using Gtk;
+using Gdk;
 using Glade;
 using GLib; //for Value
 using System.Text; //StringBuilder
@@ -601,7 +602,9 @@
 	[Widget] Gtk.TextView textview2;
 	
 	[Widget] Gtk.Label label_date;
-	[Widget] Gtk.Button button_change_date;
+	//[Widget] Gtk.Button button_change_date;
+	[Widget] Gtk.Button button_calendar;
+	[Widget] Gtk.Image image_calendar;
 
 	[Widget] Gtk.SpinButton spinbutton_height;
 	[Widget] Gtk.SpinButton spinbutton_weight;
@@ -693,6 +696,10 @@
 		createComboLevels();
 		createComboContinents();
 		createComboCountries();
+		
+		Pixbuf pixbuf;
+		pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "calendar.png");
+		image_calendar.Pixbuf = pixbuf;
 			
 		fakeButtonAccept = new Gtk.Button();
 
@@ -976,7 +983,7 @@
 	}
 	
 	
-	void on_button_change_date_clicked (object o, EventArgs args)
+	void on_button_calendar_clicked (object o, EventArgs args)
 	{
 		myDialogCalendar = new DialogCalendar(Catalog.GetString("Select session date"));
 		myDialogCalendar.FakeButtonDateChanged.Clicked += new EventHandler(on_calendar_changed);