[chronojump] changing gui (cont)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] changing gui (cont)
- Date: Fri, 25 Mar 2011 09:24:19 +0000 (UTC)
commit c25d20ffb5e8742e90ecabe4baf770a4ab00d696
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 22 12:22:43 2011 +0100
changing gui (cont)
glade/chronojump.glade | 617 +++++++--------
images/multichronopic_menu.png | Bin 0 -> 429 bytes
images/pulse_menu.png | Bin 0 -> 331 bytes
images/reaction_time_menu.png | Bin 0 -> 275 bytes
images/stock_right.png | Bin 0 -> 519 bytes
images/stock_right_left.png | Bin 0 -> 640 bytes
images/stock_up.png | Bin 0 -> 498 bytes
images/stock_up_down.png | Bin 0 -> 704 bytes
images/svg/stock_menu_buttons.svg | 1638 +++++++++++++++++++++++++++++++++++++
src/Makefile.am | 7 +
src/constants.cs | 8 +
src/gui/chronojump.cs | 239 ++----
src/gui/event.cs | 24 +-
src/gui/jump.cs | 167 +++-
14 files changed, 2147 insertions(+), 553 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 5fe82e7..99b6815 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -17032,143 +17032,6 @@ by you</property>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menu_jumps">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Jump</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menu_jumps_menu">
- <child>
- <widget class="GtkMenuItem" id="menu_execute_repetitive_jumps1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Execute reactive jump</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="execute_repetitive_jumps1_menu">
- <child>
- <widget class="GtkMenuItem" id="rj_j">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump limited by Jumps</property>
- <property name="label" translatable="yes">RJ(j)</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="rj_t">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump limited by Time</property>
- <property name="label" translatable="yes">RJ(t)</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="rj_unlimited">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump unlimited (until finish button is clicked)</property>
- <property name="label" translatable="yes">RJ(unlimited)</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menuitem_hexagon">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Hexagon</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_rj_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador20">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="more_rj">
- <property name="label" translatable="yes">More reactive jumps</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_button_more_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_edit_selected_jump_rj">
- <property name="label" translatable="yes">Edit selected RJ jump</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_edit_selected_jump_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image24">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_repair_selected_jump_rj">
- <property name="label" translatable="yes">Repair selected RJ jump</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_repair_selected_jump_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image25">
- <property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_delete_selected_jump_rj">
- <property name="label" translatable="yes">Delete selected RJ jump</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_delete_selected_jump_rj_clicked"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image22">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separador2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_jump_type_delete_reactive">
- <property name="label" translatable="yes">Delete reactive jump type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_jump_type_delete_reactive_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
<widget class="GtkMenuItem" id="menu_runs">
<property name="visible">True</property>
<property name="label" translatable="yes">_Run</property>
@@ -18115,7 +17978,6 @@ by you</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
- <property name="layout_style">spread</property>
<child>
<widget class="GtkRadioButton" id="radio_mode_jumps">
<property name="visible">True</property>
@@ -18423,11 +18285,11 @@ Chronopic</property>
<child>
<widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkNotebook" id="notebook_execute">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<widget class="GtkFrame" id="frame2">
@@ -18451,7 +18313,6 @@ Chronopic</property>
<property name="visible">True</property>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_free">
- <property name="label" translatable="yes">Free</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18460,6 +18321,12 @@ Chronopic</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_free">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Free</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18469,7 +18336,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_sj">
- <property name="label" translatable="yes">SJ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18478,6 +18344,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_sj">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">SJ</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18487,7 +18359,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_sjl">
- <property name="label" translatable="yes">SJl</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18496,6 +18367,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_sjl">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">SJl</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18505,7 +18382,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_cmj">
- <property name="label" translatable="yes">CMJ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18514,6 +18390,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_cmj">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">CMJ</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18523,7 +18405,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_cmjl">
- <property name="label" translatable="yes">CMJl</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18532,6 +18413,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_cmjl">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">CMJl</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18541,7 +18428,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_abk">
- <property name="label" translatable="yes">ABK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18550,6 +18436,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_abk">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">ABK</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18559,7 +18451,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_dj">
- <property name="label" translatable="yes">DJ</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18568,6 +18459,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_dj">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">DJ</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18577,7 +18474,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_rocket">
- <property name="label" translatable="yes">Rocket</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18586,6 +18482,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_rocket">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Rocket</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18595,7 +18497,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_takeoff">
- <property name="label" translatable="yes">TakeOff</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18604,6 +18505,12 @@ Chronopic</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
<signal name="toggled" handler="on_extra_window_jumps_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_takeoff">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">TakeOff</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18613,7 +18520,6 @@ Chronopic</property>
</child>
<child>
<widget class="GtkRadioButton" id="extra_window_radio_jump_more">
- <property name="label" translatable="yes">More jumps</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -18621,7 +18527,13 @@ Chronopic</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
<property name="group">extra_window_radio_jump_free</property>
- <signal name="clicked" handler="on_extra_window_jumps_test_changed"/>
+ <signal name="clicked" handler="on_extra_window_jumps_more"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_jump_more">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">More jumps</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18646,7 +18558,7 @@ Chronopic</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Add jump type</property>
- <signal name="clicked" handler="on_jump_type_add_activate"/>
+ <signal name="clicked" handler="on_jump_type_add_clicked"/>
<child>
<widget class="GtkImage" id="image3210">
<property name="visible">True</property>
@@ -18667,7 +18579,7 @@ Chronopic</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Delete jump type</property>
- <signal name="clicked" handler="on_jump_type_delete_simple_clicked"/>
+ <signal name="clicked" handler="on_jump_type_delete_simple"/>
<child>
<widget class="GtkImage" id="image5">
<property name="visible">True</property>
@@ -18743,7 +18655,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 1</property>
+ <property name="label" translatable="yes">1</property>
</widget>
<packing>
<property name="tab_fill">False</property>
@@ -18751,227 +18663,272 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_jumps_rj">
+ <widget class="GtkFrame" id="frame4">
<property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkButton" id="button_rj_j">
- <property name="label">RJ(j)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump limited by Jumps</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_rj_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </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_rj_t">
- <property name="label">RJ(t)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump limited by Time</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_rj_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_rj_unlimited">
- <property name="label" translatable="yes">Unlimited</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Reactive Jump unlimited (until finish button is clicked)</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_rj_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_rj_hexagon">
- <property name="label" translatable="yes">Hexagon</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_rj_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="left_padding">6</property>
<child>
- <widget class="GtkTable" id="table1">
+ <widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<child>
- <widget class="GtkButton" id="button_rj_last">
+ <widget class="GtkHBox" id="hbox_jumps_rj">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Repeat last</property>
- <signal name="clicked" handler="on_button_last_rj_clicked"/>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image3170">
+ <widget class="GtkHBox" id="hbox 1">
<property name="visible">True</property>
- <property name="stock">gtk-redo</property>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_rj_j">
+ <property name="label" translatable="yes">RJ(j)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Simple jump with no special technique</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_rj_t">
+ <property name="label" translatable="yes">RJ(t)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Squat Jump</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_jump_rj_j</property>
+ <signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_rj_unlimited">
+ <property name="label" translatable="yes">Unlimited</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Squat Jump with extra weight</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_jump_rj_j</property>
+ <signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_rj_hexagon">
+ <property name="label" translatable="yes">Hexagon</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">CounterMovement Jump</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_jump_rj_j</property>
+ <signal name="toggled" handler="on_extra_window_jumps_rj_test_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_jump_rj_more">
+ <property name="label" translatable="yes">More jumps</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">More simple jumps</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_jump_rj_j</property>
+ <signal name="clicked" handler="on_extra_window_jumps_rj_more"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</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="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_rj_bells">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Bells</property>
- <signal name="clicked" handler="on_button_rj_bells_clicked"/>
<child>
- <widget class="GtkAlignment" id="alignment81">
+ <widget class="GtkHBox" id="hbox12">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox169">
+ <widget class="GtkButton" id="button1">
<property name="visible">True</property>
- <property name="spacing">2</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Add jump type</property>
+ <signal name="clicked" handler="on_jump_type_add_clicked"/>
<child>
- <widget class="GtkImage" id="image_jump_reactive_bell">
+ <widget class="GtkImage" id="image1">
<property name="visible">True</property>
+ <property name="stock">gtk-new</property>
</widget>
- <packing>
- <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="GtkButton" id="button_rj_bells">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Bells</property>
+ <signal name="clicked" handler="on_button_rj_bells_clicked"/>
<child>
- <widget class="GtkLabel" id="label374">
+ <widget class="GtkAlignment" id="alignment81">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox169">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image_jump_reactive_bell">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label374">
<property name="visible">True</property>
<property name="use_underline">True</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_jump_type_delete_reactive">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Delete jump type</property>
+ <signal name="clicked" handler="on_jump_type_delete_reactive"/>
+ <child>
+ <widget class="GtkImage" id="image13">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ </widget>
+ </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">1</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button21">
+ <widget class="GtkHBox" id="hbox19">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Add jump type</property>
- <signal name="clicked" handler="on_jump_type_add_activate"/>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkImage" id="image3211">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <property name="label" translatable="yes">Selected:</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_rj_more">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">More reactive jumps</property>
- <signal name="clicked" handler="on_button_more_rj_clicked"/>
<child>
- <widget class="GtkAlignment" id="alignment125">
+ <widget class="GtkLabel" id="extra_window_jumps_rj_label_selected">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox273">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image3169">
- <property name="visible">True</property>
- <property name="stock">gtk-add</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="label527">
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="label" translatable="yes">the selected test</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Select test</b></property>
+ <property name="use_markup">True</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
@@ -18982,7 +18939,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 2</property>
+ <property name="label" translatable="yes">2</property>
</widget>
<packing>
<property name="position">1</property>
@@ -19341,7 +19298,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 3</property>
+ <property name="label" translatable="yes">3</property>
</widget>
<packing>
<property name="position">2</property>
@@ -19554,7 +19511,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 4</property>
+ <property name="label" translatable="yes">4</property>
</widget>
<packing>
<property name="position">3</property>
@@ -19594,7 +19551,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 5</property>
+ <property name="label" translatable="yes">5</property>
</widget>
<packing>
<property name="position">4</property>
@@ -19649,7 +19606,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 6</property>
+ <property name="label" translatable="yes">6</property>
</widget>
<packing>
<property name="position">5</property>
@@ -19818,7 +19775,7 @@ Chronopic</property>
<child>
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes">page 7</property>
+ <property name="label" translatable="yes">7</property>
</widget>
<packing>
<property name="position">6</property>
diff --git a/images/multichronopic_menu.png b/images/multichronopic_menu.png
new file mode 100644
index 0000000..4439943
Binary files /dev/null and b/images/multichronopic_menu.png differ
diff --git a/images/pulse_menu.png b/images/pulse_menu.png
new file mode 100644
index 0000000..4aba04e
Binary files /dev/null and b/images/pulse_menu.png differ
diff --git a/images/reaction_time_menu.png b/images/reaction_time_menu.png
new file mode 100644
index 0000000..16e6987
Binary files /dev/null and b/images/reaction_time_menu.png differ
diff --git a/images/stock_right.png b/images/stock_right.png
new file mode 100644
index 0000000..db93b87
Binary files /dev/null and b/images/stock_right.png differ
diff --git a/images/stock_right_left.png b/images/stock_right_left.png
new file mode 100644
index 0000000..c6489a5
Binary files /dev/null and b/images/stock_right_left.png differ
diff --git a/images/stock_up.png b/images/stock_up.png
new file mode 100644
index 0000000..46d1786
Binary files /dev/null and b/images/stock_up.png differ
diff --git a/images/stock_up_down.png b/images/stock_up_down.png
new file mode 100644
index 0000000..eb74704
Binary files /dev/null and b/images/stock_up_down.png differ
diff --git a/images/svg/stock_menu_buttons.svg b/images/svg/stock_menu_buttons.svg
new file mode 100644
index 0000000..97e193a
--- /dev/null
+++ b/images/svg/stock_menu_buttons.svg
@@ -0,0 +1,1638 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg2504"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="stock_menu_buttons.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.1"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/stock_left.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.1541139"
+ inkscape:cx="2.9156118"
+ inkscape:cy="-50.344529"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1024"
+ inkscape:window-height="719"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true">
+ <sodipodi:guide
+ id="guide2996"
+ position="14.517203,11.487624"
+ orientation="0,1" />
+ <sodipodi:guide
+ id="guide2998"
+ position="10.226238,4.5049505"
+ orientation="0,1" />
+ </sodipodi:namedview>
+ <defs
+ id="defs2506">
+ <linearGradient
+ id="linearGradient5105-262-943-861"
+ inkscape:collect="always">
+ <stop
+ style="stop-color:#0d0d0d;stop-opacity:1;"
+ id="stop2487"
+ offset="0" />
+ <stop
+ style="stop-color:#0d0d0d;stop-opacity:0;"
+ id="stop2489"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ r="8.0625"
+ fy="19.03125"
+ fx="11.25"
+ cy="19.03125"
+ cx="11.25"
+ gradientTransform="matrix(1,0,0,0.282946,0,13.64644)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient2502"
+ xlink:href="#linearGradient5105-262-943-861"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264">
+ <stop
+ id="stop2266"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="9.0036469"
+ x2="28.314739"
+ y1="29.353853"
+ x1="28.314739"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-0.08586976,15.486281)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2510"
+ xlink:href="#linearGradient2264"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222"
+ inkscape:collect="always">
+ <stop
+ id="stop4224"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="3.9534953"
+ x2="22.495962"
+ y1="35.078724"
+ x1="22.495962"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,16.332316,17.508315)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2506"
+ xlink:href="#linearGradient4222"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="3.9534953"
+ x2="22.495962"
+ y1="35.078724"
+ x1="22.495962"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,15.332392,1.9039009)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2506-5"
+ xlink:href="#linearGradient4222-6"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222-6"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-6"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-4"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="9.0036469"
+ x2="28.314739"
+ y1="29.353853"
+ x1="28.314739"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-0.08586976,15.486281)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2510-0"
+ xlink:href="#linearGradient2264-0"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-0">
+ <stop
+ id="stop2266-4"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-6"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-0"
+ id="linearGradient3028"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-1.085794,-0.11813313)"
+ x1="28.314739"
+ y1="29.353853"
+ x2="28.314739"
+ y2="9.0036469" />
+ <linearGradient
+ y2="3.9534953"
+ x2="22.495962"
+ y1="35.078724"
+ x1="22.495962"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,14.270868,-13.14416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2506-7"
+ xlink:href="#linearGradient4222-5"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222-5"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-69"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-8"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="9.0036469"
+ x2="28.314739"
+ y1="29.353853"
+ x1="28.314739"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-0.08586976,15.486281)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2510-7"
+ xlink:href="#linearGradient2264-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-2">
+ <stop
+ id="stop2266-8"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-2"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-2"
+ id="linearGradient3028-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-2.1473177,-15.166194)"
+ x1="28.314739"
+ y1="29.353853"
+ x2="28.314739"
+ y2="9.0036469" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-2-858"
+ id="linearGradient3028-9-134"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-2.1473177,-15.166194)"
+ x1="28.314739"
+ y1="29.353853"
+ x2="28.314739"
+ y2="9.0036469" />
+ <linearGradient
+ id="linearGradient2264-2-858">
+ <stop
+ id="stop3118"
+ offset="0"
+ style="stop-color:#a7a7a7;stop-opacity:1;" />
+ <stop
+ id="stop3120"
+ offset="1"
+ style="stop-color:#6a6a6a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="3.9534953"
+ x2="22.495962"
+ y1="35.078724"
+ x1="22.495962"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,14.270868,-13.14416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2506-7-624"
+ xlink:href="#linearGradient4222-5-834"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222-5-834"
+ inkscape:collect="always">
+ <stop
+ id="stop3124"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop3126"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-0-540"
+ id="linearGradient3028-883"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-1.085794,-0.11813313)"
+ x1="28.314739"
+ y1="29.353853"
+ x2="28.314739"
+ y2="9.0036469" />
+ <linearGradient
+ id="linearGradient2264-0-540">
+ <stop
+ id="stop3233"
+ offset="0"
+ style="stop-color:#a7a7a7;stop-opacity:1;" />
+ <stop
+ id="stop3235"
+ offset="1"
+ style="stop-color:#6a6a6a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="3.9534953"
+ x2="22.495962"
+ y1="35.078724"
+ x1="22.495962"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,15.332392,1.9039009)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2506-5-552"
+ xlink:href="#linearGradient4222-6-789"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222-6-789"
+ inkscape:collect="always">
+ <stop
+ id="stop3239"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop3241"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-0-540-79"
+ id="linearGradient3028-883-949"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.319447,0,0,-0.313352,-1.085794,-0.11813313)"
+ x1="28.314739"
+ y1="29.353853"
+ x2="28.314739"
+ y2="9.0036469" />
+ <linearGradient
+ id="linearGradient2264-0-540-79">
+ <stop
+ id="stop3361"
+ offset="0"
+ style="stop-color:#585858;stop-opacity:1;" />
+ <stop
+ id="stop3363"
+ offset="1"
+ style="stop-color:#959595;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="3.9534953"
+ x2="22.495962"
+ y1="35.078724"
+ x1="22.495962"
+ gradientTransform="matrix(-0.3704967,0,0,-0.3617496,15.332392,1.9039009)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2506-5-552-302"
+ xlink:href="#linearGradient4222-6-789-820"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222-6-789-820"
+ inkscape:collect="always">
+ <stop
+ id="stop3367"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop3369"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264"
+ id="linearGradient3838"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-5"
+ id="linearGradient3838-8"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2264-5">
+ <stop
+ id="stop2266-7"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-8"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-7"
+ id="linearGradient3838-82"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2264-7">
+ <stop
+ id="stop2266-3"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-5"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222"
+ id="linearGradient3918"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3"
+ id="linearGradient3838-2"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2264-3">
+ <stop
+ id="stop2266-32"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-7"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4"
+ id="linearGradient3918-2"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4222-4"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-5"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-41"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3947"
+ xlink:href="#linearGradient4222-4"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264"
+ id="linearGradient3988"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-54"
+ id="linearGradient3988-0"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient2264-54">
+ <stop
+ id="stop2266-31"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-9"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-54"
+ id="linearGradient4006"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient4008">
+ <stop
+ id="stop4010"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4012"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-54"
+ id="linearGradient4014"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient4016">
+ <stop
+ id="stop4018"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4020"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(75.55115,20.292972)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4025"
+ xlink:href="#linearGradient2264-54"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(75.55115,20.292972)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4025-9"
+ xlink:href="#linearGradient2264-54-5"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-54-5">
+ <stop
+ id="stop2266-31-8"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-9-3"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(75.55115,20.292972)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4078"
+ xlink:href="#linearGradient2264-54-5"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4080">
+ <stop
+ id="stop4082"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4084"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(75.55115,20.292972)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4086"
+ xlink:href="#linearGradient2264-54-5"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4088">
+ <stop
+ id="stop4090"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4092"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(71.521923,53.623919)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4097"
+ xlink:href="#linearGradient2264-54-5"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-54-5"
+ id="linearGradient4136"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(79.288154,49.896128)"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264"
+ id="linearGradient4162"
+ x1="20.877542"
+ y1="94.517662"
+ x2="41.937435"
+ y2="94.517662"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0464749,0,0,0.94851391,-0.97028116,4.8025132)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-4"
+ id="linearGradient4162-6"
+ x1="20.877542"
+ y1="94.517662"
+ x2="41.937435"
+ y2="94.517662"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0464749,0,0,0.94851391,-0.97028116,4.8025132)" />
+ <linearGradient
+ id="linearGradient2264-4">
+ <stop
+ id="stop2266-5"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-3"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-0.91087476,60.142592)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4179"
+ xlink:href="#linearGradient2264-4"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-0.91087476,60.142592)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4179-0"
+ xlink:href="#linearGradient2264-4-6"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-4-6">
+ <stop
+ id="stop2266-5-6"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-3-2"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-2.716314,57.705249)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4213"
+ xlink:href="#linearGradient2264-4-6"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-0.91087476,60.142592)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4179-7"
+ xlink:href="#linearGradient2264-4-67"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-4-67">
+ <stop
+ id="stop2266-5-5"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-3-1"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-2.2348635,55.541559)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4213-3"
+ xlink:href="#linearGradient2264-4-67"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-0.91087476,60.142592)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4179-9"
+ xlink:href="#linearGradient2264-4-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-4-2">
+ <stop
+ id="stop2266-5-0"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-3-0"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="94.517662"
+ x2="41.937435"
+ y1="94.517662"
+ x1="20.877542"
+ gradientTransform="matrix(1.0464749,0,0,0.4170559,-3.7393962,53.615758)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4213-0"
+ xlink:href="#linearGradient2264-4-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-5"
+ id="linearGradient3838-2-4"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2264-3-5">
+ <stop
+ id="stop2266-32-0"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-7-4"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3947-0"
+ xlink:href="#linearGradient4222-4-3"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4222-4-3"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-5-7"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-41-7"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4287"
+ xlink:href="#linearGradient4222-4-3"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-5"
+ id="linearGradient4328"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-3"
+ id="linearGradient4330"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-5-3"
+ id="linearGradient4328-8"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient2264-3-5-3">
+ <stop
+ id="stop2266-32-0-0"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-7-4-0"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-3-9"
+ id="linearGradient4330-2"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient4222-4-3-9"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-5-7-6"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-41-7-5"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4353"
+ xlink:href="#linearGradient4222-4-3-9"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-5-5"
+ id="linearGradient4328-0"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient2264-3-5-5">
+ <stop
+ id="stop2266-32-0-07"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-7-4-2"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-3-4"
+ id="linearGradient4330-8"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient4222-4-3-4"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-5-7-2"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-41-7-57"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4353-3"
+ xlink:href="#linearGradient4222-4-3-4"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-3-5-9"
+ id="linearGradient4328-1"
+ gradientUnits="userSpaceOnUse"
+ x1="-24.920794"
+ y1="0.052475106"
+ x2="-12.380199"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient2264-3-5-9">
+ <stop
+ id="stop2266-32-0-9"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-7-4-7"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-3-96"
+ id="linearGradient4330-0"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ id="linearGradient4222-4-3-96"
+ inkscape:collect="always">
+ <stop
+ id="stop4224-5-7-62"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop4226-41-7-8"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ y2="0.052475106"
+ x2="-18.317699"
+ y1="0.052475106"
+ x1="-18.983294"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4353-8"
+ xlink:href="#linearGradient4222-4-3-96"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-3-4"
+ id="linearGradient4450"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4222-4-3-96"
+ id="linearGradient4452"
+ gradientUnits="userSpaceOnUse"
+ x1="-18.983294"
+ y1="0.052475106"
+ x2="-18.317699"
+ y2="0.052475106" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-54-5-0"
+ id="linearGradient4136-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(79.288154,49.896128)"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376" />
+ <linearGradient
+ id="linearGradient2264-54-5-0">
+ <stop
+ id="stop2266-31-8-9"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-9-3-2"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-54-5-0"
+ id="linearGradient4468"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(79.288154,49.896128)"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376" />
+ <linearGradient
+ id="linearGradient4470">
+ <stop
+ id="stop4472"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4474"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(64.369258,88.522931)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4478"
+ xlink:href="#linearGradient2264-54-5-0"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-9"
+ id="linearGradient3988-6"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient2264-9">
+ <stop
+ id="stop2266-1"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-34"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-9"
+ id="linearGradient4531"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient4533">
+ <stop
+ id="stop4535"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4537"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-9"
+ id="linearGradient4539"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient4541">
+ <stop
+ id="stop4543"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4545"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(38.422634,99.140591)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4550"
+ xlink:href="#linearGradient2264-9"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-0"
+ id="linearGradient3981"
+ x1="12.924902"
+ y1="77.72982"
+ x2="42.987404"
+ y2="77.72982"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264"
+ id="linearGradient3989"
+ x1="12.924902"
+ y1="77.72982"
+ x2="42.987404"
+ y2="77.72982"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-03"
+ id="linearGradient3989-5"
+ x1="12.924902"
+ y1="77.72982"
+ x2="42.987404"
+ y2="77.72982"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2264-03">
+ <stop
+ id="stop2266-6"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-1"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-03"
+ id="linearGradient3221"
+ x1="12.924902"
+ y1="77.72982"
+ x2="42.987404"
+ y2="77.72982"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3223">
+ <stop
+ id="stop3225"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop3227"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="translate(-42.399665,-2.5114147)"
+ y2="77.72982"
+ x2="42.987404"
+ y1="77.72982"
+ x1="12.924902"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3231"
+ xlink:href="#linearGradient2264-03"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(38.422634,99.140591)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4550-9"
+ xlink:href="#linearGradient2264-9-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient2264-9-2">
+ <stop
+ id="stop2266-1-2"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-34-4"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(38.422634,99.140591)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4042"
+ xlink:href="#linearGradient2264-9-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4044">
+ <stop
+ id="stop4046"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4048"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(13.976135,97.21628)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4052"
+ xlink:href="#linearGradient2264-9-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-48"
+ id="linearGradient3988-5"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient2264-48">
+ <stop
+ id="stop2266-12"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop2268-89"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-48"
+ id="linearGradient4095"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient4097-3">
+ <stop
+ id="stop4099"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4101"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2264-48"
+ id="linearGradient4103"
+ x1="-26.924442"
+ y1="16.760376"
+ x2="-22.959599"
+ y2="16.760376"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(53.276347,28.579731)" />
+ <linearGradient
+ id="linearGradient4105">
+ <stop
+ id="stop4107"
+ offset="0"
+ style="stop-color:#d7e866;stop-opacity:1;" />
+ <stop
+ id="stop4109"
+ offset="1"
+ style="stop-color:#8cab2a;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ y2="16.760376"
+ x2="-22.959599"
+ y1="16.760376"
+ x1="-26.924442"
+ gradientTransform="translate(24.219845,23.552871)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4114"
+ xlink:href="#linearGradient2264-48"
+ inkscape:collect="always" />
+ </defs>
+ <metadata
+ id="metadata2509">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ inkscape:label="Layer 1"
+ id="layer1">
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc"
+ style="fill:url(#linearGradient2510);fill-opacity:1;fill-rule:nonzero;stroke:#699536;stroke-width:0.998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="M 7.5000002,14.176046 0.49914724,7.9844847 7.5000002,1.8239536 l 0,2.6760464 8.0168178,0.012376 0,6.982674 L 7.5000002,11.5 z"
+ id="path3288" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc"
+ style="opacity:0.35400002000000003;fill:none;stroke:url(#linearGradient2506);stroke-width:0.998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="M 6.5002622,11.926403 1.9551472,8 6.5002622,3.9630618 6.5002622,5.5 14.504965,5.5112624 14.48244,10.5 l -7.9821778,0 z"
+ id="path3290" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc"
+ style="fill:url(#linearGradient3028-883-949);fill-opacity:1;fill-rule:nonzero;stroke:#9a9a9a;stroke-width:0.99829447;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="M 6.5000759,-1.4283681 -0.500777,-7.61993 l 7.0008529,-6.160531 0,2.676046 8.0168181,0.01238 0,6.9826747 -8.0168181,0.0049 z"
+ id="path3288-2" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc"
+ style="opacity:0.35400002;fill:none;stroke:url(#linearGradient2506-5-552-302);stroke-width:0.99829447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="m 5.5003379,-3.6780113 -4.545115,-3.9264034 4.545115,-4.0369383 0,1.536938 8.0047031,0.01126 -0.02252,4.9887379 -7.9821781,0 z"
+ id="path3290-6" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc"
+ style="fill:url(#linearGradient3028-9-134);fill-opacity:1;fill-rule:nonzero;stroke:#656565;stroke-width:0.99829447;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="m 5.4385523,-16.476429 -7.000853,-6.191561 7.000853,-6.160532 0,2.676047 8.0168177,0.01238 0,6.982674 -8.0168177,0.0049 z"
+ id="path3288-9" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccc"
+ style="opacity:0.35400002;fill:none;stroke:url(#linearGradient2506-7-624);stroke-width:0.99829447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="m 4.4388143,-18.726072 -4.54511502,-3.926403 4.54511502,-4.036938 0,1.536938 8.0047027,0.01126 -0.02252,4.988737 -7.9821777,0 z"
+ id="path3290-60" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#c92331;fill-opacity:1;stroke:#30726a;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path3044"
+ sodipodi:cx="-18.650496"
+ sodipodi:cy="0.052475106"
+ sodipodi:rx="0.27029702"
+ sodipodi:ry="0.27029702"
+ d="m -18.380199,0.05247511 a 0.27029702,0.27029702 0 1 1 -0.540594,0 0.27029702,0.27029702 0 1 1 0.540594,0 z"
+ transform="translate(0.18019802,-10.181188)" />
+ <g
+ id="g3920"
+ transform="translate(2.8890513,0.24414518)">
+ <path
+ transform="matrix(11.669177,0,0,11.669177,178.42532,-6.0500228)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5"
+ style="fill:url(#linearGradient3838);fill-opacity:1;stroke:#699536;stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(8.5180693,0,0,8.5180693,119.63005,-5.880899)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3"
+ style="fill:none;stroke:url(#linearGradient3918);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -34.38378,-13.500876 0,12.166568"
+ id="path3924"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g3920-6"
+ transform="translate(-14.996933,91.588597)"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/pulse.png"
+ inkscape:export-xdpi="188.04115"
+ inkscape:export-ydpi="188.04115">
+ <path
+ transform="matrix(11.669177,0,0,11.669177,178.42532,-6.0500228)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-8"
+ style="fill:url(#linearGradient3838-2);fill-opacity:1;stroke:#699536;stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(8.5180693,0,0,8.5180693,119.63005,-5.880899)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3-0"
+ style="fill:none;stroke:url(#linearGradient3947);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3988);fill-opacity:1;stroke:#699536;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="20.316748"
+ y="59.920185"
+ id="text3978"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/reaction_time_menu.png"
+ inkscape:export-xdpi="47.74511"
+ inkscape:export-ydpi="47.74511"><tspan
+ sodipodi:role="line"
+ id="tspan3980"
+ x="20.316748"
+ y="59.920185"
+ style="fill:url(#linearGradient3988);fill-opacity:1;stroke:#699536;stroke-opacity:1">!<tspan
+ style="font-size:10px"
+ id="tspan3990" /></tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4025);fill-opacity:1;stroke:#699536;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="42.591553"
+ y="51.633423"
+ id="text3978-8"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3980-7"
+ x="42.591553"
+ y="51.633423"
+ style="fill:url(#linearGradient4025);fill-opacity:1;stroke:#699536;stroke-opacity:1"><tspan
+ style="font-size:10px;fill:url(#linearGradient4025)"
+ id="tspan3990-7">reaction time</tspan></tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4136);fill-opacity:1;stroke:#699536;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="46.328556"
+ y="81.23658"
+ id="text3978-8-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3980-7-1"
+ x="46.328556"
+ y="81.23658"
+ style="font-size:10px;fill:url(#linearGradient4136);fill-opacity:1;stroke:#699536;stroke-opacity:1">pulse</tspan></text>
+ <g
+ id="g4507"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/multichronopic_menu.png"
+ inkscape:export-xdpi="64.629997"
+ inkscape:export-ydpi="64.629997"
+ transform="translate(-10.351185,55.126076)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4138-5"
+ d="m 22.234356,99.561743 19.443834,0"
+ style="fill:none;stroke:url(#linearGradient4179);stroke-width:1.63809645;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4138-5-7"
+ d="m 20.428917,97.124401 19.443834,0"
+ style="fill:none;stroke:url(#linearGradient4213);stroke-width:1.63809645;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4138-5-2"
+ d="m 20.910367,94.960711 19.443834,0"
+ style="fill:none;stroke:url(#linearGradient4213-3);stroke-width:1.63809645;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4138-5-8"
+ d="m 19.405835,93.034909 19.443833,0"
+ style="fill:none;stroke:url(#linearGradient4213-0);stroke-width:1.63809645;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ transform="matrix(6.4137657,0,0,6.4137657,143.43246,92.698346)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3-0-7"
+ style="fill:none;stroke:url(#linearGradient4330);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(6.4137657,0,0,6.4137657,153.9642,94.624148)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3-0-7-7"
+ style="fill:none;stroke:url(#linearGradient4353);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(6.4137657,0,0,6.4137657,148.00625,96.787838)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3-0-7-1"
+ style="fill:none;stroke:url(#linearGradient4450);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(6.4137657,0,0,6.4137657,153.03344,99.22518)"
+ d="m -18.380199,0.05247511 c 0,0.14928092 -0.121016,0.27029702 -0.270297,0.27029702 -0.14928,0 -0.270297,-0.1210161 -0.270297,-0.27029702 0,-0.14928093 0.121017,-0.27029702 0.270297,-0.27029702 0.149281,0 0.270297,0.12101609 0.270297,0.27029702 z"
+ sodipodi:ry="0.27029702"
+ sodipodi:rx="0.27029702"
+ sodipodi:cy="0.052475106"
+ sodipodi:cx="-18.650496"
+ id="path3044-5-3-0-7-5"
+ style="fill:none;stroke:url(#linearGradient4452);stroke-width:0.08569585;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4478);fill-opacity:1;stroke:#699536;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="31.409658"
+ y="119.86338"
+ id="text3978-8-3-9"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3980-7-1-3"
+ x="31.409658"
+ y="119.86338"
+ style="font-size:10px;fill:url(#linearGradient4478);fill-opacity:1;stroke:#699536;stroke-opacity:1">multichronopic</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4550);fill-opacity:1;stroke:#699536;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="5.4630342"
+ y="130.48105"
+ id="text3978-9"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/reaction_time_menu.png"
+ inkscape:export-xdpi="47.74511"
+ inkscape:export-ydpi="47.74511"><tspan
+ sodipodi:role="line"
+ id="tspan3980-8"
+ x="5.4630342"
+ y="130.48105"
+ style="fill:url(#linearGradient4550);fill-opacity:1;stroke:#699536;stroke-opacity:1">}</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3989);fill-opacity:1;stroke:#699536;font-family:Bitstream Vera Sans;stroke-opacity:1"
+ x="9.1475582"
+ y="92.309898"
+ id="text3203"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/pulse_menu.png"
+ inkscape:export-xdpi="47.74511"
+ inkscape:export-ydpi="47.74511"><tspan
+ sodipodi:role="line"
+ id="tspan3205"
+ x="9.1475582"
+ y="92.309898"
+ style="stroke:#699536;fill-opacity:1;fill:url(#linearGradient3989);stroke-opacity:1">..I</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3231);fill-opacity:1;stroke:#ffffff;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="-33.252106"
+ y="89.798477"
+ id="text3203-0"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/pulse_white_menu.png"
+ inkscape:export-xdpi="47.74511"
+ inkscape:export-ydpi="47.74511"><tspan
+ sodipodi:role="line"
+ id="tspan3205-6"
+ x="-33.252106"
+ y="89.798477"
+ style="fill:url(#linearGradient3231);fill-opacity:1;stroke:#ffffff;stroke-opacity:1">..I</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4052);fill-opacity:1;stroke:#ffffff;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="-18.983465"
+ y="128.55675"
+ id="text3978-9-7"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/multichronopic_white_menu.png"
+ inkscape:export-xdpi="37.980629"
+ inkscape:export-ydpi="37.980629"><tspan
+ sodipodi:role="line"
+ id="tspan3980-8-7"
+ x="-18.983465"
+ y="128.55675"
+ style="fill:url(#linearGradient4052);fill-opacity:1;stroke:#ffffff;stroke-opacity:1">}</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4114);fill-opacity:1;stroke:#ffffff;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="-8.7397547"
+ y="54.893326"
+ id="text3978-6"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/reaction_time_white_menu.png"
+ inkscape:export-xdpi="47.74511"
+ inkscape:export-ydpi="47.74511"><tspan
+ sodipodi:role="line"
+ id="tspan3980-80"
+ x="-8.7397547"
+ y="54.893326"
+ style="fill:url(#linearGradient4114);fill-opacity:1;stroke:#ffffff;stroke-opacity:1">!<tspan
+ style="font-size:10px;fill:url(#linearGradient4114);stroke:#ffffff;stroke-opacity:1"
+ id="tspan3990-2" /></tspan></text>
+ </g>
+</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2bb7c69..34f96f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -309,6 +309,13 @@ RESOURCES = \
../images/stock_delete.png,stock_delete.png \
../images/chronojump_icon.png,chronojump_icon.png \
../images/chronojump_icon_graph.png,chronojump_icon_graph.png \
+ ../images/stock_right.png,stock_right.png \
+ ../images/stock_right_left.png,stock_right_left.png \
+ ../images/stock_up.png,stock_up.png \
+ ../images/stock_up_down.png,stock_up_down.png \
+ ../images/reaction_time_menu.png,reaction_time_menu.png \
+ ../images/pulse_menu.png,pulse_menu.png \
+ ../images/multichronopic_menu.png,multichronopic_menu.png \
../images/gtk-zoom-fit.png,gtk-zoom-fit.png \
../images/gtk-zoom-in.png,gtk-zoom-in.png \
../images/gtk-zoom-in-with-text.png,gtk-zoom-in-with-text.png \
diff --git a/src/constants.cs b/src/constants.cs
index 032c1d9..c0c0ba8 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -276,6 +276,14 @@ public class Constants
//public static string FileNameZoomOutIcon = "gtk-zoom-out.png";
public static string FileNameZoomInIcon = "gtk-zoom-in.png";
public static string FileNameZoomInWithTextIcon = "gtk-zoom-in-with-text.png";
+
+ public static string FileNameJumps = "stock_up.png";
+ public static string FileNameJumpsRJ = "stock_up_down.png";
+ public static string FileNameRuns = "stock_right.png";
+ public static string FileNameRunsInterval = "stock_right_left.png";
+ public static string FileNameReactionTime = "reaction_time_menu.png";
+ public static string FileNamePulse = "pulse_menu.png";
+ public static string FileNameMultiChronopic = "multichronopic_menu.png";
public static string FileNameChronopic1 = "chronopic1.jpg";
public static string FileNameChronopic2 = "chronopic2.jpg";
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 6c8034a..4da7d56 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -86,7 +86,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.ComboBox combo_pulses;
//menus
- [Widget] Gtk.MenuItem menu_jumps;
[Widget] Gtk.MenuItem menu_runs;
[Widget] Gtk.MenuItem menu_other;
[Widget] Gtk.MenuItem menu_tools;
@@ -105,9 +104,6 @@ public partial class ChronoJumpWindow
//tests
//jumps
- [Widget] Gtk.MenuItem menuitem_edit_selected_jump_rj;
- [Widget] Gtk.MenuItem menuitem_repair_selected_jump_rj;
- [Widget] Gtk.MenuItem menuitem_delete_selected_jump_rj;
[Widget] Gtk.Button button_edit_selected_jump;
[Widget] Gtk.Button button_video_play_selected_jump;
[Widget] Gtk.Button button_delete_selected_jump;
@@ -115,15 +111,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_video_play_selected_jump_rj;
[Widget] Gtk.Button button_delete_selected_jump_rj;
[Widget] Gtk.Button button_repair_selected_jump_rj;
- [Widget] Gtk.MenuItem menuitem_jump_type_add;
- [Widget] Gtk.MenuItem menuitem_jump_type_delete_reactive;
- [Widget] Gtk.MenuItem more_rj;
- [Widget] Gtk.MenuItem rj_j;
- [Widget] Gtk.MenuItem rj_t;
- [Widget] Gtk.MenuItem rj_unlimited;
- [Widget] Gtk.MenuItem rj_hexagon;
-
//runs
[Widget] Gtk.MenuItem menu_execute_simple_runs1;
[Widget] Gtk.MenuItem menuitem_edit_selected_run;
@@ -207,20 +195,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_person_add_single;
[Widget] Gtk.Button button_person_add_multiple;
- [Widget] Gtk.Button button_free;
- [Widget] Gtk.Button button_sj;
- [Widget] Gtk.Button button_sj_l;
- [Widget] Gtk.Button button_cmj;
- [Widget] Gtk.Button button_cmj_l;
- [Widget] Gtk.Button button_abk;
- [Widget] Gtk.Button button_dj;
- [Widget] Gtk.Button button_rocket;
- [Widget] Gtk.Button button_take_off;
- [Widget] Gtk.Button button_more;
- [Widget] Gtk.Button button_rj_j;
- [Widget] Gtk.Button button_rj_t;
- [Widget] Gtk.Button button_rj_unlimited;
- [Widget] Gtk.Button button_rj_hexagon;
[Widget] Gtk.Button button_run_custom;
[Widget] Gtk.Button button_run_20m;
[Widget] Gtk.Button button_run_100m;
@@ -244,7 +218,6 @@ public partial class ChronoJumpWindow
//[Widget] Gtk.Button button_pulse_more;
- [Widget] Gtk.Button button_rj_last;
[Widget] Gtk.Button button_run_last;
[Widget] Gtk.Button button_run_interval_last;
@@ -343,7 +316,9 @@ public partial class ChronoJumpWindow
private static EventType currentEventType;
private static JumpType currentJumpType;
+ private static JumpType currentJumpRjType;
private static RunType currentRunType;
+ private static RunType currentRunIntervalType;
private static PulseType currentPulseType;
private static MultiChronopicType currentMultiChronopicType;
private static Report report;
@@ -473,7 +448,7 @@ public partial class ChronoJumpWindow
createdStatsWin = false;
on_extra_window_jumps_test_changed(new object(), new EventArgs());
- //on_extra_window_jumps_rj_test_changed(new object(), new EventArgs());
+ on_extra_window_jumps_rj_test_changed(new object(), new EventArgs());
repetitiveConditionsWin = RepetitiveConditionsWindow.Create();
@@ -542,23 +517,46 @@ public partial class ChronoJumpWindow
UtilGtk.ColorsMenuRadio(radio_mode_reaction_times);
UtilGtk.ColorsMenuRadio(radio_mode_pulses);
UtilGtk.ColorsMenuRadio(radio_mode_multi_chronopic);
+
- /*
- radio_mode_jumps.ModifyBg(StateType.Normal, blue);
- radio_mode_jumps.ModifyBg(StateType.Active, green);
- radio_mode_jumps_reactive.ModifyBg(StateType.Normal, blue);
- radio_mode_jumps_reactive.ModifyBg(StateType.Active, green);
- */
-
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell.png");
+ label_extra_window_radio_jump_free.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_sj.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_sjl.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_cmj.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_cmjl.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_abk.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_dj.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_rocket.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_takeoff.ModifyFg(StateType.Active, UtilGtk.WHITE);
+ label_extra_window_radio_jump_more.ModifyFg(StateType.Active, UtilGtk.WHITE);
+
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_free);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_sj);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_sjl);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_cmj);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_cmjl);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_abk);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_dj);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_rocket);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_takeoff);
+ UtilGtk.ColorsMenuRadio(extra_window_radio_jump_more);
+
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumps);
image_mode_jumps.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsRJ);
image_mode_jumps_reactive.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRuns);
image_mode_runs.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
image_mode_runs_intervallic.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
image_mode_reaction_times.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
image_mode_pulses.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameMultiChronopic);
image_mode_multi_chronopic.Pixbuf = pixbuf;
-
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell.png");
image_jump_reactive_bell.Pixbuf = pixbuf;
image_run_interval_bell.Pixbuf = pixbuf;
@@ -2915,14 +2913,10 @@ Console.WriteLine("X");
*/
- //here comes the SJl, DJ and every jump that has weight or fall or both. Also the reactive jumps (for defining is limited value or weight or fall)
- private void on_jump_extra_activate (object o, EventArgs args)
- {
- }
-
//suitable for all jumps not repetitive
private void on_normal_jump_activate (object o, EventArgs args)
{
+Log.WriteLine("1 " + currentJumpType.Name);
double jumpWeight = 0;
if(currentJumpType.HasWeight) {
if(extra_window_jumps_option == "%")
@@ -2938,6 +2932,7 @@ Console.WriteLine("X");
}
+Log.WriteLine("2 " + currentJumpType.Name);
//used by cancel and finish
//currentEventType = new JumpType();
currentEventType = currentJumpType;
@@ -2946,8 +2941,10 @@ Console.WriteLine("X");
sensitiveGuiEventDoing();
//change to page 0 of notebook_results if were in other
- notebooks_change(0);
+ //update, don't do this now, because it's buggy with currentJump on More
+ //notebooks_change(0);
+Log.WriteLine("3 " + currentJumpType.Name);
//show the event doing window
double myLimit = 3; //3 phases for show the Dj
if( currentJumpType.StartIn ||
@@ -2959,6 +2956,7 @@ Console.WriteLine("X");
if(createdStatsWin)
statsWin.HideUpdateStatsButton();
+Log.WriteLine("4 " + currentJumpType.Name);
eventExecuteWin = EventExecuteWindow.Show(
Catalog.GetString("Execute Jump"), //windowTitle
Catalog.GetString("Phases"), //name of the different moments
@@ -2968,18 +2966,22 @@ Console.WriteLine("X");
currentJumpType.Name,
prefsDigitsNumber, myLimit, chronopicWin.Connected);
+Log.WriteLine("5 " + currentJumpType.Name);
eventExecuteWin.ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
eventExecuteWin.ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
+Log.WriteLine("6 " + currentJumpType.Name);
//when user clicks on update the eventExecute window
//(for showing with his new confgured values: max, min and guides
eventExecuteWin.ButtonUpdate.Clicked -= new EventHandler(on_update_clicked); //if we don't do this, on_update_clicked it's called 'n' times when 'n' events are don
eventExecuteWin.ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
+Log.WriteLine("7 " + currentJumpType.Name);
currentEventExecute = new JumpExecute(eventExecuteWin, currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpType.Name, myFall, jumpWeight,
chronopicWin.CP, appbar2, app1, prefsDigitsNumber, volumeOn);
+Log.WriteLine("8 " + currentJumpType.Name);
if (!chronopicWin.Connected)
currentEventExecute.SimulateInitValues(rand);
@@ -2988,6 +2990,7 @@ Console.WriteLine("X");
else
currentEventExecute.ManageFall();
+Log.WriteLine("9 " + currentJumpType.Name);
currentEventExecute.FakeButtonFinished.Clicked += new EventHandler(on_jump_finished);
}
@@ -2997,6 +3000,7 @@ Console.WriteLine("X");
currentEventExecute.FakeButtonFinished.Clicked -= new EventHandler(on_jump_finished);
if ( ! currentEventExecute.Cancel ) {
+Log.WriteLine("10 " + currentJumpType.Name);
currentJump = (Jump) currentEventExecute.EventDone;
//move video file if exists
@@ -3037,125 +3041,43 @@ Console.WriteLine("X");
* --------------------------------------------------------
*/
- private void on_button_more_rj_clicked (object o, EventArgs args)
+ private void on_rj_activate (object o, EventArgs args)
{
- jumpsRjMoreWin = JumpsRjMoreWindow.Show(app1, true);
- jumpsRjMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_rj_accepted);
- jumpsRjMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_rj_draw_image_test);
- }
-
- private void on_more_jumps_rj_draw_image_test (object o, EventArgs args) {
- currentEventType = new JumpType(jumpsRjMoreWin.SelectedEventName);
- changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
- }
-
- private void on_button_last_rj_clicked (object o, EventArgs args)
- {
- //currentJumpType contains the last jump type
- if( ! currentJumpType.StartIn || currentJumpType.HasWeight || currentJumpType.FixedValue == 0) {
- on_jump_extra_activate(o, args);
- } else {
- on_rj_accepted(o, args);
- }
- }
-
-
- //used from the dialogue "jumps rj more"
- private void on_more_jumps_rj_accepted (object o, EventArgs args)
- {
- jumpsRjMoreWin.Button_accept.Clicked -= new EventHandler(on_more_jumps_rj_accepted);
-
- currentJumpType = new JumpType(
- //jumpsRjMoreWin.SelectedJumpType,
- jumpsRjMoreWin.SelectedEventName,
- jumpsRjMoreWin.SelectedStartIn,
- jumpsRjMoreWin.SelectedExtraWeight,
- true, //isRepetitive
- jumpsRjMoreWin.SelectedLimited,
- jumpsRjMoreWin.SelectedLimitedValue,
- jumpsRjMoreWin.SelectedUnlimited,
- jumpsRjMoreWin.SelectedDescription,
- SqliteEvent.GraphLinkSelectFileName("jumpRj", jumpsRjMoreWin.SelectedEventName)
- );
-
- //destroy the win for not having updating problems if a new jump type is created
- jumpsRjMoreWin.Destroy();
-
- if( ! currentJumpType.StartIn || currentJumpType.HasWeight ||
- (currentJumpType.FixedValue == 0 && ! currentJumpType.Unlimited) ) {
- on_jump_extra_activate(o, args);
- } else {
- on_rj_accepted(o, args);
- }
- }
-
- private void on_rj_activate (object o, EventArgs args) {
- /*
- if(o == (object) button_rj_j || o == (object) rj_j)
- {
- currentJumpType = new JumpType("RJ(j)");
- jumpExtraWin = JumpExtraWindow.Show(app1, currentJumpType);
- jumpExtraWin.Button_accept.Clicked += new EventHandler(on_rj_accepted);
- } else if(o == (object) button_rj_t || o == (object) rj_t)
- {
- currentJumpType = new JumpType("RJ(t)");
- jumpExtraWin = JumpExtraWindow.Show(app1, currentJumpType);
- jumpExtraWin.Button_accept.Clicked += new EventHandler(on_rj_accepted);
- } else if(o == (object) button_rj_unlimited || o == (object) rj_unlimited)
- {
- currentJumpType = new JumpType("RJ(unlimited)");
-
- //in this jump type, don't ask for limit of jumps or seconds
- on_rj_accepted(o, args);
- } else if(o == (object) button_rj_hexagon || o == (object) rj_hexagon)
- {
- currentJumpType = new JumpType("RJ(hexagon)");
-
- //in this jump type, don't ask for limit of jumps or seconds
- on_rj_accepted(o, args);
- }
- */
- }
- private void on_rj_accepted (object o, EventArgs args)
- {
- /*
- changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
-
double myLimit = 0;
//if it's a unlimited interval run, put -1 as limit value
- if(currentJumpType.Unlimited) {
+ if(currentJumpRjType.Unlimited) {
myLimit = -1;
} else {
- if(currentJumpType.FixedValue > 0) {
- myLimit = currentJumpType.FixedValue;
+ if(currentJumpRjType.FixedValue > 0) {
+ myLimit = currentJumpRjType.FixedValue;
} else {
- myLimit = jumpExtraWin.Limited;
+ myLimit = extra_window_jumps_rj_limited;
}
}
double jumpWeight = 0;
- if(currentJumpType.HasWeight) {
- //jumpWeight = jumpExtraWin.Weight + jumpExtraWin.Option;
- if(jumpExtraWin.Option == "%") {
- jumpWeight = jumpExtraWin.Weight;
+ if(currentJumpRjType.HasWeight) {
+ if(extra_window_jumps_rj_option == "%") {
+ jumpWeight = extra_window_jumps_rj_weight;
} else {
- jumpWeight = Util.WeightFromKgToPercent(jumpExtraWin.Weight, currentPersonSession.Weight);
+ jumpWeight = Util.WeightFromKgToPercent(extra_window_jumps_rj_weight, currentPersonSession.Weight);
}
}
double myFall = 0;
- if( ! currentJumpType.StartIn || currentJumpType.Name == Constants.RunAnalysisName)
- myFall = jumpExtraWin.Fall;
+ if( ! currentJumpRjType.StartIn || currentJumpRjType.Name == Constants.RunAnalysisName)
+ myFall = extra_window_jumps_rj_fall;
//used by cancel and finish
- //currentEventType = new JumpType();
- currentEventType = currentJumpType;
+ //currentEventType = new JumpRjType();
+ currentEventType = currentJumpRjType;
//hide jumping buttons
sensitiveGuiEventDoing();
//change to page 1 of notebook_results if were in other
- notebooks_change(1);
+ //update, don't do this now, because it's buggy with currentJump on More
+ //notebooks_change(1);
//don't let update until test finishes
if(createdStatsWin)
@@ -3168,7 +3090,7 @@ Console.WriteLine("X");
currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID,
"jumpRj", //tableName
- currentJumpType.Name,
+ currentJumpRjType.Name,
prefsDigitsNumber, myLimit, chronopicWin.Connected);
eventExecuteWin.ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
@@ -3180,8 +3102,8 @@ Console.WriteLine("X");
eventExecuteWin.ButtonUpdate.Clicked += new EventHandler(on_update_clicked);
currentEventExecute = new JumpRjExecute(eventExecuteWin, currentPerson.UniqueID, currentPerson.Name,
- currentSession.UniqueID, currentJumpType.Name, myFall, jumpWeight,
- myLimit, currentJumpType.JumpsLimited,
+ currentSession.UniqueID, currentJumpRjType.Name, myFall, jumpWeight,
+ myLimit, currentJumpRjType.JumpsLimited,
chronopicWin.CP, appbar2, app1, prefsDigitsNumber, allowFinishRjAfterTime, volumeOn, repetitiveConditionsWin);
@@ -3192,7 +3114,6 @@ Console.WriteLine("X");
currentEventExecute.Manage();
currentEventExecute.FakeButtonFinished.Clicked += new EventHandler(on_jump_rj_finished);
- */
}
private void on_jump_rj_finished (object o, EventArgs args)
@@ -4791,7 +4712,7 @@ Console.WriteLine("X");
*/
- private void on_jump_type_add_activate (object o, EventArgs args) {
+ private void on_jump_type_add_clicked (object o, EventArgs args) {
Log.WriteLine("Add new jump type");
jumpTypeAddWin = JumpTypeAddWindow.Show(app1);
@@ -4846,11 +4767,11 @@ Console.WriteLine("X");
* --------------------------------------------------------
*/
- private void on_jump_type_delete_simple_clicked (object o, EventArgs args) {
+ private void on_jump_type_delete_simple (object o, EventArgs args) {
jumpsMoreWin = JumpsMoreWindow.Show(app1, false); //delete jump type
}
- private void on_jump_type_delete_reactive_activate (object o, EventArgs args) {
+ private void on_jump_type_delete_reactive (object o, EventArgs args) {
jumpsRjMoreWin = JumpsRjMoreWindow.Show(app1, false); //delete jump type
}
@@ -5062,14 +4983,6 @@ Console.WriteLine("X");
button_delete_current_person.Sensitive = option;
}
- private void menuJumpsSensitive(bool option)
- {
- menuitem_edit_selected_jump_rj.Sensitive = option;
- menuitem_repair_selected_jump_rj.Sensitive = option;
- menuitem_delete_selected_jump_rj.Sensitive = option;
- menuitem_jump_type_delete_reactive.Sensitive = option;
- }
-
private void menuRunsSensitive(bool option)
{
menu_execute_simple_runs1.Sensitive = option;
@@ -5109,7 +5022,6 @@ Console.WriteLine("X");
//menuitems
menuSessionSensitive(false);
menuPersonSelectedSensitive(false);
- menuJumpsSensitive(false);
menuRunsSensitive(false);
menuOtherSensitive(false);
menuToolsSensitive(false);
@@ -5129,7 +5041,6 @@ Console.WriteLine("X");
notebook_options.Sensitive = false;
//button_last.Sensitive = false;
- button_rj_last.Sensitive=false;
button_run_last.Sensitive=false;
button_run_interval_last.Sensitive=false;
}
@@ -5156,7 +5067,6 @@ Console.WriteLine("X");
treeview_persons.Sensitive = false;
menuPersonSelectedSensitive(false);
- menuJumpsSensitive(false);
menuRunsSensitive(false);
menuOtherSensitive(false);
menuToolsSensitive(false);
@@ -5169,7 +5079,6 @@ Console.WriteLine("X");
treeview_persons.Sensitive = true;
menuPersonSelectedSensitive(true);
- menuJumpsSensitive(true);
menuRunsSensitive(true);
menuOtherSensitive(true);
menuToolsSensitive(true);
@@ -5196,7 +5105,6 @@ Console.WriteLine("X");
hbox_pulses.Sensitive = false;
//menu
- menuJumpsSensitive(false);
menuRunsSensitive(false);
menuOtherSensitive(false);
@@ -5215,13 +5123,6 @@ Console.WriteLine("X");
//allow repeat last jump or run (check also if it wasn't cancelled)
if(! currentEventExecute.Cancel) {
switch (currentEventType.Type) {
- case EventType.Types.JUMP:
- if(currentJumpType.IsRepetitive) {
- button_rj_last.Sensitive = true;
- } else {
- button_rj_last.Sensitive = false;
- }
- break;
case EventType.Types.RUN:
if(currentRunType.HasIntervals) {
button_run_interval_last.Sensitive = true;
@@ -5247,7 +5148,6 @@ Console.WriteLine("X");
}
//menu
- menuJumpsSensitive(true);
menuRunsSensitive(true);
menuOtherSensitive(true);
}
@@ -5268,12 +5168,9 @@ Console.WriteLine("X");
success = true;
}
if (type == "ALL" || type == "JumpRj") {
- menuitem_edit_selected_jump_rj.Sensitive = show;
- menuitem_delete_selected_jump_rj.Sensitive = show;
button_edit_selected_jump_rj.Sensitive = show;
button_delete_selected_jump_rj.Sensitive = show;
button_repair_selected_jump_rj.Sensitive = show;
- menuitem_repair_selected_jump_rj.Sensitive = show;
button_video_play_selected_jump_rj.Sensitive = false;
if (myTreeViewJumpsRj.EventSelectedID > 0 && File.Exists(Util.GetVideoFileName(
diff --git a/src/gui/event.cs b/src/gui/event.cs
index eb2755c..b52f69e 100644
--- a/src/gui/event.cs
+++ b/src/gui/event.cs
@@ -707,24 +707,20 @@ public class EventMoreWindow
get { return button_selected; }
}
- public Button Button_accept
- {
- set {
- button_accept = value;
- }
- get {
- return button_accept;
- }
+ public Button Button_accept {
+ set { button_accept = value; }
+ get { return button_accept; }
+ }
+
+ public Button Button_cancel {
+ set { button_cancel = value; }
+ get { return button_cancel; }
}
public string SelectedEventName
{
- set {
- selectedEventName = value;
- }
- get {
- return selectedEventName;
- }
+ set { selectedEventName = value; }
+ get { return selectedEventName; }
}
public string SelectedDescription {
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 88f39bf..75b5258 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -805,7 +805,17 @@ partial class ChronoJumpWindow
[Widget] Gtk.Label extra_window_jumps_rj_label_fall;
[Widget] Gtk.Label extra_window_jumps_rj_label_cm;
-
+ [Widget] Gtk.Label label_extra_window_radio_jump_free;
+ [Widget] Gtk.Label label_extra_window_radio_jump_sj;
+ [Widget] Gtk.Label label_extra_window_radio_jump_sjl;
+ [Widget] Gtk.Label label_extra_window_radio_jump_cmj;
+ [Widget] Gtk.Label label_extra_window_radio_jump_cmjl;
+ [Widget] Gtk.Label label_extra_window_radio_jump_abk;
+ [Widget] Gtk.Label label_extra_window_radio_jump_dj;
+ [Widget] Gtk.Label label_extra_window_radio_jump_rocket;
+ [Widget] Gtk.Label label_extra_window_radio_jump_takeoff;
+ [Widget] Gtk.Label label_extra_window_radio_jump_more;
+
[Widget] Gtk.RadioButton extra_window_radio_jump_free;
[Widget] Gtk.RadioButton extra_window_radio_jump_sj;
[Widget] Gtk.RadioButton extra_window_radio_jump_sjl;
@@ -817,6 +827,12 @@ partial class ChronoJumpWindow
[Widget] Gtk.RadioButton extra_window_radio_jump_takeoff;
[Widget] Gtk.RadioButton extra_window_radio_jump_more;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_rj_j;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_rj_t;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_rj_unlimited;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_rj_hexagon;
+ [Widget] Gtk.RadioButton extra_window_radio_jump_rj_more;
+
[Widget] Gtk.Label extra_window_jumps_label_selected;
[Widget] Gtk.Label extra_window_jumps_rj_label_selected;
@@ -837,10 +853,11 @@ partial class ChronoJumpWindow
double extra_window_jumps_rj_weight = 20;
double extra_window_jumps_rj_fall = 20;
+ private static JumpType previousJumpType; //used on More to turnback if cancel or delete event is pressed
+ private static JumpType previousJumpRjType; //used on More to turnback if cancel or delete event is pressed
private void on_extra_window_jumps_test_changed(object o, EventArgs args)
{
- bool initializeNow = true;
if(extra_window_radio_jump_free.Active) currentJumpType = new JumpType("Free");
else if(extra_window_radio_jump_sj.Active) currentJumpType = new JumpType("SJ");
else if(extra_window_radio_jump_sjl.Active) currentJumpType = new JumpType("SJl");
@@ -850,35 +867,51 @@ partial class ChronoJumpWindow
else if(extra_window_radio_jump_dj.Active) currentJumpType = new JumpType("DJ");
else if(extra_window_radio_jump_rocket.Active) currentJumpType = new JumpType("Rocket");
else if(extra_window_radio_jump_takeoff.Active) currentJumpType = new JumpType(Constants.TakeOffName);
- else if(extra_window_radio_jump_more.Active) {
+
+ extra_window_jumps_initialize(currentJumpType);
+ }
+
+ private void on_extra_window_jumps_more(object o, EventArgs args)
+ {
+ previousJumpType = currentJumpType;
+
+ if(extra_window_radio_jump_more.Active) {
jumpsMoreWin = JumpsMoreWindow.Show(app1, true);
jumpsMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_accepted);
+ jumpsMoreWin.Button_cancel.Clicked += new EventHandler(on_more_jumps_cancelled);
jumpsMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_draw_image_test);
}
- else if(extra_window_radio_jump_more.Active == false) {
- //if we arrive here
- //a test changed
- //but is none of above
- //also more is not activated
- //it means that we click again more
- //because we want to see again the more jumps option
- extra_window_radio_jump_more.Active = true;
- //this will come here again and the more.Active will be run
- initializeNow = false;
- //in fact, we never arrive here, becase radio_jump_more callback is clicked instead of toggled
- }
+ }
+
+ private void on_extra_window_jumps_rj_test_changed(object o, EventArgs args)
+ {
+ if(extra_window_radio_jump_rj_j.Active) currentJumpRjType = new JumpType("RJ(j)");
+ else if(extra_window_radio_jump_rj_t.Active) currentJumpRjType = new JumpType("RJ(t)");
+ else if(extra_window_radio_jump_rj_unlimited.Active) currentJumpRjType = new JumpType("RJ(unlimited)");
+ else if(extra_window_radio_jump_rj_hexagon.Active) currentJumpRjType = new JumpType("RJ(hexagon)");
- if(initializeNow)
- extra_window_jumps_initialize(currentJumpType);
+ extra_window_jumps_rj_initialize(currentJumpRjType);
+ }
+
+ private void on_extra_window_jumps_rj_more(object o, EventArgs args)
+ {
+ previousJumpRjType = currentJumpRjType;
+
+ if(extra_window_radio_jump_rj_more.Active) {
+ jumpsRjMoreWin = JumpsRjMoreWindow.Show(app1, true);
+ jumpsRjMoreWin.Button_accept.Clicked += new EventHandler(on_more_jumps_rj_accepted);
+ jumpsRjMoreWin.Button_cancel.Clicked += new EventHandler(on_more_jumps_rj_cancelled);
+ jumpsRjMoreWin.Button_selected.Clicked += new EventHandler(on_more_jumps_rj_draw_image_test);
+ }
}
private void extra_window_jumps_initialize(JumpType myJumpType)
{
- extra_window_jumps_label_selected.Text = "<b>" + Catalog.GetString(currentJumpType.Name) + "</b>";
+ extra_window_jumps_label_selected.Text = "<b>" + Catalog.GetString(myJumpType.Name) + "</b>";
extra_window_jumps_label_selected.UseMarkup = true;
- currentEventType = currentJumpType;
- changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
+ currentEventType = myJumpType;
+ changeTestImage(EventType.Types.JUMP.ToString(), myJumpType.Name, myJumpType.ImageFileName);
if(myJumpType.HasWeight)
extra_window_showWeightData(myJumpType, true);
@@ -912,10 +945,10 @@ partial class ChronoJumpWindow
private void extra_window_jumps_rj_initialize(JumpType myJumpType)
{
- extra_window_jumps_rj_label_selected.Text = "<b>" + Catalog.GetString(currentJumpType.Name) + "</b>";
+ extra_window_jumps_rj_label_selected.Text = "<b>" + Catalog.GetString(myJumpType.Name) + "</b>";
extra_window_jumps_rj_label_selected.UseMarkup = true;
- currentEventType = currentJumpType;
- changeTestImage(EventType.Types.JUMP.ToString(), currentJumpType.Name, currentJumpType.ImageFileName);
+ currentEventType = myJumpType;
+ changeTestImage(EventType.Types.JUMP.ToString(), myJumpType.Name, myJumpType.ImageFileName);
if(myJumpType.IsRepetitive && myJumpType.FixedValue >= 0) {
string jumpsName = Catalog.GetString("jumps");
@@ -930,11 +963,11 @@ partial class ChronoJumpWindow
if(myJumpType.FixedValue > 0) {
extra_window_jumps_rj_spinbutton_limit.Sensitive = false;
extra_window_jumps_rj_spinbutton_limit.Value = myJumpType.FixedValue;
- } else
+ } else {
+ extra_window_jumps_rj_spinbutton_limit.Sensitive = true;
extra_window_jumps_rj_spinbutton_limit.Value = extra_window_jumps_rj_limited;
- //extra_window_showRepetitiveData(true);
- } //else
- // extra_window_showRepetitiveData(false);
+ }
+ }
if(myJumpType.HasWeight)
extra_window_showWeightData(myJumpType, true);
@@ -957,15 +990,16 @@ partial class ChronoJumpWindow
}
- private void on_extra_window_button_more_clicked (object o, EventArgs args)
- {
- }
-
private void on_more_jumps_draw_image_test (object o, EventArgs args) {
currentEventType = new JumpType(jumpsMoreWin.SelectedEventName);
changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
}
+ private void on_more_jumps_rj_draw_image_test (object o, EventArgs args) {
+ currentEventType = new JumpType(jumpsRjMoreWin.SelectedEventName);
+ changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
+ }
+
//used from the dialogue "jumps more"
private void on_more_jumps_accepted (object o, EventArgs args)
{
@@ -985,14 +1019,51 @@ partial class ChronoJumpWindow
SqliteEvent.GraphLinkSelectFileName("jump", jumpsMoreWin.SelectedEventName)
);
- extra_window_toogle_desired_button_on_toolbar(currentJumpType);
+ extra_window_jumps_toggle_desired_button_on_toolbar(currentJumpType);
//destroy the win for not having updating problems if a new jump type is created
//jumpsMoreWin = null; //don't work
jumpsMoreWin.Destroy(); //works ;)
}
- private void extra_window_toogle_desired_button_on_toolbar(JumpType type) {
+ //used from the dialogue "jumps rj more"
+ private void on_more_jumps_rj_accepted (object o, EventArgs args)
+ {
+ jumpsRjMoreWin.Button_accept.Clicked -= new EventHandler(on_more_jumps_rj_accepted);
+
+ currentJumpRjType = new JumpType(
+ //jumpsRjMoreWin.SelectedJumpType,
+ jumpsRjMoreWin.SelectedEventName,
+ jumpsRjMoreWin.SelectedStartIn,
+ jumpsRjMoreWin.SelectedExtraWeight,
+ true, //isRepetitive
+ jumpsRjMoreWin.SelectedLimited,
+ jumpsRjMoreWin.SelectedLimitedValue,
+ jumpsRjMoreWin.SelectedUnlimited,
+ jumpsRjMoreWin.SelectedDescription,
+ SqliteEvent.GraphLinkSelectFileName("jumpRj", jumpsRjMoreWin.SelectedEventName)
+ );
+
+ //destroy the win for not having updating problems if a new jump type is created
+ jumpsRjMoreWin.Destroy();
+
+ extra_window_jumps_rj_toggle_desired_button_on_toolbar(currentJumpRjType);
+ }
+
+ //if it's cancelled (or deleted event) select desired toolbar button
+ private void on_more_jumps_cancelled (object o, EventArgs args)
+ {
+ currentJumpType = previousJumpType;
+ extra_window_jumps_toggle_desired_button_on_toolbar(currentJumpType);
+ }
+
+ private void on_more_jumps_rj_cancelled (object o, EventArgs args)
+ {
+ currentJumpRjType = previousJumpRjType;
+ extra_window_jumps_rj_toggle_desired_button_on_toolbar(currentJumpRjType);
+ }
+
+ private void extra_window_jumps_toggle_desired_button_on_toolbar(JumpType type) {
if(type.Name == "Free") extra_window_radio_jump_free.Active = true;
else if(type.Name == "SJ") extra_window_radio_jump_sj.Active = true;
else if(type.Name == "SJl") extra_window_radio_jump_sjl.Active = true;
@@ -1011,6 +1082,20 @@ partial class ChronoJumpWindow
}
}
+ private void extra_window_jumps_rj_toggle_desired_button_on_toolbar(JumpType type) {
+ if(type.Name == "RJ(j)") extra_window_radio_jump_rj_j.Active = true;
+ else if(type.Name == "RJ(t)") extra_window_radio_jump_rj_t.Active = true;
+ else if(type.Name == "RJ(unlimited)") extra_window_radio_jump_rj_unlimited.Active = true;
+ else if(type.Name == "RJ(hexagon)") extra_window_radio_jump_rj_hexagon.Active = true;
+ else {
+ //don't do this:
+ //extra_window_radio_jump_more.Active = true;
+ //because it will be a loop
+ //only do:
+ extra_window_jumps_rj_initialize(type);
+ }
+ }
+
private void extra_window_showWeightData (JumpType myJumpType, bool show) {
if(myJumpType.IsRepetitive) {
extra_window_jumps_rj_label_weight.Visible = show;
@@ -1066,7 +1151,7 @@ partial class ChronoJumpWindow
extra_window_jumps_rj_weight = (double) extra_window_jumps_rj_spinbutton_weight.Value;
extra_window_jumps_rj_fall = (double) extra_window_jumps_rj_spinbutton_fall.Value;
- //on_normal_jump_activate(o, args);
+ on_rj_activate(o, args);
}
}
@@ -1252,8 +1337,11 @@ public class JumpsMoreWindow : EventMoreWindow
void on_jumps_runs_more_delete_event (object o, DeleteEventArgs args)
{
- JumpsMoreWindowBox.jumps_runs_more.Hide();
- JumpsMoreWindowBox = null;
+ //raise signal
+ button_cancel.Click();
+
+ //JumpsMoreWindowBox.jumps_runs_more.Hide();
+ //JumpsMoreWindowBox = null;
}
void on_button_accept_clicked (object o, EventArgs args)
@@ -1505,8 +1593,11 @@ public class JumpsRjMoreWindow : EventMoreWindow
void on_jumps_runs_more_delete_event (object o, DeleteEventArgs args)
{
- JumpsRjMoreWindowBox.jumps_runs_more.Hide();
- JumpsRjMoreWindowBox = null;
+ //raise signal
+ button_cancel.Click();
+
+ //JumpsRjMoreWindowBox.jumps_runs_more.Hide();
+ //JumpsRjMoreWindowBox = null;
}
void on_button_accept_clicked (object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
