[chronojump] Fixed: Bug 647801 - 720width ok, and fixed graphs erasing by bells
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed: Bug 647801 - 720width ok, and fixed graphs erasing by bells
- Date: Mon, 18 Apr 2011 19:06:51 +0000 (UTC)
commit c379af947b9d997799256a3c0e8e0e9715205b6e
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 18 21:05:05 2011 +0200
Fixed: Bug 647801 - 720width ok, and fixed graphs erasing by bells
glade/chronojump.glade | 358 ++++++++++++++++++++++-------------------------
src/constants.cs | 4 +-
src/gui/chronojump.cs | 280 +++++++++++++++----------------------
src/gui/eventExecute.cs | 10 --
src/gui/stats.cs | 2 -
5 files changed, 277 insertions(+), 377 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index e0c0b17..c5139f5 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -13427,6 +13427,7 @@ by you</property>
<property name="title" translatable="yes">Chronojump</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
+ <signal name="size_allocate" handler="on_app1_size_allocate"/>
<signal name="delete_event" handler="on_delete_event"/>
<child>
<widget class="GtkVBox" id="vbox69">
@@ -13641,8 +13642,7 @@ by you</property>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox65">
- <property name="width_request">180</property>
+ <widget class="GtkVBox" id="vbox_persons">
<property name="visible">True</property>
<child>
<widget class="GtkFrame" id="frame_persons">
@@ -13783,7 +13783,7 @@ by you</property>
<widget class="GtkHBox" id="hbox35">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkLabel" id="label_current_person_title">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Current person</property>
@@ -14008,28 +14008,28 @@ by you</property>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkViewport" id="viewport_mode">
+ <widget class="GtkViewport" id="viewport_mode_small">
<property name="visible">True</property>
<property name="resize_mode">queue</property>
- <property name="hadjustment">0 0 1 0.10000000000000001 0.90000000000000002 1</property>
- <property name="shadow_type">out</property>
<child>
- <widget class="GtkHButtonBox" id="hbutton_radio_modes">
+ <widget class="GtkHBox" id="hbox_radio_modes">
<property name="visible">True</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkRadioButton" id="radio_mode_jumps">
+ <widget class="GtkRadioButton" id="radio_mode_jumps_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- <signal name="toggled" handler="on_radio_mode_jumps_toggled"/>
+ <signal name="toggled" handler="on_radio_mode_jumps_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkVBox" id="vbox74">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_jumps">
+ <widget class="GtkImage" id="image_mode_jumps_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14038,7 +14038,7 @@ by you</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_jumps">
+ <widget class="GtkLabel" id="label_mode_jumps_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Jumps</property>
<property name="justify">center</property>
@@ -14051,25 +14051,25 @@ by you</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_mode_jumps_reactive">
+ <widget class="GtkRadioButton" id="radio_mode_jumps_reactive_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps</property>
- <signal name="toggled" handler="on_radio_mode_jumps_reactive_toggled"/>
+ <property name="group">radio_mode_jumps_small</property>
+ <signal name="toggled" handler="on_radio_mode_jumps_reactive_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <widget class="GtkVBox" id="vbox75">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_jumps_reactive">
+ <widget class="GtkImage" id="image_mode_jumps_reactive_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14078,7 +14078,7 @@ by you</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_jumps_reactive">
+ <widget class="GtkLabel" id="label_mode_jumps_reactive_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Jumps
reactive</property>
@@ -14092,25 +14092,25 @@ reactive</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_mode_runs">
+ <widget class="GtkRadioButton" id="radio_mode_runs_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps</property>
- <signal name="toggled" handler="on_radio_mode_runs_toggled"/>
+ <property name="group">radio_mode_jumps_small</property>
+ <signal name="toggled" handler="on_radio_mode_runs_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <widget class="GtkVBox" id="vbox76">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_runs">
+ <widget class="GtkImage" id="image_mode_runs_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14119,7 +14119,7 @@ reactive</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_runs">
+ <widget class="GtkLabel" id="label_mode_runs_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Runs</property>
<property name="justify">center</property>
@@ -14132,25 +14132,25 @@ reactive</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_mode_runs_intervallic">
+ <widget class="GtkRadioButton" id="radio_mode_runs_intervallic_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps</property>
- <signal name="toggled" handler="on_radio_mode_runs_intervallic_toggled"/>
+ <property name="group">radio_mode_jumps_small</property>
+ <signal name="toggled" handler="on_radio_mode_runs_intervallic_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <widget class="GtkVBox" id="vbox77">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_runs_intervallic">
+ <widget class="GtkImage" id="image_mode_runs_intervallic_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14159,7 +14159,7 @@ reactive</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_runs_intervallic">
+ <widget class="GtkLabel" id="label_mode_runs_intervallic_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Runs
intervallic</property>
@@ -14173,25 +14173,25 @@ intervallic</property>
</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_reaction_times">
+ <widget class="GtkRadioButton" id="radio_mode_reaction_times_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps</property>
- <signal name="toggled" handler="on_radio_mode_reaction_times_toggled"/>
+ <property name="group">radio_mode_jumps_small</property>
+ <signal name="toggled" handler="on_radio_mode_reaction_times_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <widget class="GtkVBox" id="vbox78">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_reaction_times">
+ <widget class="GtkImage" id="image_mode_reaction_times_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14200,7 +14200,7 @@ intervallic</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_reaction_times">
+ <widget class="GtkLabel" id="label_mode_reaction_times_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Reaction
times</property>
@@ -14214,25 +14214,25 @@ times</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_mode_pulses">
+ <widget class="GtkRadioButton" id="radio_mode_pulses_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps</property>
- <signal name="toggled" handler="on_radio_mode_pulses_toggled"/>
+ <property name="group">radio_mode_jumps_small</property>
+ <signal name="toggled" handler="on_radio_mode_pulses_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkVBox" id="vbox79">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_pulses">
+ <widget class="GtkImage" id="image_mode_pulses_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14241,7 +14241,7 @@ times</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_pulses">
+ <widget class="GtkLabel" id="label_mode_pulses_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Pulses</property>
<property name="justify">center</property>
@@ -14254,25 +14254,25 @@ times</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radio_mode_multi_chronopic">
+ <widget class="GtkRadioButton" id="radio_mode_multi_chronopic_small">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_mode_jumps</property>
- <signal name="toggled" handler="on_radio_mode_multi_chronopic_toggled"/>
+ <property name="group">radio_mode_jumps_small</property>
+ <signal name="toggled" handler="on_radio_mode_multi_chronopic_small_toggled"/>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <widget class="GtkVBox" id="vbox80">
<property name="visible">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkImage" id="image_mode_multi_chronopic">
+ <widget class="GtkImage" id="image_mode_multi_chronopic_small">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</widget>
@@ -14281,7 +14281,7 @@ times</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mode_multi_chronopic">
+ <widget class="GtkLabel" id="label_mode_multi_chronopic_small">
<property name="visible">True</property>
<property name="label" translatable="yes">Multi-
Chronopic</property>
@@ -14295,8 +14295,6 @@ Chronopic</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">6</property>
</packing>
</child>
@@ -14305,8 +14303,6 @@ Chronopic</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
<property name="position">0</property>
</packing>
</child>
@@ -16180,7 +16176,7 @@ Chronopic</property>
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <widget class="GtkFrame" id="frame_test_options">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.69999998807907104</property>
@@ -17939,8 +17935,6 @@ Second Chronopic to platforms.</property>
</child>
<child>
<widget class="GtkNotebook" id="notebook_results_data">
- <property name="width_request">225</property>
- <property name="height_request">72</property>
<property name="visible">True</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
@@ -18293,6 +18287,7 @@ Second Chronopic to platforms.</property>
</child>
<child>
<widget class="GtkHBox" id="hbox227">
+ <property name="width_request">16</property>
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="event_execute_image_jump_reactive_tf_tc_good">
@@ -18351,6 +18346,7 @@ Second Chronopic to platforms.</property>
</child>
<child>
<widget class="GtkHBox" id="hbox225">
+ <property name="width_request">16</property>
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="event_execute_image_jump_reactive_tc_good">
@@ -18409,6 +18405,7 @@ Second Chronopic to platforms.</property>
</child>
<child>
<widget class="GtkHBox" id="hbox223">
+ <property name="width_request">16</property>
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="event_execute_image_jump_reactive_tf_good">
@@ -18956,6 +18953,7 @@ Second Chronopic to platforms.</property>
</child>
<child>
<widget class="GtkHBox" id="hbox221">
+ <property name="width_request">24</property>
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="event_execute_image_run_interval_time_good">
@@ -18967,6 +18965,7 @@ Second Chronopic to platforms.</property>
</child>
<child>
<widget class="GtkImage" id="event_execute_image_run_interval_time_bad">
+ <property name="width_request">24</property>
<property name="visible">True</property>
</widget>
<packing>
@@ -21444,17 +21443,33 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox52">
+ <widget class="GtkTable" id="table6">
<property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="spacing">5</property>
- <property name="homogeneous">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">13</property>
<child>
- <widget class="GtkVBox" id="vbox45">
+ <widget class="GtkRadioButton" id="radiobutton_stats_jumps_all">
+ <property name="label" translatable="yes">All</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_stats_jumps_person_average</property>
+ <signal name="clicked" handler="on_radiobutton_stats_jumps_clicked"/>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox53">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_stats_jumps_all">
- <property name="label" translatable="yes">All</property>
+ <widget class="GtkRadioButton" id="radiobutton_stats_jumps_limit">
+ <property name="label" translatable="yes">Limit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -21468,77 +21483,62 @@ Second Chronopic to platforms.</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox41">
- <property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox53">
+ <widget class="GtkSpinButton" id="spin_stats_jumps_limit">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_stats_jumps_limit">
- <property name="label" translatable="yes">Limit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_stats_jumps_person_average</property>
- <signal name="clicked" handler="on_radiobutton_stats_jumps_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_stats_jumps_limit">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â??</property>
- <property name="adjustment">10 1 99 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <signal name="changed" handler="on_spinbutton_stats_jumps_changed"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">10 1 99 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <signal name="changed" handler="on_spinbutton_stats_jumps_changed"/>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox43">
+ <widget class="GtkRadioButton" id="radiobutton_stats_jumps_person_average">
+ <property name="label" translatable="yes">Person's average</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_stats_jumps_all</property>
+ <signal name="clicked" handler="on_radiobutton_stats_jumps_clicked"/>
+ </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="GtkHBox" id="hbox54">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_stats_jumps_person_average">
- <property name="label" translatable="yes">Person's average</property>
+ <widget class="GtkRadioButton" id="radiobutton_stats_jumps_person_bests">
+ <property name="label" translatable="yes">Person's bests</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">radiobutton_stats_jumps_person_average</property>
<signal name="clicked" handler="on_radiobutton_stats_jumps_clicked"/>
</widget>
<packing>
@@ -21546,63 +21546,31 @@ Second Chronopic to platforms.</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox44">
- <property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox54">
+ <widget class="GtkSpinButton" id="spin_stats_jumps_person_bests">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_stats_jumps_person_bests">
- <property name="label" translatable="yes">Person's bests</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_stats_jumps_person_average</property>
- <signal name="clicked" handler="on_radiobutton_stats_jumps_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_stats_jumps_person_bests">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â??</property>
- <property name="adjustment">1 1 99 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <signal name="changed" handler="on_spinbutton_stats_jumps_changed"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â??</property>
+ <property name="adjustment">1 1 99 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <signal name="changed" handler="on_spinbutton_stats_jumps_changed"/>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">3</property>
+ <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>
</widget>
@@ -22050,6 +22018,7 @@ Second Chronopic to platforms.</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Width of the line</property>
<property name="invisible_char">â??</property>
+ <property name="width_chars">2</property>
<property name="adjustment">1 1 5 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -22060,7 +22029,7 @@ Second Chronopic to platforms.</property>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options"></property>
</packing>
</child>
<child>
@@ -22165,6 +22134,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â??</property>
+ <property name="width_chars">2</property>
<property name="adjustment">5 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -22202,6 +22172,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â??</property>
+ <property name="width_chars">2</property>
<property name="adjustment">4 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -22239,6 +22210,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â??</property>
+ <property name="width_chars">2</property>
<property name="adjustment">4 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -22276,6 +22248,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â??</property>
+ <property name="width_chars">2</property>
<property name="adjustment">2 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -22294,15 +22267,6 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator_stats_x_axis">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox" id="hbox_stats_x_axis">
<property name="visible">True</property>
<property name="spacing">2</property>
@@ -22323,6 +22287,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â??</property>
+ <property name="width_chars">3</property>
<property name="adjustment">0.80000000000000004 0.5 1 0.10000000000000001 1 0</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
@@ -22338,7 +22303,7 @@ Second Chronopic to platforms.</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -22387,14 +22352,12 @@ Second Chronopic to platforms.</property>
<child>
<widget class="GtkHBox" id="hbox47">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="layout_style">center</property>
<child>
<widget class="GtkButton" id="button_graph">
- <property name="width_request">175</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -22666,19 +22629,26 @@ on current Chronojump version.</property>
<widget class="GtkHBox" id="hbox59">
<property name="visible">True</property>
<child>
- <widget class="GtkTextView" id="textview1">
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="pixels_above_lines">4</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="text" translatable="yes">Chronojump has a server in order to share data between users.
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkTextView" id="textview1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">4</property>
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ <property name="text" translatable="yes">Chronojump has a server in order to share data between users.
Data is collected by users contributions and server generates statistics and graphs.
Anyone can check server stats and graphs and easily make querys to the server.
Privacy is respected:
- Names, comments, photos and videos are not uploaded.
- Dates of birth are hidden.</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="position">0</property>
@@ -22727,12 +22697,12 @@ Privacy is respected:
</child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/src/constants.cs b/src/constants.cs
index 41c21a8..047cf42 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -258,8 +258,8 @@ public class Constants
//global stat types
public static string TypeSessionSummary = Catalog.GetString("Session summary");
public static string TypeJumperSummary = Catalog.GetString("Jumper summary");
- public static string TypeJumpsSimple = Catalog.GetString("Jumps: Simple");
- public static string TypeJumpsSimpleWithTC = Catalog.GetString("Jumps: Simple with TC");
+ public static string TypeJumpsSimple = Catalog.GetString("Simple");
+ public static string TypeJumpsSimpleWithTC = Catalog.GetString("Simple with TC");
public static string TypeJumpsReactive = Catalog.GetString("Jumps: Reactive");
public static string TypeRunsSimple = Catalog.GetString("Runs: Simple");
public static string TypeRunsIntervallic = Catalog.GetString("Runs: Intervallic");
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index cd07b9e..0410f41 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -36,34 +36,39 @@ public partial class ChronoJumpWindow
{
[Widget] Gtk.Window app1;
- [Widget] Gtk.Viewport viewport_mode;
- [Widget] Gtk.RadioButton radio_mode_jumps;
- [Widget] Gtk.RadioButton radio_mode_jumps_reactive;
- [Widget] Gtk.RadioButton radio_mode_runs;
- [Widget] Gtk.RadioButton radio_mode_runs_intervallic;
- [Widget] Gtk.RadioButton radio_mode_reaction_times;
- [Widget] Gtk.RadioButton radio_mode_pulses;
- [Widget] Gtk.RadioButton radio_mode_multi_chronopic;
- [Widget] Gtk.Image image_mode_jumps;
- [Widget] Gtk.Image image_mode_jumps_reactive;
- [Widget] Gtk.Image image_mode_runs;
- [Widget] Gtk.Image image_mode_runs_intervallic;
- [Widget] Gtk.Image image_mode_reaction_times;
- [Widget] Gtk.Image image_mode_pulses;
- [Widget] Gtk.Image image_mode_multi_chronopic;
- [Widget] Gtk.Label label_mode_jumps;
- [Widget] Gtk.Label label_mode_jumps_reactive;
- [Widget] Gtk.Label label_mode_runs;
- [Widget] Gtk.Label label_mode_runs_intervallic;
- [Widget] Gtk.Label label_mode_reaction_times;
- [Widget] Gtk.Label label_mode_pulses;
- [Widget] Gtk.Label label_mode_multi_chronopic;
+ //gui for small screens
+ [Widget] Gtk.Viewport viewport_mode_small;
+ [Widget] Gtk.RadioButton radio_mode_jumps_small;
+ [Widget] Gtk.RadioButton radio_mode_jumps_reactive_small;
+ [Widget] Gtk.RadioButton radio_mode_runs_small;
+ [Widget] Gtk.RadioButton radio_mode_runs_intervallic_small;
+ [Widget] Gtk.RadioButton radio_mode_reaction_times_small;
+ [Widget] Gtk.RadioButton radio_mode_pulses_small;
+ [Widget] Gtk.RadioButton radio_mode_multi_chronopic_small;
+ [Widget] Gtk.Image image_mode_jumps_small;
+ [Widget] Gtk.Image image_mode_jumps_reactive_small;
+ [Widget] Gtk.Image image_mode_runs_small;
+ [Widget] Gtk.Image image_mode_runs_intervallic_small;
+ [Widget] Gtk.Image image_mode_reaction_times_small;
+ [Widget] Gtk.Image image_mode_pulses_small;
+ [Widget] Gtk.Image image_mode_multi_chronopic_small;
+ [Widget] Gtk.Label label_mode_jumps_small;
+ [Widget] Gtk.Label label_mode_jumps_reactive_small;
+ [Widget] Gtk.Label label_mode_runs_small;
+ [Widget] Gtk.Label label_mode_runs_intervallic_small;
+ [Widget] Gtk.Label label_mode_reaction_times_small;
+ [Widget] Gtk.Label label_mode_pulses_small;
+ [Widget] Gtk.Label label_mode_multi_chronopic_small;
+
[Widget] Gtk.Image image_persons_new_1;
[Widget] Gtk.Image image_persons_new_plus;
[Widget] Gtk.Image image_persons_open_1;
[Widget] Gtk.Image image_persons_open_plus;
+ [Widget] Gtk.Box vbox_persons;
+ [Widget] Gtk.Frame frame_test_options;
+
[Widget] Gtk.TreeView treeview_persons;
[Widget] Gtk.TreeView treeview_jumps;
[Widget] Gtk.TreeView treeview_jumps_rj;
@@ -103,6 +108,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_show_all_person_events;
[Widget] Gtk.Button button_delete_current_person;
[Widget] Gtk.Label label_current_person;
+ [Widget] Gtk.Label label_current_person_title;
//tests
//jumps
@@ -364,6 +370,8 @@ public partial class ChronoJumpWindow
private string runningFileName; //useful for knowing if there are two chronojump instances
+ private bool normalGUI; //false means small gui
+
//const int statusbarID = 1;
@@ -495,43 +503,74 @@ public partial class ChronoJumpWindow
}
*/
+ private bool normalGUIOld = true; //to know if we changed state. Start as true
+ private void on_app1_size_allocate(object obj, SizeAllocatedArgs args) {
+ int width;
+ int height;
+ app1.GetSize(out width, out height);
+ if(width >= 1000)
+ normalGUI = true;
+ else
+ normalGUI = false;
+ if(normalGUI != normalGUIOld) {
+ Log.WriteLine("Change Size. New is normal? -> " + normalGUI.ToString());
+ normalGUIOld = normalGUI;
+ changeGUIAspect();
+ }
+ }
+
+ private void changeGUIAspect() {
+ //QueryChildPacking(frame_test_options,
+ if(normalGUI) {
+ //if change these values, change also in glade
+ //frame_test_options.BoxChild.Expand(true);
+ label_current_person_title.Text=Catalog.GetString("Current person");
+ } else {
+ //frame_test_options.BoxChild.Expand(false);
+ label_current_person_title.Text=Catalog.GetString("Current");
+ }
+ }
private void putNonStandardIcons() {
Pixbuf pixbuf;
//change colors of tests mode
- viewport_mode.ModifyBg(StateType.Normal, UtilGtk.WHITE);
-
- UtilGtk.ColorsMenuLabel(label_mode_jumps);
- UtilGtk.ColorsMenuLabel(label_mode_jumps_reactive);
- UtilGtk.ColorsMenuLabel(label_mode_runs);
- UtilGtk.ColorsMenuLabel(label_mode_runs_intervallic);
- UtilGtk.ColorsMenuLabel(label_mode_reaction_times);
- UtilGtk.ColorsMenuLabel(label_mode_pulses);
- UtilGtk.ColorsMenuLabel(label_mode_multi_chronopic);
-
- UtilGtk.ColorsRadio(radio_mode_jumps);
- UtilGtk.ColorsRadio(radio_mode_jumps_reactive);
- UtilGtk.ColorsRadio(radio_mode_runs);
- UtilGtk.ColorsRadio(radio_mode_runs_intervallic);
- UtilGtk.ColorsRadio(radio_mode_reaction_times);
- UtilGtk.ColorsRadio(radio_mode_pulses);
- UtilGtk.ColorsRadio(radio_mode_multi_chronopic);
-
+
+ /*
+ * gui for small screens
+ */
+ viewport_mode_small.ModifyBg(StateType.Normal, UtilGtk.WHITE);
+
+ UtilGtk.ColorsMenuLabel(label_mode_jumps_small);
+ UtilGtk.ColorsMenuLabel(label_mode_jumps_reactive_small);
+ UtilGtk.ColorsMenuLabel(label_mode_runs_small);
+ UtilGtk.ColorsMenuLabel(label_mode_runs_intervallic_small);
+ UtilGtk.ColorsMenuLabel(label_mode_reaction_times_small);
+ UtilGtk.ColorsMenuLabel(label_mode_pulses_small);
+ UtilGtk.ColorsMenuLabel(label_mode_multi_chronopic_small);
+
+ UtilGtk.ColorsRadio(radio_mode_jumps_small);
+ UtilGtk.ColorsRadio(radio_mode_jumps_reactive_small);
+ UtilGtk.ColorsRadio(radio_mode_runs_small);
+ UtilGtk.ColorsRadio(radio_mode_runs_intervallic_small);
+ UtilGtk.ColorsRadio(radio_mode_reaction_times_small);
+ UtilGtk.ColorsRadio(radio_mode_pulses_small);
+ UtilGtk.ColorsRadio(radio_mode_multi_chronopic_small);
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumps);
- image_mode_jumps.Pixbuf = pixbuf;
+ image_mode_jumps_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameJumpsRJ);
- image_mode_jumps_reactive.Pixbuf = pixbuf;
+ image_mode_jumps_reactive_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRuns);
- image_mode_runs.Pixbuf = pixbuf;
+ image_mode_runs_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
- image_mode_runs_intervallic.Pixbuf = pixbuf;
+ image_mode_runs_intervallic_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
- image_mode_reaction_times.Pixbuf = pixbuf;
+ image_mode_reaction_times_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
- image_mode_pulses.Pixbuf = pixbuf;
+ image_mode_pulses_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameMultiChronopic);
- image_mode_multi_chronopic.Pixbuf = pixbuf;
+ image_mode_multi_chronopic_small.Pixbuf = pixbuf;
//jumps changes
@@ -809,50 +848,43 @@ public partial class ChronoJumpWindow
*/
/* ---------------------------------------------------------
- * ---------------- test modes ----------------------------
+ * ---------------- test modes (small GUI) ----------------
* --------------------------------------------------------
*/
- public void on_radio_mode_jumps_toggled (object obj, EventArgs args) {
- if(radio_mode_jumps.Active) {
+ public void on_radio_mode_jumps_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_jumps_small.Active)
notebooks_change(0);
- }
}
- public void on_radio_mode_jumps_reactive_toggled (object obj, EventArgs args) {
- if(radio_mode_jumps_reactive.Active) {
+ public void on_radio_mode_jumps_reactive_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_jumps_reactive_small.Active)
notebooks_change(1);
- }
}
- public void on_radio_mode_runs_toggled (object obj, EventArgs args) {
- if(radio_mode_runs.Active) {
+ public void on_radio_mode_runs_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_runs_small.Active)
notebooks_change(2);
- }
}
- public void on_radio_mode_runs_intervallic_toggled (object obj, EventArgs args) {
- if(radio_mode_runs_intervallic.Active) {
+ public void on_radio_mode_runs_intervallic_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_runs_intervallic_small.Active)
notebooks_change(3);
- }
}
- public void on_radio_mode_reaction_times_toggled (object obj, EventArgs args) {
- if(radio_mode_reaction_times.Active) {
+ public void on_radio_mode_reaction_times_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_reaction_times_small.Active)
notebooks_change(4);
- }
}
- public void on_radio_mode_pulses_toggled (object obj, EventArgs args) {
- if(radio_mode_pulses.Active) {
+ public void on_radio_mode_pulses_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_pulses_small.Active)
notebooks_change(5);
- }
}
- public void on_radio_mode_multi_chronopic_toggled (object obj, EventArgs args) {
- if(radio_mode_multi_chronopic.Active) {
+ public void on_radio_mode_multi_chronopic_small_toggled (object obj, EventArgs args) {
+ if(radio_mode_multi_chronopic_small.Active)
notebooks_change(6);
- }
}
/* ---------------------------------------------------------
@@ -2870,7 +2902,7 @@ Console.WriteLine("X");
void on_button_execute_test_clicked (object o, EventArgs args) {
- if(radio_mode_jumps.Active) {
+ if(radio_mode_jumps_small.Active) {
extra_window_jumps_weight = (double) extra_window_jumps_spinbutton_weight.Value;
extra_window_jumps_fall = (double) extra_window_jumps_spinbutton_fall.Value;
extra_window_jumps_arms = extra_window_jumps_check_dj_arms.Active;
@@ -2888,31 +2920,31 @@ Console.WriteLine("X");
on_normal_jump_activate(o, args);
}
- else if(radio_mode_jumps_reactive.Active) {
+ else if(radio_mode_jumps_reactive_small.Active) {
extra_window_jumps_rj_limited = (double) extra_window_jumps_rj_spinbutton_limit.Value;
extra_window_jumps_rj_weight = (double) extra_window_jumps_rj_spinbutton_weight.Value;
extra_window_jumps_rj_fall = (double) extra_window_jumps_rj_spinbutton_fall.Value;
on_rj_activate(o, args);
}
- else if(radio_mode_runs.Active) {
+ else if(radio_mode_runs_small.Active) {
extra_window_runs_distance = (double) extra_window_runs_spinbutton_distance.Value;
on_normal_run_activate(o, args);
}
- else if(radio_mode_runs_intervallic.Active) {
+ else if(radio_mode_runs_intervallic_small.Active) {
extra_window_runs_interval_distance = (double) extra_window_runs_interval_spinbutton_distance.Value;
extra_window_runs_interval_limit = extra_window_runs_interval_spinbutton_limit.Value;
on_run_interval_activate(o, args);
}
- else if(radio_mode_reaction_times.Active) {
+ else if(radio_mode_reaction_times_small.Active) {
on_reaction_time_activate (o, args);
}
- else if(radio_mode_pulses.Active) {
+ else if(radio_mode_pulses_small.Active) {
on_pulse_activate (o, args);
}
- else if(radio_mode_multi_chronopic.Active) {
+ else if(radio_mode_multi_chronopic_small.Active) {
on_multi_chronopic_start_clicked(o, args);
}
@@ -2925,96 +2957,6 @@ Console.WriteLine("X");
}
-
- private void on_button_enter (object o, EventArgs args) {
- /*
- //jump simple
- if(o == (object) button_free || o == (object) menuitem_jump_free) {
- currentEventType = new JumpType("Free");
- } else if(o == (object) button_sj) {
- currentEventType = new JumpType("SJ");
- } else if(o == (object) button_sj_l) {
- currentEventType = new JumpType("SJl");
- } else if(o == (object) button_cmj) {
- currentEventType = new JumpType("CMJ");
- } else if(o == (object) button_cmj_l) {
- currentEventType = new JumpType("CMJl");
- } else if(o == (object) button_abk) {
- currentEventType = new JumpType("ABK");
-//no abk_l button currently
-// } else if(o == (object) button_abk_l) {
-// currentEventType = new JumpType("ABKl");
- } else if(o == (object) button_dj) {
- currentEventType = new JumpType("DJ");
- } else if(o == (object) button_rocket) {
- currentEventType = new JumpType("Rocket");
- } else if(o == (object) button_take_off) {
- currentEventType = new JumpType(Constants.TakeOffName);
- //jumpRJ
- } else if(o == (object) button_rj_j) {
- currentEventType = new JumpType("RJ(j)");
- } else if(o == (object) button_rj_t) {
- currentEventType = new JumpType("RJ(t)");
- } else if(o == (object) button_rj_unlimited) {
- currentEventType = new JumpType("RJ(unlimited)");
- } else if(o == (object) button_rj_hexagon) {
- currentEventType = new JumpType("RJ(hexagon)");
- //run
- } else if(o == (object) button_run_custom) {
- currentEventType = new RunType("Custom");
- } else if(o == (object) button_run_20m) {
- currentEventType = new RunType("20m");
- } else if(o == (object) button_run_20m) {
- currentEventType = new RunType("100m");
- } else if(o == (object) button_run_100m) {
- currentEventType = new RunType("100m");
- } else if(o == (object) button_run_200m) {
- currentEventType = new RunType("200m");
- } else if(o == (object) button_run_400m) {
- currentEventType = new RunType("400m");
- } else if(o == (object) button_run_gesell) {
- currentEventType = new RunType("Gesell-DBT");
- } else if(o == (object) button_run_20yard) {
- currentEventType = new RunType("Agility-20Yard");
- } else if(o == (object) button_run_505) {
- currentEventType = new RunType("Agility-505");
- } else if(o == (object) button_run_illinois) {
- currentEventType = new RunType("Agility-Illinois");
- } else if(o == (object) button_run_margaria) {
- currentEventType = new RunType("Margaria");
- } else if(o == (object) button_run_shuttle) {
- currentEventType = new RunType("Agility-Shuttle-Run");
- } else if(o == (object) button_run_zigzag) {
- currentEventType = new RunType("Agility-ZigZag");
- //run interval
- } else if(o == (object) button_run_interval_by_laps) {
- currentEventType = new RunType("byLaps");
- } else if(o == (object) button_run_interval_by_time) {
- currentEventType = new RunType("byTime");
- } else if(o == (object) button_run_interval_unlimited) {
- currentEventType = new RunType("unlimited");
- } else if(o == (object) button_run_interval_mtgug) {
- currentEventType = new RunType("MTGUG");
- //reactionTime
- } else if(o == (object) button_reaction_time) {
- currentEventType = new ReactionTimeType("reactionTime");
- //pulse
- } else if(o == (object) button_pulse_free) {
- currentEventType = new PulseType("Free");
- } else if(o == (object) button_pulse_custom) {
- currentEventType = new PulseType("Custom");
- //multiChronopic
- } else if(o == (object) button_multi_chronopic_start) {
- currentEventType = new MultiChronopicType(Constants.MultiChronopicName);
- } else if(o == (object) button_run_analysis) {
- currentEventType = new MultiChronopicType(Constants.RunAnalysisName);
- }
-
- changeTestImage(currentEventType.Type.ToString(), currentEventType.Name, currentEventType.ImageFileName);
- */
- }
-
-
//changes the image about the text on the bottom left of main screen
private void changeTestImage(string eventTypeString, string eventName, string fileNameString) {
label_image_test.Text = "<b>" + eventName + "</b>";
@@ -3948,7 +3890,7 @@ Console.WriteLine("X");
//chronopicWin.FakeWindowDone.Clicked -= new EventHandler(on_chronopic_window_connected_or_done);
int cps = chronopicWin.NumConnected();
- if(radio_mode_multi_chronopic.Active)
+ if(radio_mode_multi_chronopic_small.Active)
on_extra_window_multichronopic_test_changed(new object(), new EventArgs());
chronopicLabels(cps);
@@ -5329,7 +5271,7 @@ Console.WriteLine("X");
private void sensitiveGuiEventDoing () {
session_menuitem.Sensitive = false;
help_menuitem.Sensitive = false;
- viewport_mode.Sensitive = false;
+ viewport_mode_small.Sensitive = false;
frame_persons.Sensitive = false;
button_execute_test.Sensitive = false;
@@ -5352,7 +5294,7 @@ Console.WriteLine("X");
private void sensitiveGuiEventDone () {
session_menuitem.Sensitive = true;
help_menuitem.Sensitive = true;
- viewport_mode.Sensitive = true;
+ viewport_mode_small.Sensitive = true;
frame_persons.Sensitive = true;
button_execute_test.Sensitive = true;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 7c9cc4c..cbefb1b 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -494,7 +494,6 @@ public partial class ChronoJumpWindow
{
Gdk.EventConfigure ev = args.Event;
Gdk.Window window = ev.Window;
-
Gdk.Rectangle allocation = event_execute_drawingarea.Allocation;
@@ -1068,7 +1067,6 @@ Log.WriteLine("Preparing reactive A");
double tcNow, double tcPerson, double tcSession,
double maxValue, double minValue, int topMargin, int bottomMargin)
{
-
int ancho=drawingarea.Allocation.Width;
int alto=drawingarea.Allocation.Height;
@@ -1138,7 +1136,6 @@ Log.WriteLine("Preparing reactive A");
drawGuideOrAVG(pen_negro_discont, eventGraphConfigureWin.BlackGuide, alto, ancho, topMargin, bottomMargin, maxValue, minValue);
drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho, topMargin, bottomMargin, maxValue, minValue);
}
-
}
private void paintRunSimple (Gtk.DrawingArea drawingarea, Gdk.GC myPen, string [] runs,
@@ -1788,12 +1785,10 @@ Log.WriteLine("Preparing reactive A");
switch (currentEventType.Type) {
case EventType.Types.JUMP:
if(thisJumpIsSimple) {
- Log.Write("update graph: JUMP");
PrepareJumpSimpleGraph(
currentEventExecute.PrepareEventGraphJumpSimpleObject.tv,
currentEventExecute.PrepareEventGraphJumpSimpleObject.tc);
} else {
- Log.Write("update graph: JUMPREACTIVE");
PrepareJumpReactiveGraph(
currentEventExecute.PrepareEventGraphJumpReactiveObject.lastTv,
currentEventExecute.PrepareEventGraphJumpReactiveObject.lastTc,
@@ -1804,12 +1799,10 @@ Log.WriteLine("Preparing reactive A");
break;
case EventType.Types.RUN:
if(thisRunIsSimple) {
- Log.Write("update graph: RUN");
PrepareRunSimpleGraph(
currentEventExecute.PrepareEventGraphRunSimpleObject.time,
currentEventExecute.PrepareEventGraphRunSimpleObject.speed);
} else {
- Log.Write("update graph: RUNINTERVAL");
PrepareRunIntervalGraph(
currentEventExecute.PrepareEventGraphRunIntervalObject.distance,
currentEventExecute.PrepareEventGraphRunIntervalObject.lastTime,
@@ -1820,18 +1813,15 @@ Log.WriteLine("Preparing reactive A");
}
break;
case EventType.Types.REACTIONTIME:
- Log.Write("update graph: REACTIONTIME");
PrepareReactionTimeGraph(
currentEventExecute.PrepareEventGraphReactionTimeObject.time);
break;
case EventType.Types.PULSE:
- Log.Write("update graph: PULSE");
PreparePulseGraph(
currentEventExecute.PrepareEventGraphPulseObject.lastTime,
currentEventExecute.PrepareEventGraphPulseObject.timesString);
break;
case EventType.Types.MULTICHRONOPIC:
- Log.Write("update graph: MULTICHRONOPIC");
PrepareMultiChronopicGraph(
currentEventExecute.PrepareEventGraphMultiChronopicObject.cp1StartedIn,
currentEventExecute.PrepareEventGraphMultiChronopicObject.cp2StartedIn,
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index 46492c4..03225a8 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -114,7 +114,6 @@ public partial class ChronoJumpWindow {
[Widget] Gtk.SpinButton spin_graph_margin_r; //right
[Widget] Gtk.SpinButton spin_graph_x_cex_axis; //font size of x axis
- [Widget] Gtk.VSeparator vseparator_stats_x_axis;
[Widget] Gtk.HBox hbox_stats_x_axis;
//bool statsAutomatic = true;
@@ -466,7 +465,6 @@ public partial class ChronoJumpWindow {
}
private void showXAxisOptions(bool show) {
- vseparator_stats_x_axis.Visible = show;
hbox_stats_x_axis.Visible = show;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
