commit f1c022f7be78d42d376812015e350cbe8e090a2f
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 24 01:39:20 2011 +0100
drawing area resizes, tvPersons accels, gui changes
glade/chronojump.glade | 1272 ++++++++++++++++++++++++++++++++---------------
src/Makefile.am | 1 -
src/execute/event.cs | 2 +-
src/execute/jump.cs | 2 +-
src/gui/chronojump.cs | 27 +-
src/gui/eventExecute.cs | 12 +-
src/gui/jump.cs | 2 +-
src/treeViewPerson.cs | 12 +-
8 files changed, 905 insertions(+), 425 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index ae476c3..9d3b7d2 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -15415,20 +15415,6 @@ by you</property>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="menuitem_run_type_delete_simple">
- <property name="label" translatable="yes">Delete simple run type</property>
- <property name="visible">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="on_run_type_delete_simple_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
<widget class="GtkImageMenuItem" id="menuitem_run_type_delete_intervallic">
<property name="label" translatable="yes">Delete intervallic run type</property>
<property name="visible">True</property>
@@ -15855,6 +15841,50 @@ by you</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton" id="button_recuperate_persons_from_session1">
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Load persons from other session</property>
+ <signal name="clicked" handler="on_treeview_persons_up"/>
+ <accelerator key="Up" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkImage" id="image_persons_open_plus1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_recuperate_persons_from_session2">
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Load persons from other session</property>
+ <signal name="clicked" handler="on_treeview_persons_down"/>
+ <accelerator key="Down" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkImage" id="image_persons_open_plus2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-down</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -16035,6 +16065,7 @@ by you</property>
<widget class="GtkViewport" id="viewport_mode">
<property name="visible">True</property>
<property name="resize_mode">queue</property>
+ <property name="hadjustment">0 0 730 73 657 730</property>
<property name="shadow_type">out</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox2">
@@ -16352,7 +16383,6 @@ Chronopic</property>
<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">
@@ -17038,355 +17068,430 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_runs">
+ <widget class="GtkFrame" id="frame3">
<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="GtkTable" id="table41">
+ <widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">7</property>
- <property name="column_spacing">2</property>
- <property name="row_spacing">4</property>
- <child>
- <widget class="GtkButton" id="button_run_custom">
- <property name="label" translatable="yes">Custom</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">Variable distance running</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_run_extra_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_20yard">
- <property name="label" translatable="yes">20 Yard</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">20Yard Agility test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_20m">
- <property name="label">20m</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">Run 20 meters</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_100m">
- <property name="label">100m</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">Run 100 meters</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_200m">
- <property name="label">200m</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">Run 200 meters</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_400m">
- <property name="label">400m</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">Run 400 meters</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_505">
- <property name="label">505</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">505 Agility test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_illinois">
- <property name="label">Illinois</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">Illinois Agility test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_zigzag">
- <property name="label">ZigZag</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">ZigZag Agility test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_shuttle">
- <property name="label">Shuttle</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">Shuttle Run Agility test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_margaria">
- <property name="label">Margaria</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">Margaria-Kalamen test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_run_extra_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="left_padding">6</property>
<child>
- <widget class="GtkHBox" id="hbox350">
+ <widget class="GtkVBox" id="vbox29">
<property name="visible">True</property>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <widget class="GtkTable" id="table_runs">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">7</property>
<child>
- <widget class="GtkButton" id="button_run_last">
+ <widget class="GtkRadioButton" id="extra_window_radio_run_custom">
<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_run_last_clicked"/>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
<child>
- <widget class="GtkImage" id="image3172">
+ <widget class="GtkLabel" id="label_extra_window_radio_run_custom">
<property name="visible">True</property>
- <property name="stock">gtk-redo</property>
- <property name="icon-size">1</property>
+ <property name="label" translatable="yes">Custom</property>
</widget>
</child>
</widget>
+ <packing>
+ <property name="x_options">GTK_FILL</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="button22">
- <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 run type</property>
- <signal name="clicked" handler="on_run_type_add_activate"/>
<child>
- <widget class="GtkImage" id="image3212">
+ <widget class="GtkRadioButton" id="extra_window_radio_run_20m">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
- <property name="icon-size">1</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_20m">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">20m</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</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">6</property>
- <property name="right_attach">7</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_run_gesell">
- <property name="label">Gesell DBT</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">ZigZag Agility test</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_normal_run_activate"/>
- <signal name="enter" handler="on_button_enter"/>
- </widget>
- <packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkButton" id="button_run_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 simple runs</property>
- <signal name="clicked" handler="on_button_run_more_clicked"/>
<child>
- <widget class="GtkImage" id="image3171">
+ <widget class="GtkRadioButton" id="extra_window_radio_run_100m">
<property name="visible">True</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">1</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_100m">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">100m</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_200m">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_200m">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">200m</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_400m">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_400m">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">400m</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_gesell">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_gesell">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Gesell DBT</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_20yard">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_20yard">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">20 Yard</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_505">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_505">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">505</property>
+ </widget>
+ </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>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_illinois">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_illinois">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Illinois</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_margaria">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_margaria">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Margaria</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_shuttle">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_shuttle">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Shuttle</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_zigzag">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="toggled" handler="on_extra_window_runs_test_changed"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_zigzag">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">ZigZag</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox33">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkRadioButton" id="extra_window_radio_run_more">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property name="group">extra_window_radio_run_custom</property>
+ <signal name="clicked" handler="on_extra_window_runs_more"/>
+ <child>
+ <widget class="GtkLabel" id="label_extra_window_radio_run_more">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">More runs</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">12</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button22">
+ <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 run type</property>
+ <signal name="clicked" handler="on_run_type_add_activate"/>
+ <child>
+ <widget class="GtkImage" id="image3212">
+ <property name="visible">True</property>
+ <property name="stock">gtk-new</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button2">
+ <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 run type</property>
+ <signal name="clicked" handler="on_run_type_delete_simple"/>
+ <child>
+ <widget class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon-size">1</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="left_attach">6</property>
+ <property name="right_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox34">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Selected:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="extra_window_runs_label_selected">
+ <property name="visible">True</property>
+ <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="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_padding">12</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label32">
+ <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="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">3</property>
</widget>
@@ -18587,8 +18692,10 @@ weight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Or press 'space'</property>
<property name="border_width">10</property>
<signal name="clicked" handler="on_button_execute_test_clicked"/>
+ <accelerator key="space" signal="clicked"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -18895,6 +19002,7 @@ weight</property>
</child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -18912,103 +19020,118 @@ weight</property>
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkVBox" id="vbox26">
+ <widget class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox22">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="event_graph_label_graph_person">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="event_graph_label_graph_test">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAspectFrame" id="aspectframe2">
+ <widget class="GtkVBox" id="vbox26">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
<child>
- <widget class="GtkDrawingArea" id="event_execute_drawingarea">
- <property name="width_request">300</property>
- <property name="height_request">200</property>
+ <widget class="GtkHBox" id="hbox22">
<property name="visible">True</property>
- <signal name="expose_event" handler="on_event_execute_drawingarea_expose_event"/>
- <signal name="configure_event" handler="on_event_execute_drawingarea_configure_event"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="event_execute_button_properties">
- <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">Properties</property>
- <signal name="clicked" handler="on_event_execute_button_properties_clicked"/>
<child>
- <widget class="GtkImage" id="image1664">
+ <widget class="GtkLabel" id="event_graph_label_graph_person">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="event_graph_label_graph_test">
<property name="visible">True</property>
- <property name="stock">gtk-properties</property>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="event_execute_button_update">
+ <widget class="GtkAspectFrame" id="aspectframe2">
<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">Update</property>
- <signal name="clicked" handler="on_event_execute_button_update_clicked"/>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkImage" id="image1665">
+ <widget class="GtkVBox" id="vbox30">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkDrawingArea" id="event_execute_drawingarea">
+ <property name="width_request">300</property>
+ <property name="height_request">200</property>
+ <property name="visible">True</property>
+ <signal name="expose_event" handler="on_event_execute_drawingarea_expose_event"/>
+ <signal name="configure_event" handler="on_event_execute_drawingarea_configure_event"/>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton" id="event_execute_button_properties">
+ <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">Properties</property>
+ <signal name="clicked" handler="on_event_execute_button_properties_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image1664">
+ <property name="visible">True</property>
+ <property name="stock">gtk-properties</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="event_execute_button_update">
+ <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">Update</property>
+ <signal name="clicked" handler="on_event_execute_button_update_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image1665">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -20543,6 +20666,337 @@ weight</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox_runs1">
+ <child>
+ <widget class="GtkTable" id="table41">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">7</property>
+ <property name="column_spacing">2</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <widget class="GtkButton" id="button_run_custom">
+ <property name="label" translatable="yes">Custom</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">Variable distance running</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_run_extra_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_20yard">
+ <property name="label" translatable="yes">20 Yard</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">20Yard Agility test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_20m">
+ <property name="label">20m</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">Run 20 meters</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_100m">
+ <property name="label">100m</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">Run 100 meters</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_200m">
+ <property name="label">200m</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">Run 200 meters</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_400m">
+ <property name="label">400m</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">Run 400 meters</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_505">
+ <property name="label">505</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">505 Agility test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </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>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_illinois">
+ <property name="label">Illinois</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">Illinois Agility test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_zigzag">
+ <property name="label">ZigZag</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">ZigZag Agility test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_shuttle">
+ <property name="label">Shuttle</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">Shuttle Run Agility test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_margaria">
+ <property name="label">Margaria</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">Margaria-Kalamen test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_run_extra_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox350">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkButton" id="button_run_last">
+ <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_run_last_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image3172">
+ <property name="visible">True</property>
+ <property name="stock">gtk-redo</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_run_gesell">
+ <property name="label">Gesell DBT</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">ZigZag Agility test</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_normal_run_activate"/>
+ <signal name="enter" handler="on_button_enter"/>
+ </widget>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkButton" id="button_run_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 simple runs</property>
+ <signal name="clicked" handler="on_button_run_more_clicked"/>
+ <child>
+ <widget class="GtkImage" id="image3171">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
diff --git a/src/Makefile.am b/src/Makefile.am
index 073b8ce..3d1afec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -196,7 +196,6 @@ FILES = \
constants.cs\
report.cs\
updateProgressBar.cs\
- prepareEventGraphObjects.cs\
sport.cs\
log.cs\
serverPing.cs\
diff --git a/src/execute/event.cs b/src/execute/event.cs
index 6d48b8f..5070f58 100644
--- a/src/execute/event.cs
+++ b/src/execute/event.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
diff --git a/src/execute/jump.cs b/src/execute/jump.cs
index a1f6218..72869dc 100644
--- a/src/execute/jump.cs
+++ b/src/execute/jump.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 2259c3d..d740320 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
@@ -80,7 +80,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Box hbox_combo_pulses;
[Widget] Gtk.Box hbox_jumps;
[Widget] Gtk.Box hbox_jumps_rj;
- [Widget] Gtk.Box hbox_runs;
+ [Widget] Gtk.Table table_runs;
[Widget] Gtk.Box hbox_runs_interval;
[Widget] Gtk.Box hbox_pulses;
[Widget] Gtk.ComboBox combo_jumps;
@@ -125,7 +125,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_repair_selected_run_interval;
[Widget] Gtk.MenuItem menuitem_delete_selected_run_interval;
[Widget] Gtk.MenuItem menuitem_run_type_add;
- [Widget] Gtk.MenuItem menuitem_run_type_delete_simple;
[Widget] Gtk.MenuItem menuitem_run_type_delete_intervallic;
[Widget] Gtk.Button button_edit_selected_run;
[Widget] Gtk.Button button_video_play_selected_run;
@@ -492,6 +491,13 @@ public partial class ChronoJumpWindow
*/
}
+
+ private void on_extra_window_runs_test_changed(object o, EventArgs args) {
+ }
+ private void on_extra_window_runs_more(object o, EventArgs args) {
+ }
+
+
/*
private void chronopicAtStart(object o, EventArgs args) {
//make active menuitem chronopic, and this
@@ -892,6 +898,14 @@ public partial class ChronoJumpWindow
private int findRowOfCurrentPerson(Gtk.TreeView tv, TreeStore store, Person currentPerson) {
return myTreeViewPersons.FindRow(currentPerson.UniqueID);
}
+
+ private void on_treeview_persons_up (object o, EventArgs args) {
+ myTreeViewPersons.SelectPreviousRow(currentPerson.UniqueID);
+ }
+
+ private void on_treeview_persons_down (object o, EventArgs args) {
+ myTreeViewPersons.SelectNextRow(currentPerson.UniqueID);
+ }
//return true if selection is done (there's any person)
private bool selectRowTreeView_persons(Gtk.TreeView tv, TreeStore store, int rowNum)
@@ -4924,7 +4938,7 @@ Console.WriteLine("X");
jumpsRjMoreWin = JumpsRjMoreWindow.Show(app1, false); //delete jump type
}
- private void on_run_type_delete_simple_activate (object o, EventArgs args) {
+ private void on_run_type_delete_simple (object o, EventArgs args) {
runsMoreWin = RunsMoreWindow.Show(app1, false); //delete run type
}
@@ -5148,7 +5162,6 @@ Console.WriteLine("X");
menuitem_repair_selected_run_interval.Sensitive = option;
menuitem_delete_selected_run_interval.Sensitive = option;
menuitem_run_type_add.Sensitive = option;
- menuitem_run_type_delete_simple.Sensitive = option;
menuitem_run_type_delete_intervallic.Sensitive = option;
}
@@ -5270,7 +5283,7 @@ Console.WriteLine("X");
//hbox
hbox_jumps.Sensitive = false;
hbox_jumps_rj.Sensitive = false;
- hbox_runs.Sensitive = false;
+ table_runs.Sensitive = false;
hbox_runs_interval.Sensitive = false;
hbox_pulses.Sensitive = false;
@@ -5286,7 +5299,7 @@ Console.WriteLine("X");
//hbox
hbox_jumps.Sensitive = true;
hbox_jumps_rj.Sensitive = true;
- hbox_runs.Sensitive = true;
+ table_runs.Sensitive = true;
hbox_runs_interval.Sensitive = true;
hbox_pulses.Sensitive = true;
hbox_multi_chronopic_buttons.Sensitive = true;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index b9798dd..f25da5c 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -505,6 +505,7 @@ public partial class ChronoJumpWindow
event_execute_label_time_value.Text = "";
}
+ int allocationXOld;
bool sizeChanged;
public void on_event_execute_drawingarea_configure_event(object o, ConfigureEventArgs args)
{
@@ -514,13 +515,15 @@ public partial class ChronoJumpWindow
Gdk.Rectangle allocation = event_execute_drawingarea.Allocation;
- if(event_execute_pixmap == null || sizeChanged) {
+ if(event_execute_pixmap == null || sizeChanged || allocation.Width != allocationXOld) {
event_execute_pixmap = new Gdk.Pixmap (window, allocation.Width, allocation.Height, -1);
event_execute_erasePaint(event_execute_drawingarea);
sizeChanged = false;
}
+
+ allocationXOld = allocation.Width;
}
public void on_event_execute_drawingarea_expose_event(object o, ExposeEventArgs args)
@@ -529,8 +532,8 @@ public partial class ChronoJumpWindow
* Do here the initialization
*/
- if(event_execute_pixmap == null || sizeChanged) {
- Gdk.Rectangle allocation = event_execute_drawingarea.Allocation;
+ Gdk.Rectangle allocation = event_execute_drawingarea.Allocation;
+ if(event_execute_pixmap == null || sizeChanged || allocation.Width != allocationXOld) {
event_execute_pixmap = new Gdk.Pixmap (event_execute_drawingarea.GdkWindow, allocation.Width, allocation.Height, -1);
event_execute_erasePaint(event_execute_drawingarea);
@@ -548,6 +551,7 @@ public partial class ChronoJumpWindow
area.Width, area.Height);
}
+ allocationXOld = allocation.Width;
}
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 4f2cdeb..ccd4f11 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2009 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
*/
using System;
diff --git a/src/treeViewPerson.cs b/src/treeViewPerson.cs
index 0087301..a41c0e9 100644
--- a/src/treeViewPerson.cs
+++ b/src/treeViewPerson.cs
@@ -125,7 +125,17 @@ public class TreeViewPersons
}
return found;
}
-
+
+ public void SelectNextRow(int personID)
+ {
+ SelectRow(FindRow(personID) +1);
+ }
+
+ public void SelectPreviousRow(int personID)
+ {
+ SelectRow(FindRow(personID) -1);
+ }
+
//add in the row position by alfabetical order
public void Add (string jumperID, string jumperName)
{