commit aa45ee6c03274669214af228146e616354b78e28
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat May 9 22:01:07 2015 +0200
Better GUI on new reaction time tests
glade/chronojump.glade | 140 ++++++++++++++++++++++++++++++++++++++++++++--
src/gui/chronojump.cs | 6 ++
src/gui/reactionTime.cs | 30 ++++++++++-
3 files changed, 168 insertions(+), 8 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 1fd60de..fe6b1eb 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -2961,6 +2961,7 @@
<widget class="GtkHBox" id="hbox60">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">5</property>
<child>
<widget class="GtkRadioButton"
id="extra_window_radio_reaction_time">
<property name="visible">True</property>
@@ -2969,6 +2970,7 @@
<property name="relief">none</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_extra_window_reaction_times_test_changed" swapped="no"/>
<child>
<widget class="GtkLabel"
id="label_extra_window_radio_reaction_time">
<property name="visible">True</property>
@@ -2984,7 +2986,76 @@
</packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkRadioButton"
id="extra_window_radio_reaction_time_animation_lights">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_radio_reaction_time</property>
+ <signal name="toggled"
handler="on_extra_window_reaction_times_test_changed" swapped="no"/>
+ <child>
+ <widget class="GtkLabel"
id="label_extra_window_radio_reaction_time_animation_lights">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Animation
lights</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="extra_window_radio_reaction_time_flicker">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_radio_reaction_time</property>
+ <signal name="toggled"
handler="on_extra_window_reaction_times_test_changed" swapped="no"/>
+ <child>
+ <widget class="GtkLabel"
id="label_extra_window_radio_reaction_time_flicker">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Flicker</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="extra_window_radio_reaction_time_discriminative">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">extra_window_radio_reaction_time</property>
+ <signal name="toggled"
handler="on_extra_window_reaction_times_test_changed" swapped="no"/>
+ <child>
+ <widget class="GtkLabel"
id="label_extra_window_radio_reaction_time_discriminative">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Discriminative</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
</child>
</widget>
<packing>
@@ -5242,8 +5313,7 @@ It starts before and arrives there with some speed.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkLabel" id="label77">
- <property name="visible">True</property>
+ <widget class="GtkLabel"
id="label_reaction_time_no_options">
<property name="can_focus">False</property>
<property name="label" translatable="yes">No
options</property>
</widget>
@@ -5260,8 +5330,7 @@ It starts before and arrives there with some speed.</property>
<property name="border_width">8</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label123">
- <property name="visible">True</property>
+ <widget class="GtkLabel"
id="label_reaction_time_experimental">
<property name="can_focus">False</property>
<property name="label">Experimental
stuff</property>
</widget>
@@ -5376,9 +5445,9 @@ It starts before and arrives there with some speed.</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
+ <widget class="GtkNotebook"
id="notebook_reaction_time_experimental">
<property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
<child>
<widget class="GtkHBox" id="hbox148">
<property name="visible">True</property>
@@ -7787,6 +7856,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -8697,6 +8769,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9859,6 +9934,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10662,6 +10740,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -21519,6 +21600,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22230,6 +22314,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23433,6 +23520,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -23693,6 +23783,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -33909,6 +34002,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36000,6 +36111,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36749,6 +36863,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -39464,6 +39581,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -39839,6 +39959,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40229,6 +40352,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index a1216a8..e4f41e7 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -680,6 +680,12 @@ public partial class ChronoJumpWindow
//reaction times changes
UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_reaction_time);
+ UtilGtk.ColorsTestLabel(viewport_chronopics,
label_extra_window_radio_reaction_time_animation_lights);
+ UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_reaction_time_animation_lights);
+ UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time_flicker);
+ UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_reaction_time_flicker);
+ UtilGtk.ColorsTestLabel(viewport_chronopics,
label_extra_window_radio_reaction_time_discriminative);
+ UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_reaction_time_discriminative);
//pulses changes
UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_pulses_free);
diff --git a/src/gui/reactionTime.cs b/src/gui/reactionTime.cs
index cdaa7c6..2210d5f 100644
--- a/src/gui/reactionTime.cs
+++ b/src/gui/reactionTime.cs
@@ -31,11 +31,39 @@ public partial class ChronoJumpWindow
{
[Widget] Gtk.Label label_extra_window_radio_reaction_time;
[Widget] Gtk.RadioButton extra_window_radio_reaction_time;
+ [Widget] Gtk.Label label_extra_window_radio_reaction_time_animation_lights;
+ [Widget] Gtk.RadioButton extra_window_radio_reaction_time_animation_lights;
+ [Widget] Gtk.Label label_extra_window_radio_reaction_time_flicker;
+ [Widget] Gtk.RadioButton extra_window_radio_reaction_time_flicker;
+ [Widget] Gtk.Label label_extra_window_radio_reaction_time_discriminative;
+ [Widget] Gtk.RadioButton extra_window_radio_reaction_time_discriminative;
+
+ [Widget] Gtk.Notebook notebook_reaction_time_experimental;
+ [Widget] Gtk.Label label_reaction_time_no_options;
+ [Widget] Gtk.Label label_reaction_time_experimental;
private void on_extra_window_reaction_times_test_changed(object o, EventArgs args)
{
- if(extra_window_radio_reaction_time.Active)
+ if(extra_window_radio_reaction_time.Active) {
currentReactionTimeType = new ReactionTimeType("reactionTime");
+
+ label_reaction_time_no_options.Visible = true;
+ label_reaction_time_experimental.Visible = false;
+ notebook_reaction_time_experimental.Visible = false;
+ } else {
+ label_reaction_time_no_options.Visible = false;
+ label_reaction_time_experimental.Visible = true;
+
+ if(extra_window_radio_reaction_time_animation_lights.Active)
+ notebook_reaction_time_experimental.CurrentPage = 0;
+ else if(extra_window_radio_reaction_time_flicker.Active)
+ notebook_reaction_time_experimental.CurrentPage = 1;
+ else if(extra_window_radio_reaction_time_discriminative.Active)
+ notebook_reaction_time_experimental.CurrentPage = 2;
+
+ notebook_reaction_time_experimental.Visible = true;
+ }
+
currentEventType = currentReactionTimeType;
}
}