commit ac37027802a65596dc421c4166d0d9ae646118ff
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Dec 11 17:56:12 2019 +0100
new gui for reaction time
glade/app1.glade | 83 +++++++++++++++++++++++---------------------
src/gui/app1/reactionTime.cs | 6 ++--
2 files changed, 46 insertions(+), 43 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 0e336705..2ad90012 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -14190,12 +14190,6 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox98">
- <property name="height_request">32</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">25</property>
- <child>
<widget class="GtkHBox"
id="hbox_animation_lights">
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -14316,6 +14310,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
@@ -14489,11 +14484,18 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
+ <widget class="GtkVBox"
id="vbox_discriminative_lights">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
<widget class="GtkHBox"
id="hbox_discriminative_lights">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
@@ -14600,8 +14602,8 @@ EncoderInertialCapture</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
@@ -14612,6 +14614,13 @@ EncoderInertialCapture</property>
<property name="position">0</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox136">
<property name="visible">True</property>
@@ -14629,8 +14638,8 @@ EncoderInertialCapture</property>
<property name="label"
translatable="yes">Minimum</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -14658,8 +14667,8 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -14675,8 +14684,8 @@ EncoderInertialCapture</property>
<property name="label"
translatable="yes">Maximum</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -14720,30 +14729,18 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
<property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label104">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">rt</property>
- </widget>
+ <placeholder/>
<packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
</child>
@@ -22156,6 +22153,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24403,18 +24403,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -24451,6 +24439,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -31530,6 +31530,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/reactionTime.cs b/src/gui/app1/reactionTime.cs
index 52baf8af..d8964474 100644
--- a/src/gui/app1/reactionTime.cs
+++ b/src/gui/app1/reactionTime.cs
@@ -29,7 +29,7 @@ public partial class ChronoJumpWindow
{
[Widget] Gtk.HBox hbox_animation_lights;
[Widget] Gtk.HBox hbox_flicker_lights;
- [Widget] Gtk.HBox hbox_discriminative_lights;
+ [Widget] Gtk.VBox vbox_discriminative_lights;
[Widget] Gtk.Label label_animation_lights_interval;
[Widget] Gtk.Label label_flicker_lights_cycle;
@@ -47,7 +47,7 @@ public partial class ChronoJumpWindow
{
hbox_animation_lights.Visible = false;
hbox_flicker_lights.Visible = false;
- hbox_discriminative_lights.Visible = false;
+ vbox_discriminative_lights.Visible = false;
sensitiveLastTestButtons(false);
@@ -68,7 +68,7 @@ public partial class ChronoJumpWindow
setLabelContactsExerciseSelected(Catalog.GetString("Flicker"));
}
else if(extra_window_radio_reaction_time_discriminative.Active) {
- hbox_discriminative_lights.Visible = true;
+ vbox_discriminative_lights.Visible = true;
currentReactionTimeType = new ReactionTimeType("Discriminative");
changeTestImage("","", "reaction_time_discriminative.png");
setLabelContactsExerciseSelected(Catalog.GetString("Discriminative"));