chronojump r414 - in trunk: . build/data glade src src/gui web/data web/html_created_no_edit

From: xaviblas svn gnome org
To: svn-commits-list gnome org
Subject: chronojump r414 - in trunk: . build/data glade src src/gui web/data web/html_created_no_edit
Date: Tue, 26 Aug 2008 20:19:32 +0000 (UTC)
Author: xaviblas
Date: Tue Aug 26 20:19:31 2008
New Revision: 414
URL: http://svn.gnome.org/viewvc/chronojump?rev=414&view=rev

Log:
0.7.5.1
added Logibrick people to authors. Improved about dialog.


Modified:
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/version.txt
   trunk/changelog.txt
   trunk/glade/chronojump.glade
   trunk/src/chronojump.cs
   trunk/src/constants.cs
   trunk/src/gui/about.cs
   trunk/src/gui/chronojump.cs
   trunk/version.txt
   trunk/web/data/authors.txt
   trunk/web/html_created_no_edit/faq_es.html
   trunk/web/html_created_no_edit/photocells_es.html

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 Aug 26 20:19:31 2008
@@ -1 +1 @@
-0.7.5
+0.7.5.1

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Tue Aug 26 20:19:31 2008
@@ -1,5 +1,9 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+26 ago 2008 (2)
+	0.7.5.1
+	added Logibrick people to authors. Improved about dialog.
+
 26 ago 2008
 	added src/angle/kneeAngle.cpp (minimum angle detection by sharad
 	shankar using openCV). Not compiled or integrated with chronojump yet

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Tue Aug 26 20:19:31 2008
@@ -13075,23 +13075,23 @@
 	<widget class="GtkVBox" id="vbox70">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">8</property>
+	  <property name="spacing">10</property>
 
 	  <child>
 	    <widget class="GtkTable" id="table28">
 	      <property name="visible">True</property>
-	      <property name="n_rows">4</property>
-	      <property name="n_columns">2</property>
+	      <property name="n_rows">1</property>
+	      <property name="n_columns">3</property>
 	      <property name="homogeneous">False</property>
 	      <property name="row_spacing">8</property>
 	      <property name="column_spacing">14</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label202">
+		<widget class="GtkLabel" id="label201">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">version</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Chronojump&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -13107,45 +13107,36 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label203">
+		<widget class="GtkImage" id="image_logo">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">developers</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</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="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
+		  <property name="left_attach">2</property>
+		  <property name="right_attach">3</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
+		  <property name="y_padding">8</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label204">
+		<widget class="GtkLabel" id="dialog_about_label_version">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">translators</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>
@@ -13161,53 +13152,73 @@
 		  <property name="angle">0</property>
 		</widget>
 		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
 		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame34">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 	      <child>
-		<widget class="GtkLabel" id="dialog_about_label_version">
+		<widget class="GtkAlignment" id="alignment118">
 		  <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</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>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="dialog_about_label_developers">
+		      <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</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>
+		  </child>
 		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="dialog_about_label_developers">
+		<widget class="GtkLabel" id="label522">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;developers&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
+		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -13217,53 +13228,68 @@
 		  <property name="angle">0</property>
 		</widget>
 		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
+		  <property name="type">label_item</property>
 		</packing>
 	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame35">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 	      <child>
-		<widget class="GtkLabel" id="dialog_about_label_translators">
+		<widget class="GtkAlignment" id="alignment119">
 		  <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</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>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="dialog_about_label_translators">
+		      <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</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>
+		  </child>
 		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label201">
+		<widget class="GtkLabel" id="label523">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Chronojump&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">&lt;b&gt;translators&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
+		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -13273,31 +13299,7 @@
 		  <property name="angle">0</property>
 		</widget>
 		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkImage" id="image_logo">
-		  <property name="visible">True</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_padding">8</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
+		  <property name="type">label_item</property>
 		</packing>
 	      </child>
 	    </widget>

Modified: trunk/src/chronojump.cs
==============================================================================
--- trunk/src/chronojump.cs	(original)
+++ trunk/src/chronojump.cs	Tue Aug 26 20:19:31 2008
@@ -34,7 +34,6 @@
 	ChronoJumpWindow chronoJumpWin;
 	SplashWindow splashWin;
 	
-	private static string [] authors = {"Xavier de Blas", "Juan Gonzalez", "Juan Fernando Pardo"};
 	private static string progversion = ""; //now in "version" file
 	private static string progname = "Chronojump";
 	
@@ -241,7 +240,7 @@
 	}
 
 	private void startChronojump() {	
-		chronoJumpWin = new ChronoJumpWindow(authors, readVersion(), progname, runningFileName);
+		chronoJumpWin = new ChronoJumpWindow(readVersion(), progname, runningFileName);
 	}
 
 	private static void createBlankDB() {

Modified: trunk/src/constants.cs
==============================================================================
--- trunk/src/constants.cs	(original)
+++ trunk/src/constants.cs	Tue Aug 26 20:19:31 2008
@@ -26,6 +26,15 @@
 {
 	//the strings created by Catalog cannot be const
 	
+	public static string [] Authors = {
+		"Xavier de Blas (xaviblas gmail com)\n" + Catalog.GetString("Project leader and main developer."), 
+		"Juan Gonzalez (http://www.iearobotics.com)\n" + Catalog.GetString("Skypic, Chronopic, connection between hardware and software."), 
+		"Juan Fernando Pardo (juanfer juanfer com ar)\n" + Catalog.GetString("Chronopic2 creation, Chronojump tester."), 
+		"Ricardo GÃmez (http://www.iearobotics.com)\n" + Catalog.GetString("Chronopic3 industrial prototype."),
+		"Sharad Shankar (http://www.logicbrick.com)\n" + Catalog.GetString("OpenCV Detection of knee angle"), 
+		"Onkar Nath Mishra (http://www.logicbrick.com)\n" + Catalog.GetString("OpenCV Detection of knee angle") 
+	};
+	
 	//formulas
 	public static string DjIndexFormula = "Dj Index (tv-tc)/tc *100)";
 	public static string QIndexFormula = "Q index (tv/tc)";

Modified: trunk/src/gui/about.cs
==============================================================================
--- trunk/src/gui/about.cs	(original)
+++ trunk/src/gui/about.cs	Tue Aug 26 20:19:31 2008
@@ -32,7 +32,7 @@
 	[Widget] Gtk.Label dialog_about_label_developers;
 	[Widget] Gtk.Label dialog_about_label_translators;
 
-	public About (string version, string [] authors, string translators)
+	public About (string version, string translators)
 	{
 		Glade.XML gladeXML;
 		gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade", "dialog_about", null);
@@ -62,11 +62,11 @@
 		
 		//put authos separated by commas
 		string authorsString = "";
-		string comma = "";
-		foreach (string singleAuthor in authors) {
-			authorsString += comma;
+		string paragraph = "";
+		foreach (string singleAuthor in Constants.Authors) {
+			authorsString += paragraph;
 			authorsString += singleAuthor;
-			comma = ", ";
+			paragraph = "\n\n";
 		}
 		dialog_about_label_developers.Text = authorsString;
 	}

Modified: trunk/src/gui/chronojump.cs
==============================================================================
--- trunk/src/gui/chronojump.cs	(original)
+++ trunk/src/gui/chronojump.cs	Tue Aug 26 20:19:31 2008
@@ -348,7 +348,6 @@
 	
 	private bool preferencesLoaded;
 
-	private string [] authors;
 	private string progversion;
 	private string progname;
 
@@ -395,9 +394,8 @@
 	}
 */
 	
-	public ChronoJumpWindow(string [] authors, string progversion, string progname, string runningFileName)
+	public ChronoJumpWindow(string progversion, string progname, string runningFileName)
 	{
-		this.authors = authors;
 		this.progversion = progversion;
 		this.progname = progname;
 		this.runningFileName = runningFileName;
@@ -4096,7 +4094,7 @@
 		if(translator_credits == "translator-credits") 
 			translator_credits = "";
 
-		new About(progversion, authors, translator_credits);
+		new About(progversion, translator_credits);
 	}
 
 	private void on_checkbutton_volume_clicked(object o, EventArgs args) {

Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt	(original)
+++ trunk/version.txt	Tue Aug 26 20:19:31 2008
@@ -1 +1 @@
-0.7.5
+0.7.5.1

Modified: trunk/web/data/authors.txt
==============================================================================
--- trunk/web/data/authors.txt	(original)
+++ trunk/web/data/authors.txt	Tue Aug 26 20:19:31 2008
@@ -1,6 +1,8 @@
 <ul>
 <li><a href="http://www.xdeblas.com";>Xavier de Blas</a></li>
 <li><a href="http://www.iearobotics.com/personal/juan/";>Ju&aacute;n Gonz&aacute;lez</a></li>
-<li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a>
-<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo GÃmez</a>
+<li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a></li>
+<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo GÃmez</a></li>
+<li><a href="http://www.logicbrick.com/";>Sharad Shankar</a></li>
+<li><a href="http://www.logicbrick.com/";>Onkar Nath Mishra</a></li>
 </ul>

Modified: trunk/web/html_created_no_edit/faq_es.html
==============================================================================
--- trunk/web/html_created_no_edit/faq_es.html	(original)
+++ trunk/web/html_created_no_edit/faq_es.html	Tue Aug 26 20:19:31 2008
@@ -187,8 +187,10 @@
 				<ul>
 <li><a href="http://www.xdeblas.com";>Xavier de Blas</a></li>
 <li><a href="http://www.iearobotics.com/personal/juan/";>Ju&aacute;n Gonz&aacute;lez</a></li>
-<li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a>
-<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo G&oacute;mez</a>
+<li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a></li>
+<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo G&oacute;mez</a></li>
+<li><a href="http://www.logicbrick.com/";>Sharad Shankar</a></li>
+<li><a href="http://www.logicbrick.com/";>Onkar Nath Mishra</a></li>
 </ul>
 
 				<h3>Colaboradores&nbsp;[a-z]</h3>

Modified: trunk/web/html_created_no_edit/photocells_es.html
==============================================================================
--- trunk/web/html_created_no_edit/photocells_es.html	(original)
+++ trunk/web/html_created_no_edit/photocells_es.html	Tue Aug 26 20:19:31 2008
@@ -180,8 +180,10 @@
 				<ul>
 <li><a href="http://www.xdeblas.com";>Xavier de Blas</a></li>
 <li><a href="http://www.iearobotics.com/personal/juan/";>Ju&aacute;n Gonz&aacute;lez</a></li>
-<li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a>
-<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo G&oacute;mez</a>
+<li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a></li>
+<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo G&oacute;mez</a></li>
+<li><a href="http://www.logicbrick.com/";>Sharad Shankar</a></li>
+<li><a href="http://www.logicbrick.com/";>Onkar Nath Mishra</a></li>
 </ul>
 
 				<h3>Colaboradores&nbsp;[a-z]</h3>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]