commit bf98e554890244e81955c3a1e76def70397cc95b
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Nov 8 02:58:27 2017 +0100
Force sensor analyze separated. Better analyze radios for contacts
glade/app1.glade | 1018 ++++++++++++++++--------------
images/md/ic_assignment_blue_24dp_1x.png | Bin 0 -> 299 bytes
src/Makefile.am | 1 +
src/gui/chronojump.cs | 95 +++-
src/gui/chronojumpIcons.cs | 6 +-
5 files changed, 624 insertions(+), 496 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 12c3971..495ac93 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1439,6 +1439,15 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3097,13 +3106,76 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="radio_mode_contacts_jumps_profile">
+ <widget class="GtkArrow"
id="arrow_contacts_sup_capture_analyze">
+ <property name="width_request">50</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_mode_contacts_general">
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_radio_mode_contacts_general_toggled" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_tests_analyze_general">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_mode_contacts_jumps_profile1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">General</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_mode_contacts_jumps_profile">
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
- <property
name="group">radio_mode_contacts_capture</property>
+ <property
name="group">radio_mode_contacts_general</property>
<signal name="toggled"
handler="on_radio_mode_contacts_jumps_profile_toggled" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox199">
@@ -3141,17 +3213,16 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton"
id="radio_mode_contacts_sprint">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="draw_indicator">False</property>
- <property
name="group">radio_mode_contacts_capture</property>
+ <property
name="group">radio_mode_contacts_general</property>
<signal name="toggled"
handler="on_radio_mode_contacts_sprint_toggled" swapped="no"/>
<child>
<widget class="GtkHBox" id="hbox206">
@@ -3189,7 +3260,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
@@ -3605,7 +3676,6 @@ EncoderInertialCapture</property>
<property name="show_border">False</property>
<property name="tab_hborder">10</property>
<property name="tab_vborder">4</property>
- <signal name="switch_page"
handler="on_notebook_capture_analyze_switch_page" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
@@ -4638,7 +4708,7 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">30</property>
<child>
- <widget class="GtkButton"
id="button_force_sensor_load">
+ <widget class="GtkButton"
id="button_force_sensor_capture_load">
<property name="label" translatable="yes">Load
file</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -10931,11 +11001,6 @@ after time</property>
<property name="border_width">8</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkHPaned"
id="hpaned_force_capture">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">500</property>
- <child>
<widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -11190,120 +11255,6 @@ after time</property>
</child>
</widget>
<packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_force_rfd">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox231">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkViewport"
id="viewport_force_sensor_graph">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkImage"
id="image_force_sensor_graph">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox109">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkButton"
id="button_force_sensor_image_save_rfd">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Save
image</property>
- <signal name="clicked"
handler="on_button_force_sensor_image_save_rfd_clicked" swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox108">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_forcesensor_analyze_image_save">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_forcesensor_analyze_image_save2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-save</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">False</property>
- </packing>
- </child>
- </widget>
- <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
@@ -12105,22 +12056,27 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook" id="notebook_stats_sup">
+ <widget class="GtkNotebook" id="notebook_analyze">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="show_tabs">False</property>
- <property name="show_border">False</property>
<child>
- <widget class="GtkVBox" id="vbox_stats">
+ <widget class="GtkNotebook" id="notebook_stats_sup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
- <widget class="GtkNotebook" id="notebook_stats">
+ <widget class="GtkVBox" id="vbox_stats">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox35">
+ <widget class="GtkNotebook" id="notebook_stats">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -12411,24 +12367,24 @@ after time</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label488">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label488">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Type</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="tab_fill">False</property>
<property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox19">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -12505,26 +12461,26 @@ after time</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label489">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label489">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Session</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table6">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -12666,26 +12622,26 @@ after time</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label490">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label490">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show
tests</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox112">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox112">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -12722,38 +12678,38 @@ after time</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="position">3</property>
<property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label492">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label492">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Other</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="position">3</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">4</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">4</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <widget class="GtkButton" id="button_stats">
+ <widget class="GtkHButtonBox" id="hbuttonbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_stats">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -12800,46 +12756,46 @@ after time</property>
</child>
</widget>
</child>
- </widget>
- <packing>
+ </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">True</property>
+ <property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow7">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
<child>
- <widget class="GtkTreeView" id="treeview_stats">
+ <widget class="GtkScrolledWindow"
id="scrolledwindow7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkTreeView" id="treeview_stats">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</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="GtkHBox" id="hbox_mark_and_enunciate">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkVBox" id="vbox29">
+ <widget class="GtkHBox"
id="hbox_mark_and_enunciate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkVBox" id="vbox29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -12881,15 +12837,15 @@ after time</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTextView"
id="textview_enunciate">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTextView"
id="textview_enunciate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
@@ -12899,29 +12855,29 @@ after time</property>
<property name="cursor_visible">False</property>
<property name="overwrite">True</property>
<property name="accepts_tab">False</property>
- </widget>
- <packing>
+ </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">True</property>
+ <property name="position">3</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame_graph_and_report">
- <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>
<child>
- <widget class="GtkAlignment" id="alignment145">
+ <widget class="GtkFrame"
id="frame_graph_and_report">
+ <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>
+ <child>
+ <widget class="GtkAlignment" id="alignment145">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
@@ -13645,130 +13601,84 @@ after time</property>
</child>
</widget>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label772">
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label772">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Graph
and report</property>
<property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">stats</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">stats</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label43">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Sorry, no
statistics for this test type
+ <child>
+ <widget class="GtkLabel" id="label43">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Sorry, no
statistics for this test type
on current Chronojump version.</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">error</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label42">
+ <widget class="GtkLabel" id="label247">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">error</property>
+ <property name="label">general</property>
</widget>
<packing>
- <property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox50">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_stats_win_graph1_old">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_statistics">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Analyze</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox82">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkDrawingArea"
id="drawingarea_jumps_profile">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <signal name="expose_event"
handler="on_drawingarea_jumps_profile_expose_event" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
+ <widget class="GtkVBox" id="vbox82">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="layout_style">spread</property>
<child>
- <widget class="GtkButton"
id="button_jumps_profile_help">
- <property name="label" translatable="yes">Help on
indexes</property>
+ <widget class="GtkDrawingArea"
id="drawingarea_jumps_profile">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_jumps_profile_help_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <signal name="expose_event"
handler="on_drawingarea_jumps_profile_expose_event" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -13777,38 +13687,57 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_jumps_profile_training">
- <property name="label" translatable="yes">General
recommendations on improving indexes</property>
+ <widget class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_jumps_profile_training_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton"
id="button_jumps_profile_help">
+ <property name="label" translatable="yes">Help
on indexes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_jumps_profile_help_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="GtkButton"
id="button_jumps_profile_training">
+ <property name="label"
translatable="yes">General recommendations on improving indexes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_jumps_profile_training_clicked" swapped="no"/>
+ </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="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_help">
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_help">
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkVBox"
id="vbox_jumps_profile_help">
+ <widget class="GtkViewport" id="viewport2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkVBox"
id="vbox_jumps_profile_help">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -14021,29 +13950,29 @@ on current Chronojump version.</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_training">
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_training">
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkTable"
id="table_jumps_profile_training">
+ <widget class="GtkViewport" id="viewport1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkTable"
id="table_jumps_profile_training">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">6</property>
@@ -14832,85 +14761,62 @@ Concentric</property>
<property name="y_options"/>
</packing>
</child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox205">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_tab_jumps_profile_old">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label164">
+ <widget class="GtkLabel" id="label248">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Jumps
profile</property>
+ <property name="label">Jumps profile</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">4</property>
<child>
- <widget class="GtkVPaned" id="vpaned1">
+ <widget class="GtkAlignment" id="alignment28">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
<child>
- <widget class="GtkVBox" id="vbox44">
+ <widget class="GtkVPaned" id="vpaned1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="can_focus">True</property>
<child>
- <widget class="GtkLabel"
id="label_sprint_person_name">
+ <widget class="GtkVBox" id="vbox44">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel"
id="label_sprint_person_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox76">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox76">
<property name="height_request">75</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14963,85 +14869,244 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">False</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkViewport" id="viewport_sprint">
+ <property name="height_request">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_sprint">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label249">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Sprint</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox108">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">2</property>
+ <child>
+ <widget class="GtkHBox" id="hbox182">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_analyze_load">
+ <property name="label" translatable="yes">Load
file</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_force_sensor_load_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="resize">False</property>
- <property name="shrink">False</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
+ <widget class="GtkHBox" id="hbox_force_rfd">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkViewport" id="viewport_sprint">
- <property name="height_request">200</property>
+ <widget class="GtkHBox" id="hbox231">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image_sprint">
+ <widget class="GtkScrolledWindow"
id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkViewport"
id="viewport_force_sensor_graph">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkVBox" id="vbox113">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_graph">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox109">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="button_force_sensor_image_save_rfd">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Save
image</property>
+ <signal name="clicked"
handler="on_button_force_sensor_image_save_rfd_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox114">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_forcesensor_analyze_image_save">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_forcesensor_analyze_image_save2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-save</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="resize">True</property>
- <property name="shrink">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox191">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_tests_sprint_old">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
- </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label140">
+ <widget class="GtkLabel" id="label252">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Sprint</property>
+ <property name="label">force sensor</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label246">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Analyze</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -21798,6 +21863,15 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/images/md/ic_assignment_blue_24dp_1x.png b/images/md/ic_assignment_blue_24dp_1x.png
new file mode 100644
index 0000000..e29ebe8
Binary files /dev/null and b/images/md/ic_assignment_blue_24dp_1x.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index fa4f353..fdd82a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -387,6 +387,7 @@ RESOURCES = \
../images/md/ic_last_page_blue_24dp_1x.png,finish.png \
../images/md/ic_cancel_red_24dp_1x.png,image_cancel.png \
../images/md/ic_insert_chart_blue_24dp_1x.png,image_analyze.png \
+ ../images/md/ic_assignment_blue_24dp_1x.png,image_analyze_general.png \
../images/md/ic_fast_forward_blue_24dp_1x.png,image_sprint.png \
../images/md/ic_developer_board_blue_24dp_1x.png,image_chronopic_connect.png \
../images/md/ic_developer_board_blue_24dp_2x.png,image_chronopic_connect_big.png \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index cc28ff0..0a85728 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -76,13 +76,21 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_sup;
[Widget] Gtk.HBox hbox_other;
[Widget] Gtk.Notebook notebook_capture_analyze; //not encoder
+ [Widget] Gtk.Notebook notebook_analyze; //not encoder
[Widget] Gtk.Notebook notebook_capture_graph_table;
[Widget] Gtk.HBox hbox_contacts_sup_capture_analyze_two_buttons;
+
+ //radio group
[Widget] Gtk.RadioButton radio_mode_contacts_capture;
[Widget] Gtk.RadioButton radio_mode_contacts_analyze;
+
+ //radio group
+ [Widget] Gtk.Arrow arrow_contacts_sup_capture_analyze;
+ [Widget] Gtk.RadioButton radio_mode_contacts_general;
[Widget] Gtk.RadioButton radio_mode_contacts_jumps_profile;
[Widget] Gtk.RadioButton radio_mode_contacts_sprint;
+
[Widget] Gtk.Label label_sprint_person_name;
[Widget] Gtk.Label label_version;
@@ -1026,7 +1034,7 @@ public partial class ChronoJumpWindow
{
updateGraphJumpsSimple();
- if(notebook_capture_analyze.CurrentPage == 2) //Jumps Profile
+ if(notebook_analyze.CurrentPage == 1) //Jumps Profile
jumpsProfileDo(true); //calculate data
}
else if(current_menuitem_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
@@ -2929,6 +2937,14 @@ public partial class ChronoJumpWindow
forceProcessCancel = true;
}
+ radio_mode_contacts_capture.Active = true;
+ radio_mode_contacts_general.Active = true;
+ arrow_contacts_sup_capture_analyze.Visible = false;
+ radio_mode_contacts_general.Visible = false;
+ radio_mode_contacts_jumps_profile.Visible = false;
+ radio_mode_contacts_sprint.Visible = false;
+ notebook_analyze.CurrentPage = 0;
+
if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
{
notebook_sup.CurrentPage = 0;
@@ -2940,7 +2956,13 @@ public partial class ChronoJumpWindow
notebooks_change(m);
on_extra_window_jumps_test_changed(new object(), new EventArgs());
hbox_results_legend.Visible = true;
- radio_mode_contacts_jumps_profile.Show();
+
+ if(radio_mode_contacts_analyze.Active)
+ {
+ arrow_contacts_sup_capture_analyze.Visible = true;
+ radio_mode_contacts_general.Visible = true;
+ radio_mode_contacts_jumps_profile.Visible = true;
+ }
} else
{
menuitem_mode_selected_jumps_reactive.Visible = true;
@@ -2952,9 +2974,6 @@ public partial class ChronoJumpWindow
if(radio_mode_contacts_jumps_profile.Active)
radio_mode_contacts_capture.Active = true;
}
- radio_mode_contacts_sprint.Hide();
- if(radio_mode_contacts_sprint.Active)
- radio_mode_contacts_capture.Active = true;
}
else if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
{
@@ -2968,10 +2987,6 @@ public partial class ChronoJumpWindow
notebooks_change(m);
on_extra_window_runs_test_changed(new object(), new EventArgs());
hbox_results_legend.Visible = true;
-
- radio_mode_contacts_sprint.Hide();
- if(radio_mode_contacts_sprint.Active)
- radio_mode_contacts_capture.Active = true;
}
else
{
@@ -2980,7 +2995,13 @@ public partial class ChronoJumpWindow
on_extra_window_runs_interval_test_changed(new object(), new EventArgs());
hbox_results_legend.Visible = false;
createTreeView_runs_interval_sprint (treeview_runs_interval_sprint);
- radio_mode_contacts_sprint.Show();
+
+ if(radio_mode_contacts_analyze.Active)
+ {
+ arrow_contacts_sup_capture_analyze.Visible = true;
+ radio_mode_contacts_general.Visible = true;
+ radio_mode_contacts_sprint.Visible = true;
+ }
}
radio_mode_contacts_jumps_profile.Hide();
if(radio_mode_contacts_sprint.Active)
@@ -3109,9 +3130,8 @@ public partial class ChronoJumpWindow
notebooks_change(m);
// on_extra_window_reaction_times_test_changed(new object(), new EventArgs());
- notebook_capture_analyze.CurrentPage = 0;
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
- hbox_contacts_sup_capture_analyze_two_buttons.Visible = false;
+ hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
hbox_results_legend.Visible = false;
@@ -6753,28 +6773,57 @@ LogB.Debug("X");
private void on_radio_mode_contacts_capture_toggled (object o, EventArgs args)
{
- if(radio_mode_contacts_capture.Active)
- notebook_capture_analyze.CurrentPage = 0;
+ if(! radio_mode_contacts_capture.Active)
+ return;
+
+ arrow_contacts_sup_capture_analyze.Visible = false;
+ radio_mode_contacts_general.Visible = false;
+ radio_mode_contacts_jumps_profile.Visible = false;
+ radio_mode_contacts_sprint.Visible = false;
+
+ notebook_capture_analyze.CurrentPage = 0;
}
private void on_radio_mode_contacts_analyze_toggled (object o, EventArgs args)
{
- if(radio_mode_contacts_analyze.Active)
- notebook_capture_analyze.CurrentPage = 1;
+ if(! radio_mode_contacts_analyze.Active)
+ return;
+
+ if(current_menuitem_mode == Constants.Menuitem_modes.JUMPSSIMPLE ||
+ current_menuitem_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ {
+ arrow_contacts_sup_capture_analyze.Visible = true;
+ radio_mode_contacts_general.Visible = true;
+
+ if(current_menuitem_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ radio_mode_contacts_jumps_profile.Visible = true;
+ else if(current_menuitem_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ radio_mode_contacts_sprint.Visible = true;
+ }
+ else if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR)
+ notebook_analyze.CurrentPage = 3;
+ else
+ notebook_analyze.CurrentPage = 0;
+
+ notebook_capture_analyze.CurrentPage = 1;
+ }
+
+ private void on_radio_mode_contacts_general_toggled (object o, EventArgs args)
+ {
+ if(radio_mode_contacts_general.Active)
+ notebook_analyze.CurrentPage = 0;
}
private void on_radio_mode_contacts_jumps_profile_toggled (object o, EventArgs args)
{
if(radio_mode_contacts_jumps_profile.Active)
- notebook_capture_analyze.CurrentPage = 2;
+ {
+ notebook_analyze.CurrentPage = 1;
+ jumpsProfileDo(true);
+ }
}
private void on_radio_mode_contacts_sprint_toggled (object o, EventArgs args)
{
if(radio_mode_contacts_sprint.Active)
- notebook_capture_analyze.CurrentPage = 3;
- }
-
- private void on_notebook_capture_analyze_switch_page (object o, SwitchPageArgs args) {
- if(notebook_capture_analyze.CurrentPage == 2)
- jumpsProfileDo(true);
+ notebook_analyze.CurrentPage = 2;
}
private void on_button_jumps_profile_help_clicked (object o, EventArgs args) {
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 7db846f..1e8780f 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -50,6 +50,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_button_execute;
[Widget] Gtk.Image image_tests_capture;
[Widget] Gtk.Image image_tests_sprint;
+ [Widget] Gtk.Image image_tests_analyze_general;
[Widget] Gtk.Image image_info1;
[Widget] Gtk.Image image_info2;
[Widget] Gtk.Image image_info3;
@@ -427,7 +428,10 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "spreadsheet.png");
image_encoder_analyze_table_save.Pixbuf = pixbuf;
-
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_analyze_general.png");
+ image_tests_analyze_general.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "jumps-profile-pie.png");
image_tab_jumps_profile.Pixbuf = pixbuf;