[chronojump] separated jumps simple/reactive, runs simple/intervallic. TODO on start window
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] separated jumps simple/reactive, runs simple/intervallic. TODO on start window
- Date: Sat, 20 Aug 2016 15:25:55 +0000 (UTC)
commit 1fe1f801da02e6d27e0130c38f1c1d6483f38cb7
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Aug 20 17:21:01 2016 +0200
separated jumps simple/reactive, runs simple/intervallic. TODO on start window
glade/chronojump.glade | 554 +++++++++++++++++------------------------------
src/constants.cs | 2 +-
src/encoder.cs | 14 --
src/gui/chronojump.cs | 202 +++++++++--------
src/gui/eventExecute.cs | 4 +-
src/gui/preferences.cs | 4 +-
6 files changed, 316 insertions(+), 464 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index e8691ae..03030bb 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -255,71 +255,111 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_jumps">
+ <widget class="GtkMenuItem" id="menuitem_mode_main_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Jumps</property>
+ <property name="label" translatable="yes">Main menu</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_jumps_simple">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Jumps simple</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
<child>
- <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_runs">
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_jumps_reactive">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Runs</property>
+ <property name="label" translatable="yes">Jumps reactive</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
- <property name="group">radio_menuitem_mode_jumps</property>
+ <property name="group">radio_menuitem_mode_jumps_simple</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
<child>
- <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_power_gravitatory">
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power (gravitatory)</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_runs_simple">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Runs simple</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
- <property name="group">radio_menuitem_mode_jumps</property>
+ <property name="group">radio_menuitem_mode_jumps_simple</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
<child>
- <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_power_inertial">
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_runs_intervallic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power (inertial)</property>
+ <property name="label" translatable="yes">Runs intervallic</property>
+ <property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
- <property name="group">radio_menuitem_mode_jumps</property>
+ <property name="group">radio_menuitem_mode_jumps_simple</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
<child>
- <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_other">
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Other</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_power_gravitatory">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Power (gravitatory)</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
- <property name="group">radio_menuitem_mode_jumps</property>
+ <property name="group">radio_menuitem_mode_jumps_simple</property>
<signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_power_inertial">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Power (inertial)</property>
+ <property name="draw_as_radio">True</property>
+ <property name="group">radio_menuitem_mode_jumps_simple</property>
+ <signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_mode_main_menu">
+ <widget class="GtkRadioMenuItem" id="radio_menuitem_mode_other">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Main menu</property>
+ <property name="label" translatable="yes">Other</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
+ <property name="draw_as_radio">True</property>
+ <property name="group">radio_menuitem_mode_jumps_simple</property>
+ <signal name="activate" handler="on_radio_menuitem_mode_activate" swapped="no"/>
</widget>
</child>
</widget>
@@ -327,17 +367,33 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_mode_selected_jumps">
+ <widget class="GtkMenuItem" id="menuitem_mode_selected_jumps_simple">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Jumps</property>
+ <property name="label" translatable="yes">Jumps simple</property>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_mode_selected_runs">
+ <widget class="GtkMenuItem" id="menuitem_mode_selected_jumps_reactive">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Runs</property>
+ <property name="label" translatable="yes">Jumps reactive</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="menuitem_mode_selected_runs_simple">
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Runs simple</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="menuitem_mode_selected_runs_intervallic">
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Runs intervallic</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -575,7 +631,7 @@
<property name="receives_default">True</property>
<property name="tooltip" translatable="yes">Or press '1'</property>
<property name="relief">none</property>
- <signal name="clicked" handler="on_button_selector_start_jumps_clicked"
swapped="no"/>
+ <signal name="clicked"
handler="on_button_selector_start_jumps_simple_clicked" swapped="no"/>
<accelerator key="1" signal="clicked"/>
<child>
<widget class="GtkVBox" id="vbox78">
@@ -696,7 +752,7 @@
<property name="receives_default">True</property>
<property name="tooltip" translatable="yes">Or press '2'</property>
<property name="relief">none</property>
- <signal name="clicked" handler="on_button_selector_start_runs_clicked"
swapped="no"/>
+ <signal name="clicked"
handler="on_button_selector_start_runs_simple_clicked" swapped="no"/>
<accelerator key="2" signal="clicked"/>
<child>
<widget class="GtkVBox" id="vbox79">
@@ -2043,409 +2099,153 @@ Carles</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkNotebook" id="notebook_sup_contacts">
- <property name="visible">True</property>
+ <widget class="GtkHBox" id="hbox_other">
<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="GtkHBox" id="hbox107">
+ <widget class="GtkRadioButton"
id="radio_mode_reaction_times_small">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</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_jumps_small</property>
+ <signal name="toggled"
handler="on_radio_mode_reaction_times_small_toggled" swapped="no"/>
<child>
- <widget class="GtkRadioButton"
id="radio_mode_jumps_small">
+ <widget class="GtkHBox" id="hbox119">
<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>
- <signal name="toggled"
handler="on_radio_mode_jumps_small_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox108">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_jumps_small">
+ <widget class="GtkImage"
id="image_mode_reaction_times_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</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="label_mode_jumps_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Simple
Jumps</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radio_mode_jumps_reactive_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_jumps_small</property>
- <signal name="toggled"
handler="on_radio_mode_jumps_reactive_small_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox110">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_jumps_reactive_small">
+ <widget class="GtkLabel"
id="label_mode_reaction_times_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_mode_jumps_reactive_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Multiple Jumps</property>
+ <property name="label"
translatable="yes">Reaction times</property>
<property name="justify">center</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>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">jumps</property>
- </widget>
<packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox115">
+ <widget class="GtkRadioButton"
id="radio_mode_pulses_small">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</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_reaction_times_small</property>
+ <signal name="toggled"
handler="on_radio_mode_pulses_small_toggled" swapped="no"/>
<child>
- <widget class="GtkRadioButton"
id="radio_mode_runs_small">
+ <widget class="GtkHBox" id="hbox120">
<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_jumps_small</property>
- <signal name="toggled"
handler="on_radio_mode_runs_small_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox116">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_runs_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>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_mode_runs_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Simple
Runs</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radio_mode_runs_intervallic_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_jumps_small</property>
- <signal name="toggled"
handler="on_radio_mode_runs_intervallic_small_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox117">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_runs_intervallic_small">
+ <widget class="GtkLabel"
id="label_mode_pulses_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</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="label_mode_runs_intervallic_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Intervallic Runs</property>
+ <property name="label"
translatable="yes">Pulses</property>
<property name="justify">center</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- </widget>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">runs</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox118">
+ <widget class="GtkRadioButton"
id="radio_mode_multi_chronopic_small">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</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_reaction_times_small</property>
+ <signal name="toggled"
handler="on_radio_mode_multi_chronopic_small_toggled" swapped="no"/>
<child>
- <widget class="GtkRadioButton"
id="radio_mode_reaction_times_small">
+ <widget class="GtkHBox" id="hbox132">
<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_jumps_small</property>
- <signal name="toggled"
handler="on_radio_mode_reaction_times_small_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox119">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_reaction_times_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>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_mode_reaction_times_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Reaction times</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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>
- <child>
- <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>
- <property
name="group">radio_mode_jumps_small</property>
- <signal name="toggled"
handler="on_radio_mode_pulses_small_toggled" swapped="no"/>
- <child>
- <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_pulses_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_mode_pulses_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Pulses</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
+ </packing>
</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="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_jumps_small</property>
- <signal name="toggled"
handler="on_radio_mode_multi_chronopic_small_toggled" swapped="no"/>
<child>
- <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_multi_chronopic_small">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</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="label_mode_multi_chronopic_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">MultiChronopic</property>
<property name="justify">center</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- </widget>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">other</property>
- </widget>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -17954,6 +17754,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -22769,6 +22572,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24065,6 +23871,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25853,6 +25662,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>
@@ -26698,6 +26510,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -40002,6 +39817,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>
@@ -43149,6 +42982,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>
@@ -44278,9 +44123,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>
@@ -45576,6 +45418,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>
@@ -50455,6 +50300,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -51415,6 +51263,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -52390,6 +52241,9 @@ Other</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/constants.cs b/src/constants.cs
index a8c4d30..9f4cbbf 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -689,7 +689,7 @@ public class Constants
JUMPS, RUNS, ENCODER
}
- public enum Menuitem_modes { JUMPS, RUNS, POWERGRAVITATORY, POWERINERTIAL, OTHER }
+ public enum Menuitem_modes { JUMPSSIMPLE, JUMPSREACTIVE, RUNSSIMPLE, RUNSINTERVALLIC,
POWERGRAVITATORY, POWERINERTIAL, OTHER }
public static string All = "All";
public static string None = "None";
diff --git a/src/encoder.cs b/src/encoder.cs
index 832006b..62b3ab6 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -349,25 +349,18 @@ public class EncoderCurve
switch(parameter) {
case Constants.MeanSpeed:
return Convert.ToDouble(MeanSpeed);
- break;
case Constants.MaxSpeed:
return Convert.ToDouble(MaxSpeed);
- break;
case Constants.MeanForce:
return Convert.ToDouble(MeanForce);
- break;
case Constants.MaxForce:
return Convert.ToDouble(MaxForce);
- break;
case Constants.MeanPower:
return Convert.ToDouble(MeanPower);
- break;
case Constants.PeakPower:
return Convert.ToDouble(PeakPower);
- break;
default:
return Convert.ToDouble(MeanPower);
- break;
}
}
@@ -1577,25 +1570,18 @@ public class EncoderConfiguration {
switch(gearedDown) {
case -4:
return "4";
- break;
case -3:
return "3";
- break;
case -2:
return "2";
- break;
case 2:
return "1/2";
- break;
case 3:
return "1/3";
- break;
case 4:
return "1/4";
- break;
default:
return "2";
- break;
}
}
public void SetGearedDownFromDisplay(string gearedUpStr)
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 96f70f5..6a3f874 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -44,21 +44,25 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton spin_gui_tests;
[Widget] Gtk.Button button_carles;
- [Widget] Gtk.RadioMenuItem radio_menuitem_mode_jumps;
- [Widget] Gtk.RadioMenuItem radio_menuitem_mode_runs;
+ [Widget] Gtk.RadioMenuItem radio_menuitem_mode_jumps_simple;
+ [Widget] Gtk.RadioMenuItem radio_menuitem_mode_jumps_reactive;
+ [Widget] Gtk.RadioMenuItem radio_menuitem_mode_runs_simple;
+ [Widget] Gtk.RadioMenuItem radio_menuitem_mode_runs_intervallic;
[Widget] Gtk.RadioMenuItem radio_menuitem_mode_power_gravitatory;
[Widget] Gtk.RadioMenuItem radio_menuitem_mode_power_inertial;
[Widget] Gtk.RadioMenuItem radio_menuitem_mode_other;
- [Widget] Gtk.MenuItem menuitem_mode_selected_jumps;
- [Widget] Gtk.MenuItem menuitem_mode_selected_runs;
+ [Widget] Gtk.MenuItem menuitem_mode_selected_jumps_simple;
+ [Widget] Gtk.MenuItem menuitem_mode_selected_jumps_reactive;
+ [Widget] Gtk.MenuItem menuitem_mode_selected_runs_simple;
+ [Widget] Gtk.MenuItem menuitem_mode_selected_runs_intervallic;
[Widget] Gtk.MenuItem menuitem_mode_selected_power_gravitatory;
[Widget] Gtk.MenuItem menuitem_mode_selected_power_inertial;
[Widget] Gtk.MenuItem menuitem_mode_selected_other;
[Widget] Gtk.Notebook notebook_start; //use to display the start images to select different modes
[Widget] Gtk.Notebook notebook_sup;
- [Widget] Gtk.Notebook notebook_sup_contacts;
+ [Widget] Gtk.HBox hbox_other;
[Widget] Gtk.Notebook notebook_capture_graph_table;
[Widget] Gtk.Notebook notebook_capture_analyze; //not encoder
@@ -70,20 +74,17 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_selector_start_encoder_gravitatory;
[Widget] Gtk.Image image_selector_start_encoder_inertial;
- //gui for small screens
- [Widget] Gtk.RadioButton radio_mode_jumps_small;
- [Widget] Gtk.RadioButton radio_mode_jumps_reactive_small;
- [Widget] Gtk.RadioButton radio_mode_runs_small;
- [Widget] Gtk.RadioButton radio_mode_runs_intervallic_small;
[Widget] Gtk.RadioButton radio_mode_reaction_times_small;
[Widget] Gtk.RadioButton radio_mode_pulses_small;
[Widget] Gtk.RadioButton radio_mode_multi_chronopic_small;
[Widget] Gtk.RadioButton radio_mode_encoder_capture_small;
[Widget] Gtk.RadioButton radio_mode_encoder_analyze_small;
+ /*
[Widget] Gtk.Image image_mode_jumps_small;
[Widget] Gtk.Image image_mode_jumps_reactive_small;
[Widget] Gtk.Image image_mode_runs_small;
[Widget] Gtk.Image image_mode_runs_intervallic_small;
+ */
[Widget] Gtk.Image image_mode_reaction_times_small;
[Widget] Gtk.Image image_mode_pulses_small;
[Widget] Gtk.Image image_mode_multi_chronopic_small;
@@ -492,13 +493,13 @@ public partial class ChronoJumpWindow
private void on_button_image_test_zoom_clicked(object o, EventArgs args) {
EventType myType;
- if(radio_mode_jumps_small.Active)
+ if(radio_menuitem_mode_jumps_simple.Active)
myType = currentJumpType;
- else if(radio_mode_jumps_reactive_small.Active)
+ else if(radio_menuitem_mode_jumps_reactive.Active)
myType = currentJumpRjType;
- else if(radio_mode_runs_small.Active)
+ else if(radio_menuitem_mode_runs_simple.Active)
myType = currentRunType;
- else if(radio_mode_runs_intervallic_small.Active)
+ else if(radio_menuitem_mode_runs_intervallic.Active)
myType = currentRunIntervalType;
else if(radio_mode_reaction_times_small.Active)
myType = currentReactionTimeType;
@@ -682,6 +683,7 @@ public partial class ChronoJumpWindow
* gui for small screens
*/
+ /*
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumps);
image_mode_jumps_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsRJ);
@@ -690,6 +692,7 @@ public partial class ChronoJumpWindow
image_mode_runs_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
image_mode_runs_intervallic_small.Pixbuf = pixbuf;
+ */
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
image_mode_reaction_times_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
@@ -953,42 +956,7 @@ public partial class ChronoJumpWindow
* ---------------- test modes (small GUI) ----------------
* --------------------------------------------------------
*/
-
- public void on_radio_mode_jumps_small_toggled (object obj, EventArgs args) {
- if(radio_mode_jumps_small.Active) {
- notebooks_change(0);
- on_extra_window_jumps_test_changed(obj, args);
- hbox_results_legend.Visible = true;
-
- notebook_capture_analyze.GetNthPage(2).Show(); //show jumpsProfile on jumps
- }
- }
-
- public void on_radio_mode_jumps_reactive_small_toggled (object obj, EventArgs args) {
- if(radio_mode_jumps_reactive_small.Active) {
- notebooks_change(1);
- on_extra_window_jumps_rj_test_changed(obj, args);
- hbox_results_legend.Visible = false;
-
- notebook_capture_analyze.GetNthPage(2).Hide(); //don't show jumpsProfile on jumps
reactive
- }
- }
-
- public void on_radio_mode_runs_small_toggled (object obj, EventArgs args) {
- if(radio_mode_runs_small.Active) {
- notebooks_change(2);
- on_extra_window_runs_test_changed(obj, args);
- hbox_results_legend.Visible = true;
- }
- }
- public void on_radio_mode_runs_intervallic_small_toggled (object obj, EventArgs args) {
- if(radio_mode_runs_intervallic_small.Active) {
- notebooks_change(3);
- on_extra_window_runs_interval_test_changed(obj, args);
- hbox_results_legend.Visible = false;
- }
- }
public void on_radio_mode_reaction_times_small_toggled (object obj, EventArgs args) {
if(radio_mode_reaction_times_small.Active) {
@@ -1170,13 +1138,13 @@ public partial class ChronoJumpWindow
private void personChanged() {
//1) change on jumps, runs, pulse capture graph
- if(radio_mode_jumps_small.Active) {
+ if(radio_menuitem_mode_jumps_simple.Active) {
updateGraphJumpsSimple();
if(notebook_capture_analyze.CurrentPage == 2) //Jumps Profile
jumpsProfileDo(true); //calculate data
}
- else if(radio_mode_runs_small.Active)
+ else if(radio_menuitem_mode_runs_simple.Active)
updateGraphRunsSimple();
else if(radio_mode_reaction_times_small.Active)
updateGraphReactionTimes();
@@ -3068,8 +3036,10 @@ public partial class ChronoJumpWindow
private void select_menuitem_mode_toggled(Constants.Menuitem_modes m)
{
- menuitem_mode_selected_jumps.Visible = false;
- menuitem_mode_selected_runs.Visible = false;
+ menuitem_mode_selected_jumps_simple.Visible = false;
+ menuitem_mode_selected_jumps_reactive.Visible = false;
+ menuitem_mode_selected_runs_simple.Visible = false;
+ menuitem_mode_selected_runs_intervallic.Visible = false;
menuitem_mode_selected_power_gravitatory.Visible = false;
menuitem_mode_selected_power_inertial.Visible = false;
menuitem_mode_selected_other.Visible = false;
@@ -3081,23 +3051,49 @@ public partial class ChronoJumpWindow
menuitem_export_encoder_signal.Visible = false;
menuitem_export_csv.Visible = true;
- if(m == Constants.Menuitem_modes.JUMPS)
+ hbox_other.Visible = false;
+
+ if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
{
notebook_sup.CurrentPage = 0;
- notebook_sup_contacts.CurrentPage = 0;
- menuitem_mode_selected_jumps.Visible = true;
- radio_mode_jumps_small.Active = true;
notebook_capture_analyze.ShowTabs = true;
- notebook_capture_analyze.GetNthPage(2).Show(); //show jumpsProfile on jumps
- } else if(m == Constants.Menuitem_modes.RUNS)
+ if(m == Constants.Menuitem_modes.JUMPSSIMPLE)
+ {
+ menuitem_mode_selected_jumps_simple.Visible = true;
+ notebooks_change(0);
+ on_extra_window_jumps_test_changed(new object(), new EventArgs());
+ hbox_results_legend.Visible = true;
+ notebook_capture_analyze.GetNthPage(2).Show(); //show jumpsProfile on jumps
simple
+ } else
+ {
+ menuitem_mode_selected_jumps_reactive.Visible = true;
+ notebooks_change(1);
+ on_extra_window_jumps_rj_test_changed(new object(), new EventArgs());
+ hbox_results_legend.Visible = false;
+ notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on jumps
reactive
+ }
+ }
+ else if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
{
notebook_sup.CurrentPage = 0;
- notebook_sup_contacts.CurrentPage = 1;
- menuitem_mode_selected_runs.Visible = true;
- radio_mode_runs_small.Active = true;
notebook_capture_analyze.ShowTabs = true;
+ if(m == Constants.Menuitem_modes.RUNSSIMPLE)
+ {
+ menuitem_mode_selected_runs_simple.Visible = true;
+ notebooks_change(2);
+ on_extra_window_runs_test_changed(new object(), new EventArgs());
+ hbox_results_legend.Visible = true;
+ }
+ else
+ {
+ menuitem_mode_selected_runs_intervallic.Visible = true;
+ notebooks_change(3);
+ on_extra_window_runs_interval_test_changed(new object(), new EventArgs());
+ hbox_results_legend.Visible = false;
+ }
notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on runs
- } else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ }
+ else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
{
menuitem_encoder_session_overview.Visible = true;
menuitem_export_encoder_signal.Visible = true;
@@ -3169,9 +3165,10 @@ public partial class ChronoJumpWindow
if(changed) {
prepareAnalyzeRepetitions ();
}
- } else { //m == Constants.Menuitem_modes.OTHER (contacts / other)
+ }
+ else { //m == Constants.Menuitem_modes.OTHER (contacts / other)
notebook_sup.CurrentPage = 0;
- notebook_sup_contacts.CurrentPage = 2;
+ hbox_other.Visible = true;
menuitem_mode_selected_other.Visible = true;
radio_mode_reaction_times_small.Active = true;
@@ -3369,7 +3366,7 @@ public partial class ChronoJumpWindow
LogB.Information("change_multitest_firmware 3");
if(isChronopicAuto) {
int debounceChange = 50;
- if(m == Constants.Menuitem_modes.RUNS)
+ if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
debounceChange = 10;
int msChanged = chronopicWin.ChangeMultitestFirmware(debounceChange);
@@ -3387,10 +3384,14 @@ public partial class ChronoJumpWindow
private Constants.Menuitem_modes getMenuItemMode()
{
- if(radio_menuitem_mode_jumps.Active)
- return Constants.Menuitem_modes.JUMPS;
- else if(radio_menuitem_mode_runs.Active)
- return Constants.Menuitem_modes.RUNS;
+ if(radio_menuitem_mode_jumps_simple.Active)
+ return Constants.Menuitem_modes.JUMPSSIMPLE;
+ else if(radio_menuitem_mode_jumps_reactive.Active)
+ return Constants.Menuitem_modes.JUMPSREACTIVE;
+ else if(radio_menuitem_mode_runs_simple.Active)
+ return Constants.Menuitem_modes.RUNSSIMPLE;
+ else if(radio_menuitem_mode_runs_intervallic.Active)
+ return Constants.Menuitem_modes.RUNSINTERVALLIC;
else if(radio_menuitem_mode_power_gravitatory.Active)
return Constants.Menuitem_modes.POWERGRAVITATORY;
else if(radio_menuitem_mode_power_inertial.Active)
@@ -3409,21 +3410,35 @@ public partial class ChronoJumpWindow
select_menuitem_mode_toggled(getMenuItemMode());
}
- private void on_button_selector_start_jumps_clicked(object o, EventArgs args)
+ private void on_button_selector_start_jumps_simple_clicked(object o, EventArgs args)
{
- if(radio_menuitem_mode_jumps.Active) {
+ if(radio_menuitem_mode_jumps_simple.Active) {
//needed if people select again the same option
- select_menuitem_mode_toggled(Constants.Menuitem_modes.JUMPS);
+ select_menuitem_mode_toggled(Constants.Menuitem_modes.JUMPSSIMPLE);
}
else
- radio_menuitem_mode_jumps.Active = true;
+ radio_menuitem_mode_jumps_simple.Active = true;
+ }
+ private void on_button_selector_start_jumps_reactive_clicked(object o, EventArgs args)
+ {
+ if(radio_menuitem_mode_jumps_reactive.Active)
+ select_menuitem_mode_toggled(Constants.Menuitem_modes.JUMPSREACTIVE);
+ else
+ radio_menuitem_mode_jumps_reactive.Active = true;
+ }
+ private void on_button_selector_start_runs_simple_clicked(object o, EventArgs args)
+ {
+ if(radio_menuitem_mode_runs_simple.Active)
+ select_menuitem_mode_toggled(Constants.Menuitem_modes.RUNSSIMPLE);
+ else
+ radio_menuitem_mode_runs_simple.Active = true;
}
- private void on_button_selector_start_runs_clicked(object o, EventArgs args)
+ private void on_button_selector_start_runs_intervallic_clicked(object o, EventArgs args)
{
- if(radio_menuitem_mode_runs.Active)
- select_menuitem_mode_toggled(Constants.Menuitem_modes.RUNS);
+ if(radio_menuitem_mode_runs_intervallic.Active)
+ select_menuitem_mode_toggled(Constants.Menuitem_modes.RUNSINTERVALLIC);
else
- radio_menuitem_mode_runs.Active = true;
+ radio_menuitem_mode_runs_intervallic.Active = true;
}
private void on_button_selector_start_power_gravitatory_clicked(object o, EventArgs args)
{
@@ -3882,23 +3897,23 @@ public partial class ChronoJumpWindow
return;
}
- if(radio_mode_jumps_small.Active)
+ if(radio_menuitem_mode_jumps_simple.Active)
{
- LogB.Debug("radio_mode_jumps_small");
+ LogB.Debug("radio_menuitem_mode_jumps_simple");
on_normal_jump_activate(o, args);
}
- else if(radio_mode_jumps_reactive_small.Active)
+ else if(radio_menuitem_mode_jumps_reactive.Active)
{
- LogB.Debug("radio_mode_jumps_reactive_small");
+ LogB.Debug("radio_menuitem_mode_jumps_reactive");
on_rj_activate(o, args);
}
- else if(radio_mode_runs_small.Active) {
- LogB.Debug("radio_mode_runs_small");
+ else if(radio_menuitem_mode_runs_simple.Active) {
+ LogB.Debug("radio_menuitem_mode_runs_simple");
extra_window_runs_distance = (double) extra_window_runs_spinbutton_distance.Value;
on_normal_run_activate(o, args);
}
- else if(radio_mode_runs_intervallic_small.Active) {
+ else if(radio_menuitem_mode_runs_intervallic.Active) {
LogB.Debug("radio_mode_runs_i_small");
//RSA runs cannot be simulated because it's complicated to manage the countdown
event...
if(currentRunIntervalType.IsRSA && !chronopicWin.Connected) {
@@ -5186,17 +5201,17 @@ LogB.Debug("X");
try {
switch (currentEventType.Type) {
case EventType.Types.JUMP:
- if(lastJumpIsSimple && radio_mode_jumps_small.Active)
+ if(lastJumpIsSimple && radio_menuitem_mode_jumps_simple.Active)
PrepareJumpSimpleGraph(currentEventExecute.PrepareEventGraphJumpSimpleObject, false);
- else if (radio_mode_jumps_reactive_small.Active)
+ else if (radio_menuitem_mode_jumps_reactive.Active)
PrepareJumpReactiveGraph(
Util.GetLast(currentJumpRj.TvString),
Util.GetLast(currentJumpRj.TcString),
currentJumpRj.TvString,
currentJumpRj.TcString, preferences.volumeOn, repetitiveConditionsWin);
break;
case EventType.Types.RUN:
- if(lastRunIsSimple && radio_mode_runs_small.Active)
+ if(lastRunIsSimple && radio_menuitem_mode_runs_simple.Active)
PrepareRunSimpleGraph(currentEventExecute.PrepareEventGraphRunSimpleObject, false);
- else if(radio_mode_runs_intervallic_small.Active) {
+ else if(radio_menuitem_mode_runs_intervallic.Active) {
RunType runType =
SqliteRunIntervalType.SelectAndReturnRunIntervalType(currentRunInterval.Type, false);
double distanceTotal =
Util.GetRunITotalDistance(currentRunInterval.DistanceInterval,
runType.DistancesString,
currentRunInterval.Tracks);
@@ -6715,13 +6730,12 @@ LogB.Debug("X");
private void sensitiveGuiEventDoing () {
session_menuitem.Sensitive = false;
menuitem_mode.Sensitive = false;
- notebook_sup_contacts.Sensitive = false;
//jumpsProfile has Sqlite calls. Don't do them while jumping
//but don't unsensitive the notebook because user need to "finish" or cancel"
//notebook_capture_analyze.Sensitive = true;
notebook_capture_analyze.GetNthPage(1).Hide();
- if(radio_menuitem_mode_jumps.Active && radio_mode_jumps_small.Active)
+ if(radio_menuitem_mode_jumps_simple.Active)
notebook_capture_analyze.GetNthPage(2).Hide();
@@ -6757,13 +6771,12 @@ LogB.Debug("X");
session_menuitem.Sensitive = true;
menuitem_mode.Sensitive = true;
- notebook_sup_contacts.Sensitive = true;
//jumpsProfile has Sqlite calls. Don't do them while jumping
//but don't unsensitive the notebook because user need to "finish" or cancel"
//notebook_capture_analyze.Sensitive = true;
notebook_capture_analyze.GetNthPage(1).Show();
- if(radio_menuitem_mode_jumps.Active && radio_mode_jumps_small.Active)
+ if(radio_menuitem_mode_jumps_simple.Active)
notebook_capture_analyze.GetNthPage(2).Show();
help_menuitem.Sensitive = true;
@@ -6839,7 +6852,6 @@ LogB.Debug("X");
menuitem_mode.Sensitive = ! start;
help_menuitem.Sensitive = ! start;
frame_persons.Sensitive = ! start;
- notebook_sup_contacts.Sensitive = ! start;
hbox_jumps_test.Visible = ! start;
button_auto_start.Visible = ! start;
@@ -6847,7 +6859,7 @@ LogB.Debug("X");
hbox_jump_auto_controls.Visible = start;
notebook_capture_analyze.GetNthPage(1).Visible = ! start;
- if(radio_menuitem_mode_jumps.Active)
+ if(radio_menuitem_mode_jumps_simple.Active)
notebook_capture_analyze.GetNthPage(2).Visible = ! start;
//when start, put button delete_this_test as not sensitive
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 20dcaf3..1353255 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -561,11 +561,11 @@ public partial class ChronoJumpWindow
{
string [] str;
string testName;
- if(radio_mode_jumps_small.Active) {
+ if(radio_menuitem_mode_jumps_simple.Active) {
str = SqliteJump.SelectTestMaxStuff(currentPerson.UniqueID, currentJumpType);
testName = currentJumpType.Name;
}
- else if(radio_mode_runs_small.Active) {
+ else if(radio_menuitem_mode_runs_simple.Active) {
str = SqliteRun.SelectTestMaxStuff(currentPerson.UniqueID, currentRunType);
testName = currentRunType.Name;
} else
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index ddbd1fe..29782fe 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -174,9 +174,9 @@ public class PreferencesWindow {
PreferencesWindowBox = new PreferencesWindow ();
}
- if(menu_mode != Constants.Menuitem_modes.JUMPS)
+ if(menu_mode != Constants.Menuitem_modes.JUMPSSIMPLE && menu_mode !=
Constants.Menuitem_modes.JUMPSREACTIVE)
PreferencesWindowBox.notebook.GetNthPage(1).Hide();
- if(menu_mode != Constants.Menuitem_modes.RUNS)
+ if(menu_mode != Constants.Menuitem_modes.RUNSSIMPLE && menu_mode !=
Constants.Menuitem_modes.RUNSINTERVALLIC)
PreferencesWindowBox.notebook.GetNthPage(2).Hide();
if(menu_mode != Constants.Menuitem_modes.POWERGRAVITATORY && menu_mode !=
Constants.Menuitem_modes.POWERINERTIAL) {
PreferencesWindowBox.notebook.GetNthPage(3).Hide();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
