[chronojump] discriminative uses main "execute test" button

[Xavier de Blas <xaviblas src gnome org>]

commit c4c6f5068ec150c7cb9a80554c1431558f5f3131
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri May 13 23:22:22 2016 +0200

    discriminative uses main "execute test" button

 glade/chronojump.glade  |   62 +++++++++++++++++++++++++++++++++++++++++++----
 src/gui/chronojump.cs   |    4 +++
 src/gui/reactionTime.cs |    5 ++-
 3 files changed, 64 insertions(+), 7 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 3cc8eae..6700328 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -5460,10 +5460,8 @@ after time</property>
                                                             <child>
                                                             <widget class="GtkButton" 
id="button_discriminative_lights_start">
                                                             <property name="label">Start</property>
-                                                            <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <signal name="clicked" 
handler="on_button_discriminative_lights_start_clicked" swapped="no"/>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -16321,6 +16319,9 @@ on current Chronojump version.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -20965,6 +20966,9 @@ by you</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -22090,6 +22094,9 @@ by you</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -23707,6 +23714,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>
@@ -24381,6 +24391,9 @@ by you</property>
             <child>
               <placeholder/>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </widget>
           <packing>
             <property name="expand">True</property>
@@ -37099,6 +37112,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>
@@ -39562,6 +39593,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -40862,9 +40905,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                                       <placeholder/>
                                     </child>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
                                       <widget class="GtkLabel" id="label218">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -41989,6 +42029,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>
@@ -46000,6 +46043,9 @@ It starts before and arrives there with some speed.</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
@@ -46789,6 +46835,9 @@ It starts before and arrives there with some speed.</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -47593,6 +47642,9 @@ It starts before and arrives there with some speed.</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 084a218..d7b9c14 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3809,6 +3809,10 @@ public partial class ChronoJumpWindow
                }
                else if(radio_mode_reaction_times_small.Active) {
                        LogB.Debug("radio_mode_rt");
+       
+                       if(extra_window_radio_reaction_time_discriminative.Active)
+                               reaction_time_discriminative_lights_prepare();
+
                        on_reaction_time_activate (o, args);
                }
                else if(radio_mode_pulses_small.Active) {
diff --git a/src/gui/reactionTime.cs b/src/gui/reactionTime.cs
index 5548720..813e882 100644
--- a/src/gui/reactionTime.cs
+++ b/src/gui/reactionTime.cs
@@ -180,7 +180,8 @@ public partial class ChronoJumpWindow
        private double discriminativeStartTime;
        private Random rnd;
 
-       private void on_button_discriminative_lights_start_clicked (object o, EventArgs args) 
+       //private void on_button_discriminative_lights_start_clicked (object o, EventArgs args) 
+       private void reaction_time_discriminative_lights_prepare () 
        {
                //TODO: check if nothing activated, Start should be unsensitive
 
@@ -247,7 +248,7 @@ public partial class ChronoJumpWindow
                LogB.Information("discriminativeCharToSend");
                LogB.Information(discriminativeCharToSend);
                
-               on_button_execute_test_clicked(o, args);
+               //on_button_execute_test_clicked(o, args);
        }