[chronojump] developers rewritten on about
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] developers rewritten on about
- Date: Wed, 6 May 2020 09:39:37 +0000 (UTC)
commit 0be7385d095d259289420b15673760e1512a4805
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 6 11:38:33 2020 +0200
developers rewritten on about
glade/dialog_about.glade | 126 ++++++++---------------------------------------
src/constants.cs | 94 ++++++++++++++++++++---------------
src/gui/about.cs | 12 ++---
3 files changed, 78 insertions(+), 154 deletions(-)
---
diff --git a/glade/dialog_about.glade b/glade/dialog_about.glade
index fac2f17b..ed12e5e8 100644
--- a/glade/dialog_about.glade
+++ b/glade/dialog_about.glade
@@ -3,12 +3,12 @@
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="dialog_about">
- <property name="height_request">500</property>
+ <property name="width_request">500</property>
+ <property name="height_request">550</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="title" translatable="yes">About</property>
- <property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<signal name="delete_event" handler="on_delete_event" swapped="no"/>
@@ -56,12 +56,12 @@
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkLabel" id="label201">
<property name="visible">True</property>
@@ -138,47 +138,6 @@
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="spacing">12</property>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Chronojump
CEO's</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="dialog_about_label_developers_CEO">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">8</property>
- <property name="ypad">4</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
@@ -204,48 +163,6 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">8</property>
- <property name="ypad">4</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Hardware:
Chronopic</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="dialog_about_label_developers_chronopic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">8</property>
<property name="ypad">4</property>
</widget>
<packing>
@@ -258,20 +175,20 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Hardware:
Devices</b></property>
+ <property name="label"><b>Chronojump Networks</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -281,12 +198,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="dialog_about_label_developers_devices">
+ <widget class="GtkLabel" id="dialog_about_label_developers_networks">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">8</property>
<property name="ypad">4</property>
</widget>
<packing>
@@ -299,20 +215,20 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <widget class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Mathematics and
Statistics support</b></property>
+ <property name="label" translatable="yes"><b>Scientific
support</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -322,12 +238,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="dialog_about_label_developers_math">
+ <widget class="GtkLabel" id="dialog_about_label_developers_scientific">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">8</property>
<property name="ypad">4</property>
</widget>
<packing>
@@ -340,20 +255,20 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes"><b>OpenCV</b></property>
+ <property name="label" translatable="yes"><b>Hardware:
Chronopic</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -363,12 +278,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="dialog_about_label_developers_opencv">
+ <widget class="GtkLabel" id="dialog_about_label_developers_chronopic">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="xpad">8</property>
<property name="ypad">4</property>
</widget>
<packing>
@@ -381,7 +295,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
diff --git a/src/constants.cs b/src/constants.cs
index cdfded0a..31af67b4 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -29,59 +29,73 @@ public class Constants
//public static string ReadmeTranslators = Catalog.GetString("Translator, there's a glossary that
will help you in Chronojump translation:\n
http://git.gnome.org/browse/chronojump/plain/glossary/chronojump_glossary_for_translators.html";);
- public enum AuthorsEnum { CEO, SOFTWARE, CHRONOPIC, DEVICES, MATH, OPENCV, DOCUMENTERS }
+ public enum AuthorsEnum { SOFTWARE, NETWORKS, CHRONOPIC, SCIENTIFIC, MATH, DOCUMENTERS }
public static string [] Authors(AuthorsEnum e)
{
- if(e == AuthorsEnum.CEO)
+ if(e == AuthorsEnum.SOFTWARE)
return new String []{
- "Xavier de Blas Foix (info chronojump org)\n",
- "Josep Ma Padullés (jmpadulles gmail com)"
+ "Xavier de Blas Foix <info chronojump org>, 2004-2020\n\t" +
+ Catalog.GetString("Main developer."),
+ "\nAndoni Morales Alastruey <http://ylatuya.es>, 2009-2020\n\t" +
+ Catalog.GetString("Installation support: Autotools,
packaging, bundle."),
+ "\nXavier Padullés <testing chronojump org>, 2014-2020\n\t" +
+ Catalog.GetString("R scripts."),
+ "\nCarles Pina i Estany <http://pinux.info>, 2016-2017\n\t" +
+ Catalog.GetString("Backend developer.") + " " +
Catalog.GetString("Import sessions.")
};
- else if(e == AuthorsEnum.SOFTWARE)
+ else if(e == AuthorsEnum.NETWORKS)
return new String []{
- "Xavier de Blas Foix (xaviblas gmail com)\n\t" +
- Catalog.GetString("Main developer.") + "\n",
- "Andoni Morales Alastruey (http://ylatuya.es)\n\t" +
- Catalog.GetString("Installation support: Autotools,
packaging, bundle.") + "\n",
- "Carles Pina i Estany (http://pinux.info)\n\t" +
- Catalog.GetString("Backend developer.")
+ "Max Ros Morejón <mros33 gmail com>, 2019-2020" +
+ "\n\t" + Catalog.GetString("Django developer."),
+ "\nMarcos Venteo <mventeo gmail com>, 2017-2018" +
+ "\n\t" + Catalog.GetString("Django migration."),
+ "\nXavier de Blas Foix <info chronojump org>, 2016-2020" +
+ "\n\t" + Catalog.GetString("Client-Server integration.") + " " +
Catalog.GetString("First Flask iteration."),
+ "\nCarles Pina i Estany <http://pinux.info>, 2016-2017" +
+ "\n\t" + Catalog.GetString("Web services support.")
};
- else if(e == AuthorsEnum.CHRONOPIC)
- return new String []{
- "Teng Wei Hua (wadedang gmail com)\n\t" + Catalog.GetString("Translation of
Firmware to C.") + "\n\t" +
- Catalog.GetString("New firmware features.") + " " +
Catalog.GetString("Encoder hardware layer.") + "\n",
- "Juan Gonzalez Gómez (http://www.iearobotics.com)\n\t" +
Catalog.GetString("Skypic, Chronopic, connection between hardware and software.") + "\n",
- "Ferran Suárez Rodríguez (ferransuarez2 gmail com)\n\t" +
Catalog.GetString("Chronopic reaction time advanced implementation.") + "\n",
- "Ricardo Gómez González (http://www.iearobotics.com)\n\t" +
Catalog.GetString("Chronopic3 industrial prototype.") + "\n",
- "Juan Fernando Pardo (juanfer juanfer com ar)\n\t" + "Chronopic2."
- };
- else if(e == AuthorsEnum.DEVICES)
- return new String []{
- "Josep Ma Padullés (jmpadulles gmail com)\n",
- "Anna Padullés (hardware chronojump org)\n",
- "Xavier Padullés (testing chronojump org)\n",
- "Teng Wei Hua (wadedang gmail com)\n",
- "Xavier de Blas Foix (info chronojump org)\n",
- "Ferran Suárez Rodríguez (ferransuarez2 gmail com)\n"
- };
- else if(e == AuthorsEnum.MATH)
+ else if(e == AuthorsEnum.SCIENTIFIC)
return new String []{
- "Carlos J. Gil Bellosta (http://www.datanalytics.com)\n",
- "Aleix Ruiz de Villa (aleixrvr gmail com)\n",
- "Xavier Padullés (testing chronojump org)"
+ "Josep Ma Padullés <jmpadulles gmail com>, 2005-2020" +
+ "\n\t" + Catalog.GetString("Sports sciences") + ", " +
Catalog.GetString("Engineering"),
+ "\nXavier Padullés <testing chronojump org>, 2012-2020",
+ "\n\t" + Catalog.GetString("Engineering"),
+ "\nJosep Granell <josegranell2005 hotmail com>, 2018-2020",
+ "\n\t" + Catalog.GetString("Electronics"),
+ "\nCarlos J. Gil Bellosta <http://www.datanalytics.com>, 2010-2012, 2018" +
+ "\n\t" + Catalog.GetString("Maths and statistics"),
+ "\nAleix Ruiz de Villa <aleixrvr gmail com>, 2013-2016" +
+ "\n\t" + Catalog.GetString("Maths and statistics"),
};
+ /*
else if(e == AuthorsEnum.OPENCV)
return new String []{
- "Sharad Shankar (http://www.logicbrick.com)\n",
- "Onkar Nath Mishra (http://www.logicbrick.com)\n"
+ "Sharad Shankar <http://www.logicbrick.com>\n",
+ "Onkar Nath Mishra <http://www.logicbrick.com>\n"
};
+ */
else if(e == AuthorsEnum.DOCUMENTERS)
return new String []{
- "Xavier de Blas Foix (xaviblas gmail com)\n\t" +
- Catalog.GetString("Chronojump Manual author."),
- "Helena Olsson (hjolsson gmail com)\n\t" +
- Catalog.GetString("Chronojump Manual English translation."),
- "Xavier Padullés (testing chronojump org)",
+ "Xavier Padullés <testing chronojump org>, 2013-2020",
+ "Xavier de Blas Foix <xaviblas gmail com>, 2004-2013",
+ "Helena Olsson <hjolsson gmail com>, 2011\n\t" +
+ Catalog.GetString("Chronojump Manual English translation.")
+ };
+ else if(e == AuthorsEnum.CHRONOPIC)
+ return new String []{
+ "Teng Wei Hua <wadedang gmail com>, 2011-2015" +
+ "\n\t" + Catalog.GetString("Translation of Firmware to C.") + ", " +
+ Catalog.GetString("New firmware features.") + ", " +
+ Catalog.GetString("Encoder hardware layer."),
+ "\nJuan Gonzalez Gómez <http://www.iearobotics.com>, 2004-2010\n\t" +
Catalog.GetString("Skypic, Chronopic, connection between hardware aind software."), //2010 he made the visit
to the lab
+ "\nRicardo Gómez González <http://www.iearobotics.com>, 2007\n\t" +
Catalog.GetString("Chronopic3 industrial prototype."),
+ "\nXavier de Blas Foix <info chronojump org>, 2015-2017\n\t" +
+ Catalog.GetString("Chronopic validation.") + " " +
+ Catalog.GetString("Chronopic reaction time advanced implementation.")
+ " " +
+ Catalog.GetString("Other functionalities."),
+ "\nXavier Padullés <testing chronojump org>, 2018\n\t" +
Catalog.GetString("Improved timers."),
+ "\nFerran Suárez Rodríguez <ferransuarez2 gmail com>, 2015-2016\n\t" +
Catalog.GetString("Chronopic reaction time advanced implementation."),
+ //"Juan Fernando Pardo <juanfer juanfer com ar>\n\t" + "Chronopic2."
};
else
return new String []{""};
diff --git a/src/gui/about.cs b/src/gui/about.cs
index 89be5984..6b0814a8 100644
--- a/src/gui/about.cs
+++ b/src/gui/about.cs
@@ -29,12 +29,10 @@ public class About
[Widget] Gtk.Image image_logo;
[Widget] Gtk.Label dialog_about_label_version;
- [Widget] Gtk.Label dialog_about_label_developers_CEO;
[Widget] Gtk.Label dialog_about_label_developers_software;
+ [Widget] Gtk.Label dialog_about_label_developers_networks;
[Widget] Gtk.Label dialog_about_label_developers_chronopic;
- [Widget] Gtk.Label dialog_about_label_developers_devices;
- [Widget] Gtk.Label dialog_about_label_developers_math;
- [Widget] Gtk.Label dialog_about_label_developers_opencv;
+ [Widget] Gtk.Label dialog_about_label_developers_scientific;
[Widget] Gtk.Label dialog_about_label_documenters;
[Widget] Gtk.Label dialog_about_label_translators;
@@ -68,12 +66,10 @@ public class About
dialog_about.ModifyBg(StateType.Normal, new Gdk.Color(0xff,0xff,0xff));
//put authors
- textLabel(Constants.Authors(Constants.AuthorsEnum.CEO), dialog_about_label_developers_CEO);
textLabel(Constants.Authors(Constants.AuthorsEnum.SOFTWARE),
dialog_about_label_developers_software);
+ textLabel(Constants.Authors(Constants.AuthorsEnum.NETWORKS),
dialog_about_label_developers_networks);
textLabel(Constants.Authors(Constants.AuthorsEnum.CHRONOPIC),
dialog_about_label_developers_chronopic);
- textLabel(Constants.Authors(Constants.AuthorsEnum.DEVICES),
dialog_about_label_developers_devices);
- textLabel(Constants.Authors(Constants.AuthorsEnum.MATH), dialog_about_label_developers_math);
- textLabel(Constants.Authors(Constants.AuthorsEnum.OPENCV),
dialog_about_label_developers_opencv);
+ textLabel(Constants.Authors(Constants.AuthorsEnum.SCIENTIFIC),
dialog_about_label_developers_scientific);
//put documenters separated by commas
string docsString = "";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
