commit 15bfee16c5e9ecf95aab9ef90e51fb612bd24139
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Dec 5 17:11:29 2019 +0100
Several improvements on new contacts gui
glade/app1.glade | 467 +++++++++++++++++++++++----------------------
src/gui/chronojump.cs | 26 +--
src/gui/chronojumpIcons.cs | 2 -
src/gui/networks.cs | 5 +-
src/gui/reactionTime.cs | 11 +-
src/gui/runEncoder.cs | 4 +-
src/jump.cs | 2 +-
7 files changed, 263 insertions(+), 254 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 9f6418af..3668193c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -5175,20 +5175,21 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkRadioButton"
id="radio_mode_multi_chronopic_small">
+ <widget class="GtkRadioButton"
id="radio_mode_pulses_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_radio_mode_multi_chronopic_small_toggled" swapped="no"/>
+ <property
name="group">radio_mode_multi_chronopic_small</property>
+ <signal name="toggled"
handler="on_radio_mode_pulses_small_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox132">
+ <widget class="GtkHBox" id="hbox120">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkImage"
id="image_mode_multi_chronopic_small">
+ <widget class="GtkImage"
id="image_mode_pulses_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -5200,10 +5201,10 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_mode_multi_chronopic_small">
+ <widget class="GtkLabel"
id="label_mode_pulses_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">MultiChronopic</property>
+ <property name="label"
translatable="yes">Pulses</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -5222,21 +5223,20 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="radio_mode_pulses_small">
+ <widget class="GtkRadioButton"
id="radio_mode_multi_chronopic_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
- <property
name="group">radio_mode_multi_chronopic_small</property>
- <signal name="toggled"
handler="on_radio_mode_pulses_small_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_radio_mode_multi_chronopic_small_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox120">
+ <widget class="GtkHBox" id="hbox132">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkImage"
id="image_mode_pulses_small">
+ <widget class="GtkImage"
id="image_mode_multi_chronopic_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -5248,10 +5248,10 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_mode_pulses_small">
+ <widget class="GtkLabel"
id="label_mode_multi_chronopic_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Pulses</property>
+ <property name="label"
translatable="yes">MultiChronopic</property>
<property name="justify">center</property>
</widget>
<packing>
@@ -5687,31 +5687,6 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkAspectFrame" id="aspectframe1">
- <property name="width_request">110</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkEventBox"
id="eventbox_image_test">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage" id="image_test">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton"
id="button_execute_test">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -5731,7 +5706,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -5785,7 +5760,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -5843,7 +5818,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -5915,17 +5890,18 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame7">
+ <widget class="GtkFrame"
id="frame_jumps_automatic">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<widget class="GtkNotebook"
id="notebook_jumps_automatic">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">4</property>
<property name="show_tabs">False</property>
@@ -6172,7 +6148,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -11277,7 +11253,6 @@ EncoderInertialCapture</property>
<widget class="GtkFrame" id="frame_instructions">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">4</property>
<property name="label_xalign">0.5</property>
<property name="shadow_type">in</property>
<child>
@@ -11285,37 +11260,48 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">12</property>
- <property name="left_padding">12</property>
+ <property name="left_padding">20</property>
<child>
<widget class="GtkVBox" id="vbox147">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="spacing">25</property>
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">8</property>
+ <property name="top_padding">12</property>
<child>
- <widget class="GtkNotebook"
id="notebook_execute">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkHBox" id="hbox216">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox_jumps">
+ <widget class="GtkAspectFrame" id="aspectframe1">
+ <property name="width_request">110</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkHBox" id="hbox_jumps_test">
+ <widget class="GtkEventBox"
id="eventbox_image_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
<child>
<widget class="GtkLabel" id="label13">
<property name="visible">True</property>
@@ -11323,12 +11309,89 @@ EncoderInertialCapture</property>
<property name="label"
translatable="yes">Test</property>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_image_test_zoom">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_image_test_zoom_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image_test_zoom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</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="GtkImage" id="image_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</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="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_execute">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_jumps">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox_jumps_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
<widget class="GtkHBox"
id="hbox_combo_select_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11339,7 +11402,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -11427,13 +11490,6 @@ EncoderInertialCapture</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
</child>
<child>
<widget class="GtkLabel" id="label1">
@@ -11447,32 +11503,16 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkHBox" id="hbox_jumps_rj">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkHBox" id="hbox111">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Test</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_combo_select_jumps_rj">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11483,7 +11523,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -11572,13 +11612,6 @@ EncoderInertialCapture</property>
</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">1</property>
</packing>
</child>
@@ -11595,31 +11628,18 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox10">
+ <widget class="GtkVBox" id="vbox32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox_runs">
+ <widget class="GtkVBox" id="vbox_runs">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkHBox" id="hbox12">
- <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="label33">
+ <widget class="GtkHBox" id="hbox111">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Test</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<widget class="GtkHBox"
id="hbox_combo_select_runs">
<property name="visible">True</property>
@@ -11631,7 +11651,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -11743,11 +11763,16 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox32">
+ <widget class="GtkHBox"
id="hbox_runs_interval_all">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <widget class="GtkVBox" id="vbox_runs_interval">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -11756,15 +11781,17 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <widget class="GtkHBox" id="hbox34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkHBox"
id="hbox_combo_select_runs_interval">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Test</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -11772,18 +11799,18 @@ EncoderInertialCapture</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_select_runs_interval">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -11878,18 +11905,19 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_runs_interval_compujump">
+ <widget class="GtkVBox"
id="vbox_runs_interval_compujump">
<property name="can_focus">False</property>
- <property name="spacing">30</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkLabel" id="label90">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label"
translatable="yes">Races:</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>
@@ -11971,20 +11999,13 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</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">3</property>
</packing>
</child>
@@ -12006,27 +12027,15 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox_force_sensor">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkHBox" id="hbox152">
+ <widget class="GtkVBox" id="vbox_force_sensor">
<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="label18">
+ <widget class="GtkHBox" id="hbox_force_sensor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Test</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">20</property>
<child>
<widget class="GtkHBox"
id="hbox_combo_force_sensor_exercise">
<property name="visible">True</property>
@@ -12038,7 +12047,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -12125,7 +12134,7 @@ EncoderInertialCapture</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -12157,6 +12166,7 @@ EncoderInertialCapture</property>
<widget class="GtkVBox" id="vbox49">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
<widget class="GtkHBox" id="hbox60">
<property name="visible">True</property>
@@ -12254,31 +12264,23 @@ EncoderInertialCapture</property>
<property name="position">3</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_reaction_time_device_help">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_reaction_time_device_help_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_reaction_time_device_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel"
id="label_reaction_time_device_help">
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">This
test needs Chronojump reaction time device.</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -12303,6 +12305,10 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkVBox" id="vbox156">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkHBox" id="hbox_other_pulses">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12355,6 +12361,13 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
@@ -12378,6 +12391,10 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
+ <widget class="GtkVBox" id="vbox157">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkHBox" id="hbox_other_mc">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12429,6 +12446,13 @@ EncoderInertialCapture</property>
</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">7</property>
</packing>
</child>
@@ -12445,6 +12469,11 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
+ <widget class="GtkVBox"
id="vbox_run_encoder_capture_buttons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
<widget class="GtkHBox"
id="hbox_run_encoder_capture_buttons">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12459,10 +12488,12 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkLabel" id="label368">
+ <widget class="GtkHBox"
id="hbox_combo_run_encoder_exercise">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Test</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -12470,18 +12501,11 @@ EncoderInertialCapture</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_run_encoder_exercise">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -12491,6 +12515,13 @@ EncoderInertialCapture</property>
<property name="position">0</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="GtkHBox" id="hbox333">
<property name="visible">True</property>
@@ -12574,16 +12605,6 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
<property name="position">8</property>
</packing>
</child>
@@ -12600,8 +12621,6 @@ EncoderInertialCapture</property>
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -12614,25 +12633,6 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">25</property>
<child>
- <widget class="GtkButton"
id="button_image_test_zoom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_image_test_zoom_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image_test_zoom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkNotebook"
id="notebook_options_top">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12644,23 +12644,10 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkHBox" id="hbox170">
- <property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label113">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Options</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="extra_window_jumps_hbox_fall">
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -12841,7 +12828,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -12949,7 +12936,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -12963,7 +12950,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -13235,7 +13222,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -15287,18 +15274,32 @@ Resisted race analyzer</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
@@ -22083,6 +22084,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31430,6 +31437,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 6a5c2070..37bc62a9 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -163,11 +163,13 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Box hbox_combo_result_runs_interval;
[Widget] Gtk.Box hbox_combo_pulses;
- [Widget] Gtk.Box hbox_jumps;
+ [Widget] Gtk.VBox vbox_jumps;
[Widget] Gtk.Box hbox_jumps_test;
[Widget] Gtk.Box hbox_jumps_rj;
- [Widget] Gtk.Box hbox_runs;
- [Widget] Gtk.Box hbox_runs_interval;
+ [Widget] Gtk.VBox vbox_runs;
+ [Widget] Gtk.HBox hbox_runs_interval_all; //normal and compujump
+ [Widget] Gtk.VBox vbox_runs_interval;
+ [Widget] Gtk.VBox vbox_runs_interval_compujump;
[Widget] Gtk.Box hbox_other_mc;
[Widget] Gtk.Box hbox_other_pulses;
@@ -224,6 +226,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_contacts_signal_comment;
[Widget] Gtk.TextView textview_contacts_signal_comment;
[Widget] Gtk.Button button_contacts_signal_save_comment;
+ [Widget] Gtk.Frame frame_jumps_automatic;
[Widget] Gtk.Notebook notebook_jumps_automatic;
[Widget] Gtk.VBox vbox_contacts_device_and_camera;
@@ -3169,7 +3172,7 @@ public partial class ChronoJumpWindow
button_force_sensor_adjust.Visible = false;
vbox_contacts_load_recalculate.Visible = false;
vbox_contacts_signal_comment.Visible = false;
- notebook_jumps_automatic.Visible = false;
+ frame_jumps_automatic.Visible = false;
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
if(
@@ -3200,7 +3203,7 @@ public partial class ChronoJumpWindow
notebooks_change(m);
on_extra_window_jumps_test_changed(new object(), new EventArgs());
hbox_results_legend.Visible = true;
- notebook_jumps_automatic.Visible = true;
+ frame_jumps_automatic.Visible = true;
if(radio_mode_contacts_analyze.Active)
{
@@ -7371,7 +7374,7 @@ LogB.Debug("mc finished 5");
//only called by delete person functions (if we run out of persons)
private void sensitiveGuiNoPerson () {
- hbox_jumps.Sensitive = false;
+ vbox_jumps.Sensitive = false;
hbox_jumps_rj.Sensitive = false;
button_execute_test.Sensitive = false;
button_auto_start.Sensitive = false;
@@ -7400,7 +7403,7 @@ LogB.Debug("mc finished 5");
}
private void sensitiveGuiYesPerson () {
- hbox_jumps.Sensitive = true;
+ vbox_jumps.Sensitive = true;
hbox_jumps_rj.Sensitive = true;
button_execute_test.Sensitive = true;
button_auto_start.Sensitive = true;
@@ -7492,8 +7495,8 @@ LogB.Debug("mc finished 5");
hbox_jump_types_options.Sensitive = false;
hbox_jumps_rj.Sensitive = false;
- hbox_runs.Sensitive = false;
- hbox_runs_interval.Sensitive = false;
+ vbox_runs.Sensitive = false;
+ hbox_runs_interval_all.Sensitive = false;
hbox_other_mc.Sensitive = false;
hbox_other_pulses.Sensitive = false;
sensitiveLastTestButtons(false);
@@ -7562,8 +7565,8 @@ LogB.Debug("mc finished 5");
hbox_jump_types_options.Sensitive = true;
hbox_jumps_rj.Sensitive = true;
- hbox_runs.Sensitive = true;
- hbox_runs_interval.Sensitive = true;
+ vbox_runs.Sensitive = true;
+ hbox_runs_interval_all.Sensitive = true;
hbox_other_mc.Sensitive = true;
hbox_other_pulses.Sensitive = true;
//hbox_multi_chronopic_buttons.Sensitive = true;
@@ -7691,7 +7694,6 @@ LogB.Debug("mc finished 5");
frame_persons.Sensitive = ! start;
hbox_jumps_test.Visible = ! start;
- button_auto_start.Visible = ! start;
hbox_jump_types_options.Visible = ! start;
hbox_jump_auto_controls.Visible = start;
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index dd48e5d0..71176f93 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -76,7 +76,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_info4;
[Widget] Gtk.Image image_run_simple_with_reaction_time_help;
[Widget] Gtk.Image image_run_interval_with_reaction_time_help;
- [Widget] Gtk.Image image_reaction_time_device_help;
[Widget] Gtk.Image image_info_sessions_info;
[Widget] Gtk.Image image_add_test1;
[Widget] Gtk.Image image_add_test2;
@@ -343,7 +342,6 @@ public partial class ChronoJumpWindow
image_info4.Pixbuf = pixbuf;
image_run_simple_with_reaction_time_help.Pixbuf = pixbuf;
image_run_interval_with_reaction_time_help.Pixbuf = pixbuf;
- image_reaction_time_device_help.Pixbuf = pixbuf;
image_info_sessions_info.Pixbuf = pixbuf;
image_encoder_1RM_info.Pixbuf = pixbuf;
image_force_sensor_adjust_help.Pixbuf = pixbuf;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index b7037d0c..b44f3d75 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -87,7 +87,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_RFID_disconnected;
//runsInterval
- [Widget] Gtk.HBox hbox_runs_interval_compujump;
[Widget] Gtk.RadioButton radio_run_interval_compujump_5m;
[Widget] Gtk.RadioButton radio_run_interval_compujump_10m;
[Widget] Gtk.RadioButton radio_run_interval_compujump_15m;
@@ -186,8 +185,8 @@ public partial class ChronoJumpWindow
else //if(configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.POWERINERTIAL)
on_button_selector_start_encoder_inertial_clicked(new object (), new
EventArgs());
- hbox_runs_interval.Visible = false;
- hbox_runs_interval_compujump.Visible = true;
+ vbox_runs_interval.Visible = false;
+ vbox_runs_interval_compujump.Visible = true;
menuitem_mode.Visible = false;
button_menu_outside_menu.Visible = false;
diff --git a/src/gui/reactionTime.cs b/src/gui/reactionTime.cs
index 4185d2fe..89e3d5cf 100644
--- a/src/gui/reactionTime.cs
+++ b/src/gui/reactionTime.cs
@@ -42,7 +42,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton extra_window_radio_reaction_time_flicker;
[Widget] Gtk.RadioButton extra_window_radio_reaction_time_discriminative;
- [Widget] Gtk.Button button_reaction_time_device_help;
+ [Widget] Gtk.Label label_reaction_time_device_help;
private void on_extra_window_reaction_times_test_changed(object o, EventArgs args)
@@ -60,10 +60,12 @@ public partial class ChronoJumpWindow
if(extra_window_radio_reaction_time_animation_lights.Active) {
hbox_animation_lights.Visible = true;
currentReactionTimeType = new ReactionTimeType("anticipation");
+ changeTestImage("","", "reaction_time_discriminative.png");
}
else if(extra_window_radio_reaction_time_flicker.Active) {
hbox_flicker_lights.Visible = true;
currentReactionTimeType = new ReactionTimeType("flickr");
+ changeTestImage("","", "reaction_time_discriminative.png");
}
else if(extra_window_radio_reaction_time_discriminative.Active) {
hbox_discriminative_lights.Visible = true;
@@ -71,7 +73,7 @@ public partial class ChronoJumpWindow
changeTestImage("","", "reaction_time_discriminative.png");
}
- button_reaction_time_device_help.Visible = (
+ label_reaction_time_device_help.Visible = (
extra_window_radio_reaction_time_animation_lights.Active ||
extra_window_radio_reaction_time_flicker.Active ||
extra_window_radio_reaction_time_discriminative.Active );
@@ -109,11 +111,6 @@ public partial class ChronoJumpWindow
}
- private void on_button_reaction_time_device_help_clicked (object o, EventArgs args)
- {
- new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("This test needs Chronojump
reaction time device."));
- }
-
// ---- animation lights
private void on_spinbutton_animation_lights_speed_value_changed (object o, EventArgs args) {
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index 54132222..230b27a1 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -37,7 +37,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_race_encoder_open_folder;
[Widget] Gtk.CheckMenuItem menuitem_check_race_encoder_capture_simulate;
- [Widget] Gtk.HBox hbox_run_encoder_capture_buttons;
+ [Widget] Gtk.VBox vbox_run_encoder_capture_buttons;
[Widget] Gtk.HBox hbox_run_encoder_capture_options;
[Widget] Gtk.HBox hbox_combo_run_encoder_exercise;
[Widget] Gtk.ComboBox combo_run_encoder_exercise;
@@ -1171,7 +1171,7 @@ LogB.Information(" re R ");
void runEncoderButtonsSensitive(bool sensitive)
{
//runEncoder related buttons
- hbox_run_encoder_capture_buttons.Sensitive = sensitive;
+ vbox_run_encoder_capture_buttons.Sensitive = sensitive;
hbox_run_encoder_capture_options.Sensitive = sensitive;
button_execute_test.Sensitive = sensitive;
diff --git a/src/jump.cs b/src/jump.cs
index 35b42106..5209a26b 100644
--- a/src/jump.cs
+++ b/src/jump.cs
@@ -55,7 +55,7 @@ public class Jump : Event
this.simulated = simulated;
}
- //used to select a jump at SqliteJump.SelectNormalJumpData and at Sqlite.converTables
+ //used to select a jump at SqliteJump.SelectJumpData and at Sqlite.converTables
public Jump(string [] eventString)
{
this.uniqueID = Convert.ToInt32(eventString[0]);