[chronojump] Contacts: runs and runsI execute easier GUI
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Contacts: runs and runsI execute easier GUI
- Date: Mon, 7 Apr 2014 15:06:39 +0000 (UTC)
commit bdbe289f81472c3231c65b56cf227d9ef6cc1bc8
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 7 17:05:45 2014 +0200
Contacts: runs and runsI execute easier GUI
glade/chronojump.glade | 3127 ++++++++++++++++++---------------------------
src/gui/chronojump.cs | 319 +++--
src/gui/event.cs | 10 +-
src/gui/multiChronopic.cs | 5 -
src/gui/pulse.cs | 4 -
src/gui/run.cs | 266 ++---
6 files changed, 1530 insertions(+), 2201 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 78dca7d..d8b2b29 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -1594,377 +1594,85 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame3">
+ <widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">8</property>
<child>
- <widget class="GtkAlignment" id="alignment8">
+ <widget class="GtkVBox" id="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
<child>
- <widget class="GtkVBox" id="vbox29">
+ <widget class="GtkHBox" id="hbox_runs">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkTable" id="table_runs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">8</property>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_custom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_extra_window_runs_test_changed" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_custom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Custom</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_20m">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_20m">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_100m">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_100m">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_200m">
+ <widget class="GtkHBox" id="hbox12">
<property name="visible">True</property>
<property name="can_focus">False</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_400m">
- <property name="visible">True</property>
- <property name="can_focus">False</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_gesell">
- <property name="visible">True</property>
- <property name="can_focus">False</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_20yard">
- <property name="visible">True</property>
- <property name="can_focus">False</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_505">
- <property name="visible">True</property>
- <property name="can_focus">False</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_illinois">
- <property name="visible">True</property>
- <property name="can_focus">False</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="xalign">0</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" swapped="no"/>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_margaria">
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Margaria</property>
- </widget>
- </child>
+ <property name="label"
translatable="yes">Test</property>
</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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_shuttle">
+ <widget class="GtkHBox"
id="hbox_combo_select_runs">
<property name="visible">True</property>
<property name="can_focus">False</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="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_zigzag">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">ZigZag</property>
- </widget>
+ <placeholder/>
</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>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox33">
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_more">
+ <widget class="GtkButton"
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>
+ <property name="receives_default">True</property>
<signal name="clicked"
handler="on_extra_window_runs_more" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage" id="image15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">2</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_more">
+ <widget class="GtkImage" id="image16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">All
simple runs</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="stock">gtk-info</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">12</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button22">
+ <widget class="GtkButton" id="button4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1972,7 +1680,7 @@ Chronopic</property>
<property name="tooltip" translatable="yes">Add
run type</property>
<signal name="clicked"
handler="on_run_simple_type_add_activate" swapped="no"/>
<child>
- <widget class="GtkImage" id="image3212">
+ <widget class="GtkImage" id="image33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-new</property>
@@ -1987,7 +1695,7 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button2">
+ <widget class="GtkButton"
id="button_run_type_delete_simple">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2008,110 +1716,22 @@ Chronopic</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">7</property>
- <property name="right_attach">8</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label40">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Selected:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</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="can_focus">False</property>
- <property name="label" translatable="yes">the
selected test</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">7</property>
- <property name="right_attach">8</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_t_test">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="xalign">0</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" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_t_test">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">T
Test</property>
- </widget>
- </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_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label113">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options"/>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
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>
@@ -2130,12 +1750,11 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame6">
+ <widget class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">8</property>
<child>
<widget class="GtkVBox" id="vbox32">
<property name="visible">True</property>
@@ -2144,193 +1763,70 @@ Chronopic</property>
<widget class="GtkHBox" id="hbox_runs_interval">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkHBox" id="hbox40">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_interval_by_laps">
- <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">Intervallic run limited by laps</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_interval_test_changed" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_interval_by_laps">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">By
laps</property>
- </widget>
- </child>
+ <property name="label"
translatable="yes">Test</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_interval_by_time">
- <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_interval_by_laps</property>
- <signal name="toggled"
handler="on_extra_window_runs_interval_test_changed" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_interval_by_time">
+ <widget class="GtkHBox"
id="hbox_combo_select_runs_interval">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Intervallic run limited by time</property>
- <property name="label" translatable="yes">By
time</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_interval_unlimited">
- <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">Intervallic run unlimited (until "finish" button is clicked)</property>
- <property name="relief">none</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_radio_run_interval_by_laps</property>
- <signal name="toggled"
handler="on_extra_window_runs_interval_test_changed" swapped="no"/>
<child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_interval_unlimited">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Unlimited</property>
- </widget>
+ <placeholder/>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_interval_3l3r">
- <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">Intervallic run unlimited (until "finish" button is clicked)</property>
- <property name="relief">none</property>
- <property name="draw_indicator">False</property>
- <property
name="group">extra_window_radio_run_interval_by_laps</property>
- <signal name="toggled"
handler="on_extra_window_runs_interval_test_changed" swapped="no"/>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_interval_3l3r">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">3L3R</property>
- </widget>
- </child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_interval_mtgug">
- <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_interval_by_laps</property>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_interval_mtgug">
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox41">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">MTGUG</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_radio_run_interval_more">
+ <widget class="GtkButton"
id="extra_window_radio_run_interval_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_interval_by_laps</property>
+ <property name="receives_default">True</property>
<signal name="clicked"
handler="on_extra_window_runs_interval_more" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox45">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage" id="image16">
+ <widget class="GtkImage" id="image32">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">2</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_extra_window_radio_run_interval_more">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">All
intervallic runs (including RSA)</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="stock">gtk-info</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">8</property>
- <property name="position">5</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox41">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
<widget class="GtkButton" id="button_time_bells">
<property name="visible">True</property>
@@ -2382,7 +1878,7 @@ Chronopic</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -2405,7 +1901,7 @@ Chronopic</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -2427,7 +1923,7 @@ Chronopic</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -2439,60 +1935,13 @@ Chronopic</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox38">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Selected:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="extra_window_runs_interval_label_selected">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">the
selected test</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label27">
- <property name="visible">True</property>
- <property name="can_focus">False</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">3</property>
@@ -2511,27 +1960,21 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame8">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">8</property>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <widget class="GtkVBox" id="vbox49">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
<child>
- <widget class="GtkVBox" id="vbox49">
+ <widget class="GtkHBox" id="hbox60">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox60">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_reaction_time">
+ <widget class="GtkRadioButton"
id="extra_window_radio_reaction_time">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -2545,75 +1988,25 @@ Chronopic</property>
<property name="label"
translatable="yes">Execute reaction time</property>
</widget>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label60">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Selected:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="extra_window_reaction_times_label_selected">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Execute reaction time</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label59">
- <property name="visible">True</property>
- <property name="can_focus">False</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">4</property>
@@ -2632,28 +2025,22 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame11">
+ <widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">8</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <widget class="GtkVBox" id="vbox52">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
<child>
- <widget class="GtkVBox" id="vbox52">
+ <widget class="GtkHBox" id="hbox_pulses">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkHBox" id="hbox_pulses">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_pulses_free">
+ <widget class="GtkRadioButton"
id="extra_window_radio_pulses_free">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -2668,15 +2055,15 @@ Chronopic</property>
<property name="label"
translatable="yes">Free</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_pulses_custom">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="extra_window_radio_pulses_custom">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -2691,71 +2078,22 @@ Chronopic</property>
<property name="label"
translatable="yes">Custom</property>
</widget>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox66">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Selected:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="extra_window_pulses_label_selected">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">the
selected test</property>
- </widget>
- <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label29">
- <property name="visible">True</property>
- <property name="can_focus">False</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">5</property>
@@ -2774,28 +2112,22 @@ Chronopic</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame12">
+ <widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">8</property>
<child>
- <widget class="GtkAlignment" id="alignment11">
+ <widget class="GtkVBox" id="vbox58">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
<child>
- <widget class="GtkVBox" id="vbox58">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_multichronopic_start">
+ <widget class="GtkRadioButton"
id="extra_window_radio_multichronopic_start">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -2810,15 +2142,15 @@ Chronopic</property>
<property name="label" translatable="yes">Multi
Chronopic test</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="extra_window_radio_multichronopic_run_analysis">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="extra_window_radio_multichronopic_run_analysis">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -2832,71 +2164,22 @@ Chronopic</property>
<property name="label" translatable="yes">Run
analysis</property>
</widget>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label65">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Selected:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="extra_window_multichronopic_label_selected">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">the
selected test</property>
- </widget>
- <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="can_focus">False</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">6</property>
@@ -5472,7 +4755,7 @@ Second Chronopic to platforms.</property>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Test
options</property>
+ <property name="label"
translatable="yes">Options</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -5926,6 +5209,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6531,6 +5820,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7272,6 +6567,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -7772,6 +7073,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -8671,7 +7978,7 @@ Second Chronopic to platforms.</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox_combo_runs">
+ <widget class="GtkHBox"
id="hbox_combo_result_runs">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -8889,7 +8196,7 @@ Second Chronopic to platforms.</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkHBox"
id="hbox_combo_runs_interval">
+ <widget class="GtkHBox"
id="hbox_combo_result_runs_interval">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -17086,6 +16393,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -17494,6 +16807,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18324,6 +17643,18 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -25007,6 +24338,42 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25471,6 +24838,1044 @@ options</property>
</widget>
</child>
</widget>
+ <widget class="GtkWindow" id="query_server_window">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="title" translatable="yes">Query to server</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete_event" handler="on_delete_event" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox191">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label754">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Perform a query to the server.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame48">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment142">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkTable" id="table71">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_tests">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </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>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_test_types">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label755">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Type of test</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label747">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Test</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="image_test_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-no</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label763">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Variable</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_variables">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label746">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Test variables</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame49">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment143">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkTable" id="table70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">9</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label748">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sex</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_country">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Country</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label751">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sport</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label752">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Level</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_speciallity">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Speciallity</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_sexes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_ages">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_countries">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_sports">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_speciallities">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_levels">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label762">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Continent</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_continents">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="image_country">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-no</property>
+ </widget>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_ages2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table73">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <widget class="GtkSpinButton" id="spin_ages1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">if-valid</property>
+ <signal name="changed" handler="on_spin_ages1_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spin_ages2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">if-valid</property>
+ <signal name="changed" handler="on_spin_ages2_changed" swapped="no"/>
+ </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="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_ages1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_ages2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </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>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_age_and">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">And</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </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>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_age">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Age</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label756">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Person variables</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Evaluator</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_evaluators">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Evaluator</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment144">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox195">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkCheckButton" id="check_show_query">
+ <property name="label" translatable="yes">Show query</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_check_show_query_toggled" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow_query">
+ <property name="height_request">36</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkTextView" id="textview_query">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="cursor_visible">False</property>
+ <property name="accepts_tab">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox368">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkButton" id="button_search">
+ <property name="label">gtk-find</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_search_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table72">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label758">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Results:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label759">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Average:</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_results_num">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_results_avg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_results_num_units">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </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"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_results_avg_units">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </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"/>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Query</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">8</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
<widget class="GtkWindow" id="preferences">
<property name="height_request">450</property>
<property name="visible">True</property>
@@ -26618,1026 +27023,6 @@ show elevation as:</property>
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="query_server_window">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="title" translatable="yes">Query to server</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <signal name="delete_event" handler="on_delete_event" swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox191">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label754">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Perform a query to the server.</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame48">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkAlignment" id="alignment142">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkTable" id="table71">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_tests">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </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>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_test_types">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label755">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Type of test</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label747">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Test</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_test_type">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-no</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label763">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Variable</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_variables">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label746">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Test variables</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkAlignment" id="alignment143">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkTable" id="table70">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">9</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label748">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Sex</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_country">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Country</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label751">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Sport</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label752">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Level</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_speciallity">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Speciallity</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_sexes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_ages">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_countries">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_sports">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_speciallities">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_levels">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label762">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Continent</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_continents">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_country">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-no</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_ages2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table73">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
- <child>
- <widget class="GtkSpinButton" id="spin_ages1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">1 1 100 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- <signal name="changed" handler="on_spin_ages1_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_ages2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">1 1 100 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- <signal name="changed" handler="on_spin_ages2_changed" swapped="no"/>
- </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="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_ages1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_ages2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </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>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_age_and">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">And</property>
- </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"/>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </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>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_age">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Age</property>
- </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"/>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label756">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Person variables</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Evaluator</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_evaluators">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Evaluator</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame50">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkAlignment" id="alignment144">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox195">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkCheckButton" id="check_show_query">
- <property name="label" translatable="yes">Show query</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_check_show_query_toggled" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_query">
- <property name="height_request">36</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="textview_query">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox368">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkButton" id="button_search">
- <property name="label">gtk-find</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_search_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table72">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label758">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Results:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label759">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Average:</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_results_num">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_results_avg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_results_num_units">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </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"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_results_avg_units">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </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"/>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Query</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">8</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox46">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton" id="button_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkWindow" id="person_win">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -28154,6 +27539,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -28621,6 +28012,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 2f8cd29..c99c9f7 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -79,24 +79,34 @@ public partial class ChronoJumpWindow
[Widget] Gtk.TreeView treeview_reaction_times;
[Widget] Gtk.TreeView treeview_pulses;
[Widget] Gtk.TreeView treeview_multi_chronopic;
+
[Widget] Gtk.Box hbox_combo_select_jumps;
- [Widget] Gtk.Box hbox_combo_result_jumps;
[Widget] Gtk.Box hbox_combo_select_jumps_rj;
+ [Widget] Gtk.Box hbox_combo_select_runs;
+ [Widget] Gtk.Box hbox_combo_select_runs_interval;
+
+ [Widget] Gtk.Box hbox_combo_result_jumps;
[Widget] Gtk.Box hbox_combo_result_jumps_rj;
- [Widget] Gtk.Box hbox_combo_runs;
- [Widget] Gtk.Box hbox_combo_runs_interval;
+ [Widget] Gtk.Box hbox_combo_result_runs;
+ [Widget] Gtk.Box hbox_combo_result_runs_interval;
+
[Widget] Gtk.Box hbox_combo_pulses;
[Widget] Gtk.Box hbox_jumps;
[Widget] Gtk.Box hbox_jumps_rj;
- [Widget] Gtk.Table table_runs;
+ [Widget] Gtk.Box hbox_runs;
[Widget] Gtk.Box hbox_runs_interval;
[Widget] Gtk.Box hbox_pulses;
+
[Widget] Gtk.ComboBox combo_select_jumps;
- [Widget] Gtk.ComboBox combo_result_jumps;
[Widget] Gtk.ComboBox combo_select_jumps_rj;
+ [Widget] Gtk.ComboBox combo_select_runs;
+ [Widget] Gtk.ComboBox combo_select_runs_interval;
+
+ [Widget] Gtk.ComboBox combo_result_jumps;
[Widget] Gtk.ComboBox combo_result_jumps_rj;
- [Widget] Gtk.ComboBox combo_runs;
- [Widget] Gtk.ComboBox combo_runs_interval;
+ [Widget] Gtk.ComboBox combo_result_runs;
+ [Widget] Gtk.ComboBox combo_result_runs_interval;
+
[Widget] Gtk.ComboBox combo_pulses;
//menus
@@ -485,11 +495,15 @@ public partial class ChronoJumpWindow
createTreeView_multi_chronopic (treeview_multi_chronopic);
createComboSelectJumps(true);
- createComboResultJumps();
createComboSelectJumpsRj(true);
+ createComboSelectRuns(true);
+ createComboSelectRunsInterval(true);
+
+ createComboResultJumps();
createComboResultJumpsRj();
- createComboRuns();
- createComboRunsInterval();
+ createComboResultRuns();
+ createComboResultRunsInterval();
+
//reaction_times has no combo
createComboPulses();
//createComboMultiChronopic();
@@ -625,48 +639,6 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameMultiChronopic);
image_mode_multi_chronopic_small.Pixbuf = pixbuf;
-
- //runs changes
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_custom);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_20m);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_100m);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_200m);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_400m);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_gesell);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_20yard);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_505);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_illinois);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_margaria);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_shuttle);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_zigzag);
-
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_more);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_custom);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_20m);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_100m);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_200m);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_400m);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_gesell);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_20yard);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_505);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_illinois);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_margaria);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_shuttle);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_zigzag);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_more);
-
- //runs intervalchanges
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_interval_by_laps);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_interval_by_time);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_interval_unlimited);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_interval_mtgug);
- UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_run_interval_more);
-
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_interval_by_laps);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_interval_by_time);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_interval_unlimited);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_interval_mtgug);
- UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_run_interval_more);
//reaction times changes
UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
@@ -2069,6 +2041,10 @@ public partial class ChronoJumpWindow
string [] selectJumpsString;
string [] selectJumpsRjString;
+ string [] selectRunsString;
+ string [] selectRunsIntervalString;
+
+ // ---------------- combo_select ----------------------
private void createComboSelectJumps(bool create) {
if(create)
@@ -2099,20 +2075,6 @@ public partial class ChronoJumpWindow
}
}
- private void createComboResultJumps() {
- combo_result_jumps = ComboBox.NewText ();
- UtilGtk.ComboUpdate(combo_result_jumps,
- SqliteJumpType.SelectJumpTypes(Constants.AllJumpsName, "", true), //with
alljumpsname, without filter, only select name
- "");
-
- combo_result_jumps.Active = 0;
- combo_result_jumps.Changed += new EventHandler (on_combo_result_jumps_changed);
-
- hbox_combo_result_jumps.PackStart(combo_result_jumps, true, true, 0);
- hbox_combo_result_jumps.ShowAll();
- combo_result_jumps.Sensitive = false;
- }
-
private void createComboSelectJumpsRj(bool create) {
if(create)
combo_select_jumps_rj = ComboBox.NewText ();
@@ -2143,6 +2105,82 @@ public partial class ChronoJumpWindow
}
}
+ private void createComboSelectRuns(bool create) {
+ if(create)
+ combo_select_runs = ComboBox.NewText ();
+
+ string [] runTypes = SqliteRunType.SelectRunTypes("", false); //without allrunsname, not only
name
+ selectRunsString = new String [runTypes.Length];
+ string [] runNamesToCombo = new String [runTypes.Length];
+ int i =0;
+ foreach(string runType in runTypes) {
+ string [] j = runType.Split(new char[] {':'});
+ string nameTranslated = Catalog.GetString(j[1]);
+ selectRunsString[i] =
+ j[0] + ":" + j[1] + ":" + nameTranslated + ":" + //uniqueID, name,
nameTranslated
+ j[2] + ":" + j[3]; //distance,
description
+ runNamesToCombo[i] = nameTranslated;
+ i++;
+ }
+
+ UtilGtk.ComboUpdate(combo_select_runs, runNamesToCombo, "");
+ combo_select_runs.Active = 0;
+ combo_select_runs.Changed += new EventHandler (on_combo_select_runs_changed);
+
+ if(create) {
+ hbox_combo_select_runs.PackStart(combo_select_runs, true, true, 0);
+ hbox_combo_select_runs.ShowAll();
+ combo_select_runs.Sensitive = false;
+ }
+ }
+
+ private void createComboSelectRunsInterval(bool create) {
+ if(create)
+ combo_select_runs_interval = ComboBox.NewText ();
+
+ string [] runTypes = SqliteRunIntervalType.SelectRunIntervalTypes("", false); //without
allrunsname, not only name
+ selectRunsIntervalString = new String [runTypes.Length];
+ string [] runNamesToCombo = new String [runTypes.Length];
+ int i =0;
+ foreach(string runType in runTypes) {
+ string [] j = runType.Split(new char[] {':'});
+ string nameTranslated = Catalog.GetString(j[1]);
+ selectRunsIntervalString[i] =
+ j[0] + ":" + j[1] + ":" + nameTranslated + ":" + //uniqueID, name,
nameTranslated
+ j[2] + ":" + j[3] + ":" + j[4] + ":" + //distance,
tracksLimited, fixedValue
+ j[5] + ":" + j[6] + ":" + j[6]; //unlimited,
description, distancesString
+ runNamesToCombo[i] = nameTranslated;
+ i++;
+ }
+
+ UtilGtk.ComboUpdate(combo_select_runs_interval, runNamesToCombo, "");
+ combo_select_runs_interval.Active = 0;
+ combo_select_runs_interval.Changed += new EventHandler
(on_combo_select_runs_interval_changed);
+
+ if(create) {
+ hbox_combo_select_runs_interval.PackStart(combo_select_runs_interval, true, true, 0);
+ hbox_combo_select_runs_interval.ShowAll();
+ combo_select_runs_interval.Sensitive = false;
+ }
+ }
+
+
+ // ---------------- combo_result ----------------------
+
+ private void createComboResultJumps() {
+ combo_result_jumps = ComboBox.NewText ();
+ UtilGtk.ComboUpdate(combo_result_jumps,
+ SqliteJumpType.SelectJumpTypes(Constants.AllJumpsName, "", true), //with
alljumpsname, without filter, only select name
+ "");
+
+ combo_result_jumps.Active = 0;
+ combo_result_jumps.Changed += new EventHandler (on_combo_result_jumps_changed);
+
+ hbox_combo_result_jumps.PackStart(combo_result_jumps, true, true, 0);
+ hbox_combo_result_jumps.ShowAll();
+ combo_result_jumps.Sensitive = false;
+ }
+
private void createComboResultJumpsRj() {
combo_result_jumps_rj = ComboBox.NewText();
UtilGtk.ComboUpdate(combo_result_jumps_rj,
SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), ""); //only select name
@@ -2155,28 +2193,28 @@ public partial class ChronoJumpWindow
combo_result_jumps_rj.Sensitive = false;
}
- private void createComboRuns() {
- combo_runs = ComboBox.NewText();
- UtilGtk.ComboUpdate(combo_runs, SqliteRunType.SelectRunTypes(Constants.AllRunsName, true),
""); //without filter, only select name
+ private void createComboResultRuns() {
+ combo_result_runs = ComboBox.NewText();
+ UtilGtk.ComboUpdate(combo_result_runs, SqliteRunType.SelectRunTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
- combo_runs.Active = 0;
- combo_runs.Changed += new EventHandler (on_combo_runs_changed);
+ combo_result_runs.Active = 0;
+ combo_result_runs.Changed += new EventHandler (on_combo_result_runs_changed);
- hbox_combo_runs.PackStart(combo_runs, true, true, 0);
- hbox_combo_runs.ShowAll();
- combo_runs.Sensitive = false;
+ hbox_combo_result_runs.PackStart(combo_result_runs, true, true, 0);
+ hbox_combo_result_runs.ShowAll();
+ combo_result_runs.Sensitive = false;
}
- private void createComboRunsInterval() {
- combo_runs_interval = ComboBox.NewText();
- UtilGtk.ComboUpdate(combo_runs_interval,
SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName, true), ""); //without filter, only select
name
+ private void createComboResultRunsInterval() {
+ combo_result_runs_interval = ComboBox.NewText();
+ UtilGtk.ComboUpdate(combo_result_runs_interval,
SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName, true), ""); //without filter, only select
name
- combo_runs_interval.Active = 0;
- combo_runs_interval.Changed += new EventHandler (on_combo_runs_interval_changed);
+ combo_result_runs_interval.Active = 0;
+ combo_result_runs_interval.Changed += new EventHandler
(on_combo_result_runs_interval_changed);
- hbox_combo_runs_interval.PackStart(combo_runs_interval, true, true, 0);
- hbox_combo_runs_interval.ShowAll();
- combo_runs_interval.Sensitive = false;
+ hbox_combo_result_runs_interval.PackStart(combo_result_runs_interval, true, true, 0);
+ hbox_combo_result_runs_interval.ShowAll();
+ combo_result_runs_interval.Sensitive = false;
}
//no need of reationTimes
@@ -2202,6 +2240,9 @@ public partial class ChronoJumpWindow
}
*/
+
+ // -------------- combo select tests changed --------
+
private void on_combo_select_jumps_changed(object o, EventArgs args) {
ComboBox combo = o as ComboBox;
if (o == null)
@@ -2213,19 +2254,29 @@ public partial class ChronoJumpWindow
on_extra_window_jumps_test_changed(o, args);
}
- private void on_combo_result_jumps_changed(object o, EventArgs args) {
- //combo_result_jumps.Changed -= new EventHandler (on_combo_result_jumps_changed);
+ private void on_combo_select_jumps_rj_changed(object o, EventArgs args) {
+ ComboBox combo = o as ComboBox;
+ if (o == null)
+ return;
+ string myText = UtilGtk.ComboGetActive(combo);
+ Log.WriteLine("Selected: " + myText);
+ //show extra window options
+ on_extra_window_jumps_rj_test_changed(o, args);
+ }
+
+ private void on_combo_select_runs_changed(object o, EventArgs args) {
ComboBox combo = o as ComboBox;
if (o == null)
return;
string myText = UtilGtk.ComboGetActive(combo);
+ Log.WriteLine("Selected: " + myText);
- treeview_jumps_storeReset();
- fillTreeView_jumps(myText);
+ //show extra window options
+ on_extra_window_runs_test_changed(o, args);
}
- private void on_combo_select_jumps_rj_changed(object o, EventArgs args) {
+ private void on_combo_select_runs_interval_changed(object o, EventArgs args) {
ComboBox combo = o as ComboBox;
if (o == null)
return;
@@ -2233,9 +2284,24 @@ public partial class ChronoJumpWindow
Log.WriteLine("Selected: " + myText);
//show extra window options
- on_extra_window_jumps_rj_test_changed(o, args);
+ on_extra_window_runs_interval_test_changed(o, args);
}
+ // -------------- combo result tests changed --------
+
+ private void on_combo_result_jumps_changed(object o, EventArgs args) {
+ //combo_result_jumps.Changed -= new EventHandler (on_combo_result_jumps_changed);
+
+ ComboBox combo = o as ComboBox;
+ if (o == null)
+ return;
+ string myText = UtilGtk.ComboGetActive(combo);
+
+ treeview_jumps_storeReset();
+ fillTreeView_jumps(myText);
+ }
+
+
private void on_combo_result_jumps_rj_changed(object o, EventArgs args) {
//combo_result_jumps_rj.Changed -= new EventHandler (on_combo_result_jumps_rj_changed);
@@ -2248,8 +2314,8 @@ public partial class ChronoJumpWindow
fillTreeView_jumps_rj(myText);
}
- private void on_combo_runs_changed(object o, EventArgs args) {
- //combo_runs.Changed -= new EventHandler (on_combo_runs_changed);
+ private void on_combo_result_runs_changed(object o, EventArgs args) {
+ //combo_result_runs.Changed -= new EventHandler (on_combo_result_runs_changed);
ComboBox combo = o as ComboBox;
if (o == null)
@@ -2260,8 +2326,8 @@ public partial class ChronoJumpWindow
fillTreeView_runs(myText);
}
- private void on_combo_runs_interval_changed(object o, EventArgs args) {
- //combo_runs_interval.Changed -= new EventHandler (on_combo_runs_interval_changed);
+ private void on_combo_result_runs_interval_changed(object o, EventArgs args) {
+ //combo_result_runs_interval.Changed -= new EventHandler
(on_combo_result_runs_interval_changed);
ComboBox combo = o as ComboBox;
if (o == null)
@@ -2653,8 +2719,8 @@ public partial class ChronoJumpWindow
on_combo_result_jumps_changed(combo_result_jumps, args);
on_combo_result_jumps_rj_changed(combo_result_jumps_rj, args);
- on_combo_runs_changed(combo_runs, args);
- on_combo_runs_interval_changed(combo_runs_interval, args);
+ on_combo_result_runs_changed(combo_result_runs, args);
+ on_combo_result_runs_interval_changed(combo_result_runs_interval, args);
on_combo_pulses_changed(combo_pulses, args);
if(createdStatsWin) {
@@ -2866,8 +2932,8 @@ public partial class ChronoJumpWindow
on_combo_result_jumps_changed(combo_result_jumps, args);
on_combo_result_jumps_rj_changed(combo_result_jumps_rj, args);
- on_combo_runs_changed(combo_runs, args);
- on_combo_runs_interval_changed(combo_runs_interval, args);
+ on_combo_result_runs_changed(combo_result_runs, args);
+ on_combo_result_runs_interval_changed(combo_result_runs_interval, args);
on_combo_pulses_changed(combo_pulses, args);
//currently no combo_reaction_times
@@ -4667,7 +4733,7 @@ Console.WriteLine("X");
myTreeViewRuns.Update(myRun);
else {
treeview_runs_storeReset();
- fillTreeView_runs(UtilGtk.ComboGetActive(combo_runs));
+ fillTreeView_runs(UtilGtk.ComboGetActive(combo_result_runs));
}
if(createdStatsWin)
@@ -4684,7 +4750,7 @@ Console.WriteLine("X");
myTreeViewRunsInterval.Update(myRun);
else {
treeview_runs_interval_storeReset();
- fillTreeView_runs_interval(UtilGtk.ComboGetActive(combo_runs_interval));
+ fillTreeView_runs_interval(UtilGtk.ComboGetActive(combo_result_runs_interval));
}
if(createdStatsWin)
@@ -5260,8 +5326,8 @@ Console.WriteLine("X");
}
updateComboStats();
combo_select_jumps.Active = 0;
- combo_result_jumps.Active = 0;
combo_select_jumps_rj.Active = 0;
+ combo_result_jumps.Active = 0;
combo_result_jumps_rj.Active = 0;
}
@@ -5282,15 +5348,23 @@ Console.WriteLine("X");
private void on_run_type_add_accepted (object o, EventArgs args) {
Log.WriteLine("ACCEPTED Add new run type");
if(runTypeAddWin.InsertedSimple) {
- UtilGtk.ComboUpdate(combo_runs, SqliteRunType.SelectRunTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
+ createComboSelectRuns(false); //this will update also the selectRunsString
+
+ UtilGtk.ComboUpdate(combo_result_runs,
+ SqliteRunType.SelectRunTypes(Constants.AllRunsName, true), "");
//without filter, only select name
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple
run."));
} else {
- UtilGtk.ComboUpdate(combo_runs_interval,
SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName, true), ""); //without filter, only select
name
+ createComboSelectRunsInterval(false); //this will update also the
selectRunsIntervalString
+
+ UtilGtk.ComboUpdate(combo_result_runs_interval,
+ SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added intervallic
run."));
}
updateComboStats();
- combo_runs.Active = 0;
- combo_runs_interval.Active = 0;
+ combo_select_runs.Active = 0;
+ combo_select_runs_interval.Active = 0;
+ combo_result_runs.Active = 0;
+ combo_result_runs_interval.Active = 0;
}
//reactiontime has no types
@@ -5319,13 +5393,13 @@ Console.WriteLine("X");
}
private void on_run_type_delete_simple (object o, EventArgs args) {
- runsMoreWin = RunsMoreWindow.Show(app1, false, currentRunType.Name); //delete run type
- runsMoreWin.Button_deleted_current_test.Clicked += new
EventHandler(on_deleted_current_run_type);
+ runsMoreWin = RunsMoreWindow.Show(app1, false); //delete run type
+ runsMoreWin.Button_deleted_test.Clicked += new EventHandler(on_deleted_run_type);
}
private void on_run_type_delete_intervallic (object o, EventArgs args) {
- runsIntervalMoreWin = RunsIntervalMoreWindow.Show(app1, false, currentRunIntervalType.Name);
//delete run type
- runsIntervalMoreWin.Button_deleted_current_test.Clicked += new
EventHandler(on_deleted_current_run_i_type);
+ runsIntervalMoreWin = RunsIntervalMoreWindow.Show(app1, false); //delete run type
+ runsIntervalMoreWin.Button_deleted_test.Clicked += new EventHandler(on_deleted_run_i_type);
}
//----
@@ -5362,11 +5436,11 @@ Console.WriteLine("X");
extra_window_jumps_rj_initialize(new JumpType("RJ(j)"));
}
- private void on_deleted_current_run_type (object o, EventArgs args) {
- extra_window_runs_toggle_desired_button_on_toolbar(new RunType("Custom"));
+ private void on_deleted_run_type (object o, EventArgs args) {
+ extra_window_runs_initialize(new RunType("Custom"));
}
- private void on_deleted_current_run_i_type (object o, EventArgs args) {
- extra_window_runs_interval_toggle_desired_button_on_toolbar(new RunType("byLaps"));
+ private void on_deleted_run_i_type (object o, EventArgs args) {
+ extra_window_runs_interval_initialize(new RunType("byLaps"));
}
/* ---------------------------------------------------------
@@ -5420,7 +5494,7 @@ Console.WriteLine("X");
Log.WriteLine("repair selected run interval accepted");
treeview_runs_interval_storeReset();
- fillTreeView_runs_interval(UtilGtk.ComboGetActive(combo_runs_interval));
+ fillTreeView_runs_interval(UtilGtk.ComboGetActive(combo_result_runs_interval));
if(createdStatsWin) {
stats_win_fillTreeView_stats(false, false);
@@ -5713,8 +5787,10 @@ Console.WriteLine("X");
combo_result_jumps.Sensitive = true;
combo_select_jumps_rj.Sensitive = true;
combo_result_jumps_rj.Sensitive = true;
- combo_runs.Sensitive = true;
- combo_runs_interval.Sensitive = true;
+ combo_select_runs.Sensitive = true;
+ combo_result_runs.Sensitive = true;
+ combo_select_runs_interval.Sensitive = true;
+ combo_result_runs_interval.Sensitive = true;
combo_pulses.Sensitive = true;
hbox_execute_test.Sensitive = true;
@@ -5736,7 +5812,7 @@ Console.WriteLine("X");
//hbox
hbox_jumps.Sensitive = false;
hbox_jumps_rj.Sensitive = false;
- table_runs.Sensitive = false;
+ hbox_runs.Sensitive = false;
hbox_runs_interval.Sensitive = false;
hbox_pulses.Sensitive = false;
vbox_this_test_buttons.Sensitive = false;
@@ -5750,39 +5826,29 @@ Console.WriteLine("X");
}
private void sensitiveGuiEventDone () {
-Log.WriteLine("1");
session_menuitem.Sensitive = true;
help_menuitem.Sensitive = true;
-Log.WriteLine("2");
viewport_mode_small.Sensitive = true;
frame_persons.Sensitive = true;
-Log.WriteLine("3");
button_execute_test.Sensitive = true;
-Log.WriteLine("4");
encoderButtonsSensitive(encoderSensEnum.DONENOSIGNAL);
-Log.WriteLine("5");
//hbox
hbox_jumps.Sensitive = true;
hbox_jumps_rj.Sensitive = true;
- table_runs.Sensitive = true;
-Log.WriteLine("6");
+ hbox_runs.Sensitive = true;
hbox_runs_interval.Sensitive = true;
hbox_pulses.Sensitive = true;
//hbox_multi_chronopic_buttons.Sensitive = true;
vbox_this_test_buttons.Sensitive = true;
-Log.WriteLine("7");
button_upload_session.Sensitive = true;
button_activate_chronopics.Sensitive = true;
-Log.WriteLine("8");
notebook_options.Sensitive = true;
-Log.WriteLine("8.5");
event_execute_button_update.Sensitive = true;
-Log.WriteLine("9");
//allow repeat last jump or run (check also if it wasn't cancelled)
if(! currentEventExecute.Cancel) {
switch (currentEventType.Type) {
@@ -5800,7 +5866,6 @@ Log.WriteLine("9");
break;
}
}
-Log.WriteLine("10");
}
private void showHideActionEventButtons(bool show, string type) {
diff --git a/src/gui/event.cs b/src/gui/event.cs
index adcf083..c6d919d 100644
--- a/src/gui/event.cs
+++ b/src/gui/event.cs
@@ -591,17 +591,15 @@ public class EventMoreWindow
protected string selectedEventName;
protected string selectedDescription;
public Gtk.Button button_selected;
- public Gtk.Button button_deleted_current_test; //just to send a signal //deprecated, now signal is
sent always to update combos, use button_deleted_test
public Gtk.Button button_deleted_test; //just to send a signal
protected bool testOrDelete; //are we going to do a test or to delete a test type (test is true)
- protected string selectedTestOnMainWindow;
protected string [] typesTranslated;
public EventMoreWindow () {
}
- public EventMoreWindow (Gtk.Window parent, bool testOrDelete, string selectedTestOnMainWindow) {
+ public EventMoreWindow (Gtk.Window parent, bool testOrDelete) {
/*
Glade.XML gladeXML;
gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", "chronojump");
@@ -617,7 +615,6 @@ public class EventMoreWindow
protected void initializeThings()
{
button_selected = new Gtk.Button();
- button_deleted_current_test = new Gtk.Button();
button_deleted_test = new Gtk.Button();
createTreeView(treeview_more);
@@ -722,11 +719,6 @@ public class EventMoreWindow
get { return button_selected; }
}
- public Button Button_deleted_current_test
- {
- get { return button_deleted_current_test; }
- }
-
public Button Button_deleted_test
{
get { return button_deleted_test; }
diff --git a/src/gui/multiChronopic.cs b/src/gui/multiChronopic.cs
index ed90629..33121ca 100644
--- a/src/gui/multiChronopic.cs
+++ b/src/gui/multiChronopic.cs
@@ -36,8 +36,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_extra_window_radio_multichronopic_start;
[Widget] Gtk.Label label_extra_window_radio_multichronopic_run_analysis;
- [Widget] Gtk.Label extra_window_multichronopic_label_selected;
-
[Widget] Gtk.TextView extra_window_textview_multichronopic_need_two;
[Widget] Gtk.CheckButton extra_window_check_multichronopic_sync;
@@ -67,9 +65,6 @@ public partial class ChronoJumpWindow
private void extra_window_multichronopic_initialize(MultiChronopicType myMultiChronopicType)
{
- extra_window_multichronopic_label_selected.Text = "<b>" +
- Catalog.GetString(myMultiChronopicType.Name) + "</b>";
- extra_window_multichronopic_label_selected.UseMarkup = true;
currentEventType = myMultiChronopicType;
changeTestImage(EventType.Types.MULTICHRONOPIC.ToString(),
myMultiChronopicType.Name, myMultiChronopicType.ImageFileName);
diff --git a/src/gui/pulse.cs b/src/gui/pulse.cs
index 8b66cf2..ee0ddf9 100644
--- a/src/gui/pulse.cs
+++ b/src/gui/pulse.cs
@@ -127,8 +127,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_extra_window_radio_pulses_custom;
[Widget] Gtk.Label label_extra_window_radio_pulses_free;
- [Widget] Gtk.Label extra_window_pulses_label_selected;
-
[Widget] Gtk.VBox extra_window_pulses_vbox;
[Widget] Gtk.SpinButton extra_window_pulses_spinbutton_pulse_step;
[Widget] Gtk.SpinButton extra_window_pulses_spinbutton_ppm;
@@ -152,8 +150,6 @@ public partial class ChronoJumpWindow
private void extra_window_pulses_initialize(PulseType myPulseType)
{
- extra_window_pulses_label_selected.Text = "<b>" + Catalog.GetString(myPulseType.Name) +
"</b>";
- extra_window_pulses_label_selected.UseMarkup = true;
currentEventType = myPulseType;
changeTestImage(EventType.Types.PULSE.ToString(), myPulseType.Name,
myPulseType.ImageFileName);
bool hasOptions = false;
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 4750bc1..2f0f76a 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -888,57 +888,6 @@ public class RepairRunIntervalWindow
partial class ChronoJumpWindow
{
-
- //runs
- //labels notebook_execute
- [Widget] Gtk.Label label_extra_window_radio_run_custom;
- [Widget] Gtk.Label label_extra_window_radio_run_20m;
- [Widget] Gtk.Label label_extra_window_radio_run_100m;
- [Widget] Gtk.Label label_extra_window_radio_run_200m;
- [Widget] Gtk.Label label_extra_window_radio_run_400m;
- [Widget] Gtk.Label label_extra_window_radio_run_gesell;
- [Widget] Gtk.Label label_extra_window_radio_run_20yard;
- [Widget] Gtk.Label label_extra_window_radio_run_505;
- [Widget] Gtk.Label label_extra_window_radio_run_illinois;
- [Widget] Gtk.Label label_extra_window_radio_run_margaria;
- [Widget] Gtk.Label label_extra_window_radio_run_shuttle;
- [Widget] Gtk.Label label_extra_window_radio_run_zigzag;
- [Widget] Gtk.Label label_extra_window_radio_run_more;
-
- //radio notebook_execute
- [Widget] Gtk.RadioButton extra_window_radio_run_custom;
- [Widget] Gtk.RadioButton extra_window_radio_run_20m;
- [Widget] Gtk.RadioButton extra_window_radio_run_100m;
- [Widget] Gtk.RadioButton extra_window_radio_run_200m;
- [Widget] Gtk.RadioButton extra_window_radio_run_400m;
- [Widget] Gtk.RadioButton extra_window_radio_run_gesell;
- [Widget] Gtk.RadioButton extra_window_radio_run_20yard;
- [Widget] Gtk.RadioButton extra_window_radio_run_505;
- [Widget] Gtk.RadioButton extra_window_radio_run_illinois;
- [Widget] Gtk.RadioButton extra_window_radio_run_margaria;
- [Widget] Gtk.RadioButton extra_window_radio_run_shuttle;
- [Widget] Gtk.RadioButton extra_window_radio_run_zigzag;
- [Widget] Gtk.RadioButton extra_window_radio_run_t_test;
- [Widget] Gtk.RadioButton extra_window_radio_run_more;
-
- //runs interval
- //labels notebook_execute
- [Widget] Gtk.Label label_extra_window_radio_run_interval_by_laps;
- [Widget] Gtk.Label label_extra_window_radio_run_interval_by_time;
- [Widget] Gtk.Label label_extra_window_radio_run_interval_unlimited;
- [Widget] Gtk.Label label_extra_window_radio_run_interval_mtgug;
- [Widget] Gtk.Label label_extra_window_radio_run_interval_rsa_test_1;
- [Widget] Gtk.Label label_extra_window_radio_run_interval_more;
-
- //radio notebook_execute
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_by_laps;
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_by_time;
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_unlimited;
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_mtgug;
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_3l3r;
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_rsa_test_1;
- [Widget] Gtk.RadioButton extra_window_radio_run_interval_more;
-
//options runs
[Widget] Gtk.Label extra_window_runs_label_distance;
[Widget] Gtk.SpinButton extra_window_runs_spinbutton_distance;
@@ -973,10 +922,6 @@ partial class ChronoJumpWindow
[Widget] Gtk.RadioButton radio_runs_i_speed_start_leaving;
- //selected test labels
- [Widget] Gtk.Label extra_window_runs_label_selected;
- [Widget] Gtk.Label extra_window_runs_interval_label_selected;
-
double extra_window_runs_distance = 100;
double extra_window_runs_interval_distance = 100;
double extra_window_runs_interval_limit = 10;
@@ -987,20 +932,9 @@ partial class ChronoJumpWindow
private void on_extra_window_runs_test_changed(object o, EventArgs args)
{
- if(extra_window_radio_run_custom.Active) currentRunType = new RunType("Custom");
- else if(extra_window_radio_run_20m.Active) currentRunType = new RunType("20m");
- else if(extra_window_radio_run_100m.Active) currentRunType = new RunType("100m");
- else if(extra_window_radio_run_200m.Active) currentRunType = new RunType("200m");
- else if(extra_window_radio_run_400m.Active) currentRunType = new RunType("400m");
- else if(extra_window_radio_run_gesell.Active) currentRunType = new RunType("Gesell-DBT");
- else if(extra_window_radio_run_20yard.Active) currentRunType = new RunType("Agility-20Yard");
- else if(extra_window_radio_run_505.Active) currentRunType = new RunType("Agility-505");
- else if(extra_window_radio_run_illinois.Active) currentRunType = new
RunType("Agility-Illinois");
- else if(extra_window_radio_run_margaria.Active) currentRunType = new RunType("Margaria");
- else if(extra_window_radio_run_shuttle.Active) currentRunType = new
RunType("Agility-Shuttle-Run");
- else if(extra_window_radio_run_zigzag.Active) currentRunType = new RunType("Agility-ZigZag");
- else if(extra_window_radio_run_t_test.Active) currentRunType = new RunType("Agility-T-Test");
-
+ string runEnglishName = Util.FindOnArray(':',2,1, UtilGtk.ComboGetActive(combo_select_runs),
selectRunsString);
+ currentRunType = new RunType(runEnglishName);
+
extra_window_runs_initialize(currentRunType);
}
@@ -1008,23 +942,17 @@ partial class ChronoJumpWindow
{
previousRunType = currentRunType;
- if(extra_window_radio_run_more.Active) {
- runsMoreWin = RunsMoreWindow.Show(app1, true, currentRunType.Name);
- runsMoreWin.Button_accept.Clicked += new EventHandler(on_more_runs_accepted);
- runsMoreWin.Button_cancel.Clicked += new EventHandler(on_more_runs_cancelled);
- runsMoreWin.Button_selected.Clicked += new EventHandler(on_more_runs_draw_image_test);
- }
+ runsMoreWin = RunsMoreWindow.Show(app1, true);
+ runsMoreWin.Button_accept.Clicked += new EventHandler(on_more_runs_accepted);
+ runsMoreWin.Button_cancel.Clicked += new EventHandler(on_more_runs_cancelled);
+ runsMoreWin.Button_selected.Clicked += new EventHandler(on_more_runs_update_test);
}
private void on_extra_window_runs_interval_test_changed(object o, EventArgs args)
{
- if(extra_window_radio_run_interval_by_laps.Active) currentRunIntervalType = new
RunType("byLaps");
- else if(extra_window_radio_run_interval_by_time.Active) currentRunIntervalType = new
RunType("byTime");
- else if(extra_window_radio_run_interval_unlimited.Active) currentRunIntervalType = new
RunType("unlimited");
- else if(extra_window_radio_run_interval_mtgug.Active) currentRunIntervalType = new
RunType("MTGUG");
- else if(extra_window_radio_run_interval_3l3r.Active) currentRunIntervalType = new
RunType("Agility-3L3R");
- //else if(extra_window_radio_run_interval_rsa_test_1.Active) currentRunIntervalType = new
RunType("RSA 8-4-R3-5");
-
+ string runEnglishName = Util.FindOnArray(':',2,1,
UtilGtk.ComboGetActive(combo_select_runs_interval), selectRunsIntervalString);
+ currentRunIntervalType = new RunType(runEnglishName);
+
extra_window_runs_interval_initialize(currentRunIntervalType);
}
@@ -1032,18 +960,14 @@ partial class ChronoJumpWindow
{
previousRunIntervalType = currentRunIntervalType;
- if(extra_window_radio_run_interval_more.Active) {
- runsIntervalMoreWin = RunsIntervalMoreWindow.Show(app1, true,
currentRunIntervalType.Name);
- runsIntervalMoreWin.Button_accept.Clicked += new
EventHandler(on_more_runs_interval_accepted);
- runsIntervalMoreWin.Button_cancel.Clicked += new
EventHandler(on_more_runs_interval_cancelled);
- runsIntervalMoreWin.Button_selected.Clicked += new
EventHandler(on_more_runs_interval_draw_image_test);
- }
+ runsIntervalMoreWin = RunsIntervalMoreWindow.Show(app1, true);
+ runsIntervalMoreWin.Button_accept.Clicked += new EventHandler(on_more_runs_interval_accepted);
+ runsIntervalMoreWin.Button_cancel.Clicked += new
EventHandler(on_more_runs_interval_cancelled);
+ runsIntervalMoreWin.Button_selected.Clicked += new
EventHandler(on_more_runs_interval_update_test);
}
private void extra_window_runs_initialize(RunType myRunType)
{
- extra_window_runs_label_selected.Text = "<b>" + Catalog.GetString(myRunType.Name) + "</b>";
- extra_window_runs_label_selected.UseMarkup = true;
currentEventType = myRunType;
changeTestImage(EventType.Types.RUN.ToString(), myRunType.Name, myRunType.ImageFileName);
bool hasOptions = false;
@@ -1072,8 +996,6 @@ partial class ChronoJumpWindow
private void extra_window_runs_interval_initialize(RunType myRunType)
{
- extra_window_runs_interval_label_selected.Text = "<b>" + Catalog.GetString(myRunType.Name) +
"</b>";
- extra_window_runs_interval_label_selected.UseMarkup = true;
currentEventType = myRunType;
changeTestImage(EventType.Types.RUN.ToString(), myRunType.Name, myRunType.ImageFileName);
bool hasOptions = false;
@@ -1113,14 +1035,18 @@ partial class ChronoJumpWindow
extra_window_runs_showNoOptions(myRunType, hasOptions);
}
- private void on_more_runs_draw_image_test (object o, EventArgs args) {
+ private void on_more_runs_update_test (object o, EventArgs args) {
currentEventType = new RunType(runsMoreWin.SelectedEventName);
- changeTestImage(currentEventType.Type.ToString(), currentEventType.Name,
currentEventType.ImageFileName);
+ string runTranslatedName = Util.FindOnArray(':',1,2, runsMoreWin.SelectedEventName,
selectRunsString);
+
+ combo_select_runs.Active = UtilGtk.ComboMakeActive(combo_select_runs, runTranslatedName);
}
- private void on_more_runs_interval_draw_image_test (object o, EventArgs args) {
+ private void on_more_runs_interval_update_test (object o, EventArgs args) {
currentEventType = new RunType(runsIntervalMoreWin.SelectedEventName);
- changeTestImage(currentEventType.Type.ToString(), currentEventType.Name,
currentEventType.ImageFileName);
+ string runTranslatedName = Util.FindOnArray(':',1,2, runsIntervalMoreWin.SelectedEventName,
selectRunsIntervalString);
+
+ combo_select_runs_interval.Active = UtilGtk.ComboMakeActive(combo_select_runs_interval,
runTranslatedName);
}
@@ -1129,19 +1055,9 @@ partial class ChronoJumpWindow
{
runsMoreWin.Button_accept.Clicked -= new EventHandler(on_more_runs_accepted);
- currentRunType = new RunType(
- runsMoreWin.SelectedEventName, //name
- false, //hasIntervals
- runsMoreWin.SelectedDistance, //distance
- false, //tracksLimited (false, because has not
intervals)
- 0, //fixedValue (0, because has not intervals)
- false, //unlimited (false, because has not intervals)
- runsMoreWin.SelectedDescription,
- "", // distancesstring (deactivated now, TODO: activate)
- SqliteEvent.GraphLinkSelectFileName("run", runsMoreWin.SelectedEventName)
- );
+ currentRunType = new RunType(runsMoreWin.SelectedEventName);
- extra_window_runs_toggle_desired_button_on_toolbar(currentRunType);
+ extra_window_runs_initialize(currentRunType);
//destroy the win for not having updating problems if a new run type is created
runsMoreWin.Destroy();
@@ -1151,89 +1067,25 @@ partial class ChronoJumpWindow
{
runsIntervalMoreWin.Button_accept.Clicked -= new EventHandler(on_more_runs_interval_accepted);
- currentRunIntervalType = new RunType(
- runsIntervalMoreWin.SelectedEventName, //name
- true, //hasIntervals
- runsIntervalMoreWin.SelectedDistance,
- runsIntervalMoreWin.SelectedTracksLimited,
- runsIntervalMoreWin.SelectedLimitedValue,
- runsIntervalMoreWin.SelectedUnlimited,
- runsIntervalMoreWin.SelectedDescription,
- runsIntervalMoreWin.SelectedDistancesString,
- SqliteEvent.GraphLinkSelectFileName(Constants.RunIntervalTable,
runsIntervalMoreWin.SelectedEventName)
- );
+ currentRunIntervalType = new RunType(runsIntervalMoreWin.SelectedEventName);
- /*
- bool unlimited = false;
- if(runsIntervalMoreWin.SelectedUnlimited)
- unlimited = true;
- */
-
- extra_window_runs_interval_toggle_desired_button_on_toolbar(currentRunIntervalType);
+ extra_window_runs_interval_initialize(currentRunIntervalType);
//destroy the win for not having updating problems if a new runInterval type is created
runsIntervalMoreWin.Destroy();
-
- /*
- //go to run extra if we need something to define
- if( currentRunType.Distance == 0 ||
- //(currentRunType.FixedValue == 0 && ! runsIntervalMoreWin.SelectedUnlimited)
) {
- (currentRunType.FixedValue == 0 && ! unlimited) ) {
- on_run_extra_activate(o, args);
- } else {
- on_run_interval_accepted(o, args);
- }
- */
}
//if it's cancelled (or deleted event) select desired toolbar button
private void on_more_runs_cancelled (object o, EventArgs args)
{
currentRunType = previousRunType;
- extra_window_runs_toggle_desired_button_on_toolbar(currentRunType);
+ extra_window_runs_initialize(currentRunType);
}
private void on_more_runs_interval_cancelled (object o, EventArgs args)
{
currentRunIntervalType = previousRunIntervalType;
- extra_window_runs_interval_toggle_desired_button_on_toolbar(currentRunIntervalType);
- }
-
- private void extra_window_runs_toggle_desired_button_on_toolbar(RunType type) {
- if(type.Name == "Custom") extra_window_radio_run_custom.Active = true;
- else if(type.Name == "20m") extra_window_radio_run_20m.Active = true;
- else if(type.Name == "100m") extra_window_radio_run_100m.Active = true;
- else if(type.Name == "200m") extra_window_radio_run_200m.Active = true;
- else if(type.Name == "400m") extra_window_radio_run_400m.Active = true;
- else if(type.Name == "Gesell-DBT") extra_window_radio_run_gesell.Active = true;
- else if(type.Name == "Agility-20Yard") extra_window_radio_run_20yard.Active = true;
- else if(type.Name == "Agility-505") extra_window_radio_run_505.Active = true;
- else if(type.Name == "Agility-Illinois") extra_window_radio_run_illinois.Active = true;
- else if(type.Name == "Margaria") extra_window_radio_run_margaria.Active = true;
- else if(type.Name == "Agility-Shuttle-Run") extra_window_radio_run_shuttle.Active = true;
- else if(type.Name == "Agility-ZigZag") extra_window_radio_run_zigzag.Active = true;
- else {
- //don't do this:
- //extra_window_radio_run_more.Active = true;
- //because it will be a loop
- //only do:
- extra_window_runs_initialize(type);
- }
- }
-
- private void extra_window_runs_interval_toggle_desired_button_on_toolbar(RunType type) {
- if(type.Name == "byLaps") extra_window_radio_run_interval_by_laps.Active = true;
- else if(type.Name == "byTime") extra_window_radio_run_interval_by_time.Active = true;
- else if(type.Name == "unlimited") extra_window_radio_run_interval_unlimited.Active = true;
- else if(type.Name == "MTGUG") extra_window_radio_run_interval_mtgug.Active = true;
- //else if(type.Name == "RSA 8-4-R3-5") extra_window_radio_run_interval_rsa_test_1.Active =
true;
- else {
- //don't do this:
- //extra_window_radio_run_interval_more.Active = true;
- //because it will be a loop
- //only do:
- extra_window_runs_interval_initialize(type);
- }
+ extra_window_runs_interval_initialize(currentRunIntervalType);
}
private void extra_window_showDistanceData (RunType myRunType, bool show, bool sensitive ) {
@@ -1312,13 +1164,12 @@ public class RunsMoreWindow : EventMoreWindow
private double selectedDistance;
- RunsMoreWindow (Gtk.Window parent, bool testOrDelete, string selectedTestOnMainWindow) {
+ RunsMoreWindow (Gtk.Window parent, bool testOrDelete) {
Glade.XML gladeXML;
gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", null);
gladeXML.Autoconnect(this);
this.parent = parent;
this.testOrDelete = testOrDelete;
- this.selectedTestOnMainWindow = selectedTestOnMainWindow;
if(!testOrDelete)
jumps_runs_more.Title = Catalog.GetString("Delete test type defined by user");
@@ -1333,10 +1184,10 @@ public class RunsMoreWindow : EventMoreWindow
initializeThings();
}
- static public RunsMoreWindow Show (Gtk.Window parent, bool testOrDelete, string
selectedTestOnMainWindow)
+ static public RunsMoreWindow Show (Gtk.Window parent, bool testOrDelete)
{
if (RunsMoreWindowBox == null) {
- RunsMoreWindowBox = new RunsMoreWindow (parent, testOrDelete,
selectedTestOnMainWindow);
+ RunsMoreWindowBox = new RunsMoreWindow (parent, testOrDelete);
}
RunsMoreWindowBox.jumps_runs_more.Show ();
@@ -1356,6 +1207,11 @@ public class RunsMoreWindow : EventMoreWindow
{
//select data without inserting an "all jumps", and not obtain only name of jump
string [] myRunTypes = SqliteRunType.SelectRunTypes("", false);
+
+ //remove typesTranslated
+ typesTranslated = new String [myRunTypes.Length];
+ int count = 0;
+
foreach (string myType in myRunTypes) {
string [] myStringFull = myType.Split(new char[] {':'});
if(myStringFull[2] == "0") {
@@ -1370,13 +1226,17 @@ public class RunsMoreWindow : EventMoreWindow
if(testOrDelete || ! tempType.IsPredefined)
store.AppendValues (
//myStringFull[0], //don't display the uniqueID
- myStringFull[1], //name
+ Catalog.GetString(myStringFull[1]), //name
myStringFull[2], //distance
description
);
+
+ //create typesTranslated
+ typesTranslated [count++] = myStringFull[1] + ":" +
Catalog.GetString(myStringFull[1]);
}
}
+
protected override void onSelectionEntry (object o, EventArgs args)
{
TreeModel model;
@@ -1386,7 +1246,9 @@ public class RunsMoreWindow : EventMoreWindow
selectedDescription = "";
if (((TreeSelection)o).GetSelected(out model, out iter)) {
- selectedEventName = (string) model.GetValue (iter, 0);
+ string translatedName = (string) model.GetValue (iter, 0);
+ //get name in english
+ selectedEventName = Util.FindOnArray(':', 1, 0, translatedName, typesTranslated);
if( (string) model.GetValue (iter, 1) == Catalog.GetString("Not defined") ) {
selectedDistance = 0;
} else {
@@ -1414,8 +1276,10 @@ public class RunsMoreWindow : EventMoreWindow
TreeIter iter;
if (tv.Selection.GetSelected (out model, out iter)) {
- //put selection in selected
- selectedEventName = (string) model.GetValue (iter, 0);
+ string translatedName = (string) model.GetValue (iter, 0);
+ //get name in english
+ selectedEventName = Util.FindOnArray(':', 1, 0, translatedName, typesTranslated);
+
if( (string) model.GetValue (iter, 1) == Catalog.GetString("Not defined") ) {
selectedDistance = 0;
} else {
@@ -1430,6 +1294,11 @@ public class RunsMoreWindow : EventMoreWindow
protected override void deleteTestLine() {
SqliteRunType.Delete(selectedEventName);
+
+ //delete from typesTranslated
+ string row = Util.FindOnArray(':',0, -1, selectedEventName, typesTranslated);
+ Log.WriteLine("row " + row);
+ typesTranslated = Util.DeleteString(typesTranslated, row);
}
protected override string [] findTestTypesInSessions() {
@@ -1480,14 +1349,13 @@ public class RunsIntervalMoreWindow : EventMoreWindow
private bool selectedUnlimited;
private string selectedDistancesString;
- RunsIntervalMoreWindow (Gtk.Window parent, bool testOrDelete, string selectedTestOnMainWindow) {
+ RunsIntervalMoreWindow (Gtk.Window parent, bool testOrDelete) {
//the glade window is the same as jumps_more
Glade.XML gladeXML;
gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "chronojump.glade",
"jumps_runs_more", "chronojump");
gladeXML.Autoconnect(this);
this.parent = parent;
this.testOrDelete = testOrDelete;
- this.selectedTestOnMainWindow = selectedTestOnMainWindow;
if(!testOrDelete)
jumps_runs_more.Title = Catalog.GetString("Delete test type defined by user");
@@ -1503,10 +1371,10 @@ public class RunsIntervalMoreWindow : EventMoreWindow
initializeThings();
}
- static public RunsIntervalMoreWindow Show (Gtk.Window parent, bool testOrDelete, string
selectedTestOnMainWindow)
+ static public RunsIntervalMoreWindow Show (Gtk.Window parent, bool testOrDelete)
{
if (RunsIntervalMoreWindowBox == null) {
- RunsIntervalMoreWindowBox = new RunsIntervalMoreWindow (parent, testOrDelete,
selectedTestOnMainWindow);
+ RunsIntervalMoreWindowBox = new RunsIntervalMoreWindow (parent, testOrDelete);
}
RunsIntervalMoreWindowBox.jumps_runs_more.Show ();
@@ -1528,6 +1396,11 @@ public class RunsIntervalMoreWindow : EventMoreWindow
{
//select data without inserting an "all jumps", and not obtain only name of jump
string [] myTypes = SqliteRunIntervalType.SelectRunIntervalTypes("", false);
+
+ //remove typesTranslated
+ typesTranslated = new String [myTypes.Length];
+ int count = 0;
+
foreach (string myType in myTypes) {
string [] myStringFull = myType.Split(new char[] {':'});
@@ -1565,12 +1438,15 @@ public class RunsIntervalMoreWindow : EventMoreWindow
if(testOrDelete || ! tempType.IsPredefined)
store.AppendValues (
//myStringFull[0], //don't display de uniqueID
- myStringFull[1], //name
+ Catalog.GetString(myStringFull[1]), //name
distance,
myLimiter, //tracks or seconds or "unlimited"
myLimiterValue, //? or exact value (or '-' in
unlimited)
description
);
+
+ //create typesTranslated
+ typesTranslated [count++] = myStringFull[1] + ":" +
Catalog.GetString(myStringFull[1]);
}
}
@@ -1588,7 +1464,9 @@ public class RunsIntervalMoreWindow : EventMoreWindow
selectedDistancesString = "";
if (((TreeSelection)o).GetSelected(out model, out iter)) {
- selectedEventName = (string) model.GetValue (iter, 0);
+ string translatedName = (string) model.GetValue (iter, 0);
+ //get name in english
+ selectedEventName = Util.FindOnArray(':', 1, 0, translatedName, typesTranslated);
//selectedDistance = Convert.ToDouble( (string) model.GetValue (iter, 1) );
/*
@@ -1642,7 +1520,9 @@ public class RunsIntervalMoreWindow : EventMoreWindow
TreeIter iter;
if (tv.Selection.GetSelected (out model, out iter)) {
- selectedEventName = (string) model.GetValue (iter, 0);
+ string translatedName = (string) model.GetValue (iter, 0);
+ //get name in english
+ selectedEventName = Util.FindOnArray(':', 1, 0, translatedName, typesTranslated);
//selectedDistance = Convert.ToDouble( (string) model.GetValue (iter, 1) );
@@ -1679,6 +1559,10 @@ public class RunsIntervalMoreWindow : EventMoreWindow
protected override void deleteTestLine() {
SqliteRunIntervalType.Delete(selectedEventName);
+
+ //delete from typesTranslated
+ string row = Util.FindOnArray(':',0, -1, selectedEventName, typesTranslated);
+ typesTranslated = Util.DeleteString(typesTranslated, row);
}
protected override string [] findTestTypesInSessions() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
