[chronojump] Multijumps height feedback
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Multijumps height feedback
- Date: Thu, 11 Dec 2014 13:41:45 +0000 (UTC)
commit 47f05fc047a73f6f333928c20d2354ce2621b23d
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Dec 11 14:40:01 2014 +0100
Multijumps height feedback
glade/chronojump.glade | 445 ++++++++++++++++++++++++++++++++++-----
src/gui/eventExecute.cs | 29 +++-
src/gui/repetitiveConditions.cs | 29 +++
3 files changed, 451 insertions(+), 52 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index e19e6dd..21c4711 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6339,6 +6339,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7069,6 +7072,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7142,7 +7148,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_tc_good">
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_tc_good">
<property name="width_request">16</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -7155,7 +7161,7 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_tc_bad">
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_tc_bad">
<property name="width_request">16</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -7210,7 +7216,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tc_good">
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_good">
<property name="width_request">16</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -7223,7 +7229,7 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tc_bad">
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_bad">
<property name="width_request">16</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -7278,7 +7284,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_good">
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_height_good">
<property name="width_request">16</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -7291,7 +7297,7 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_bad">
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_height_bad">
<property name="width_request">16</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -7323,20 +7329,6 @@ Second Chronopic to platforms.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label117">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">TF /
TC</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
<widget class="GtkEventBox"
id="event_execute_eventbox_jump_reactive_tf_tc">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7416,6 +7408,74 @@ Second Chronopic to platforms.</property>
<property name="y_options"/>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox137">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="label117">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">TF /
TC</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox138">
+ <property name="width_request">16</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_tc_good">
+ <property name="width_request">16</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="event_execute_image_jump_reactive_tf_tc_bad">
+ <property name="width_request">16</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -7997,6 +8057,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8620,6 +8683,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -18375,6 +18441,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18906,6 +18975,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -19929,6 +20001,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -20009,6 +20084,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -28883,6 +28961,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -30794,6 +30890,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -31363,6 +31462,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33926,6 +34028,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -34121,6 +34226,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -34331,6 +34439,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -35262,7 +35373,7 @@ show elevation as:</property>
<widget class="GtkTable" id="table_jump_conditions_good">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">3</property>
<property name="column_spacing">8</property>
<property name="row_spacing">12</property>
@@ -35315,6 +35426,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35352,6 +35465,8 @@ show elevation as:</property>
</child>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35375,6 +35490,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
@@ -35412,8 +35529,8 @@ show elevation as:</property>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35437,8 +35554,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
@@ -35481,8 +35598,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -35558,8 +35675,8 @@ show elevation as:</property>
</child>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35583,8 +35700,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
@@ -35627,12 +35744,125 @@ show elevation as:</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Height</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">>=</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton_height_greater">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">40 10 99 1 1 0</property>
+ <property name="climb_rate">10</property>
+ <property name="digits">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed"
handler="on_spinbutton_height_greater_value_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"/>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton_height_greater">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Bell good</property>
+ <property name="draw_indicator">True</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image_repetitive_height_greater">
+ <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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -35655,7 +35885,7 @@ show elevation as:</property>
<widget class="GtkTable" id="table_jump_conditions_bad">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">3</property>
<property name="column_spacing">8</property>
<property name="row_spacing">12</property>
@@ -35708,6 +35938,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35745,6 +35977,8 @@ show elevation as:</property>
</child>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35758,7 +35992,7 @@ show elevation as:</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">0.29999999329440002 0 1 0.0099999997764800008
0.0099999997764800008 0</property>
+ <property name="adjustment">0.99999997764800008 0 1 0.0099999997764800008
0.0099999997764800008 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -35768,6 +36002,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
@@ -35805,8 +36041,8 @@ show elevation as:</property>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35830,8 +36066,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
@@ -35874,8 +36110,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -35950,8 +36186,8 @@ show elevation as:</property>
</child>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -35975,8 +36211,8 @@ show elevation as:</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
@@ -36019,12 +36255,125 @@ show elevation as:</property>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Height</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"><=</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton_height_lower">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">20 10 99 1 1 0</property>
+ <property name="climb_rate">10</property>
+ <property name="digits">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed"
handler="on_spinbutton_height_lower_value_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"/>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton_height_lower">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Bell good</property>
+ <property name="draw_indicator">True</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image_repetitive_height_lower">
+ <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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -36719,7 +37068,7 @@ show elevation as:</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">10 0 300 1 10 0</property>
+ <property name="adjustment">1 0 300 1 10 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 78a9a0f..c5335ff 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -83,6 +83,7 @@ public partial class ChronoJumpWindow
//for the color change in the background of the cell label
[Widget] Gtk.EventBox event_execute_eventbox_jump_simple_tc;
[Widget] Gtk.EventBox event_execute_eventbox_jump_simple_tf;
+ //[Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_height;
[Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_tc;
[Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_tf;
//[Widget] Gtk.EventBox event_execute_eventbox_jump_reactive_tf_tc;
@@ -132,6 +133,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label event_execute_label_reaction_time_person;
[Widget] Gtk.Label event_execute_label_reaction_time_session;
+ [Widget] Gtk.Image event_execute_image_jump_reactive_height_good;
+ [Widget] Gtk.Image event_execute_image_jump_reactive_height_bad;
[Widget] Gtk.Image event_execute_image_jump_reactive_tf_good;
[Widget] Gtk.Image event_execute_image_jump_reactive_tf_bad;
[Widget] Gtk.Image event_execute_image_jump_reactive_tc_good;
@@ -262,6 +265,7 @@ public partial class ChronoJumpWindow
event_execute_eventbox_jump_simple_tc.ModifyBg(Gtk.StateType.Normal, UtilGtk.RED_PLOTS);
event_execute_eventbox_jump_simple_tf.ModifyBg(Gtk.StateType.Normal, UtilGtk.BLUE_PLOTS);
+ //event_execute_eventbox_jump_reactive_height.ModifyBg(Gtk.StateType.Normal,
UtilGtk.RED_PLOTS);
event_execute_eventbox_jump_reactive_tc.ModifyBg(Gtk.StateType.Normal, UtilGtk.RED_PLOTS);
event_execute_eventbox_jump_reactive_tf.ModifyBg(Gtk.StateType.Normal, UtilGtk.BLUE_PLOTS);
event_execute_eventbox_run_simple_time.ModifyBg(Gtk.StateType.Normal, UtilGtk.RED_PLOTS);
@@ -298,12 +302,14 @@ public partial class ChronoJumpWindow
private void eventExecutePutNonStandardIcons() {
Pixbuf pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_green.png");
+ event_execute_image_jump_reactive_height_good.Pixbuf = pixbuf;
event_execute_image_jump_reactive_tf_good.Pixbuf = pixbuf;
event_execute_image_jump_reactive_tc_good.Pixbuf = pixbuf;
event_execute_image_jump_reactive_tf_tc_good.Pixbuf = pixbuf;
event_execute_image_run_interval_time_good.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_red.png");
+ event_execute_image_jump_reactive_height_bad.Pixbuf = pixbuf;
event_execute_image_jump_reactive_tf_bad.Pixbuf = pixbuf;
event_execute_image_jump_reactive_tc_bad.Pixbuf = pixbuf;
event_execute_image_jump_reactive_tf_tc_bad.Pixbuf = pixbuf;
@@ -311,6 +317,8 @@ public partial class ChronoJumpWindow
}
private void eventExecuteHideImages() {
+ event_execute_image_jump_reactive_height_good.Hide();
+ event_execute_image_jump_reactive_height_bad.Hide();
event_execute_image_jump_reactive_tf_good.Hide();
event_execute_image_jump_reactive_tf_bad.Hide();
event_execute_image_jump_reactive_tc_good.Hide();
@@ -1235,6 +1243,7 @@ Log.WriteLine("Preparing reactive A");
int ancho=drawingarea.Allocation.Width;
int alto=drawingarea.Allocation.Height;
+ double lastHeight = Convert.ToDouble(Util.GetHeightInCentimeters(lastTv.ToString()));
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
@@ -1318,12 +1327,16 @@ Log.WriteLine("Preparing reactive A");
plotSimulatedMessageIfNeededAtCenter(ancho, alto);
//bells & images
+ event_execute_image_jump_reactive_height_good.Hide();
+ event_execute_image_jump_reactive_height_bad.Hide();
event_execute_image_jump_reactive_tf_good.Hide();
event_execute_image_jump_reactive_tf_bad.Hide();
event_execute_image_jump_reactive_tc_good.Hide();
event_execute_image_jump_reactive_tc_bad.Hide();
event_execute_image_jump_reactive_tf_tc_good.Hide();
event_execute_image_jump_reactive_tf_tc_bad.Hide();
+ bool showHeightGood = false;
+ bool showHeightBad = false;
bool showTfGood = false;
bool showTfBad = false;
bool showTcGood = false;
@@ -1339,6 +1352,11 @@ Log.WriteLine("Preparing reactive A");
showTfTcBad = true;
}
+ if(repetitiveConditionsWin.HeightGreater && lastHeight >
repetitiveConditionsWin.HeightGreaterValue)
+ showHeightGood = true;
+ if(repetitiveConditionsWin.HeightLower && lastHeight <
repetitiveConditionsWin.HeightLowerValue)
+ showHeightBad = true;
+
if(repetitiveConditionsWin.TfGreater && lastTv >
repetitiveConditionsWin.TfGreaterValue)
showTfGood = true;
if(repetitiveConditionsWin.TfLower && lastTv < repetitiveConditionsWin.TfLowerValue)
@@ -1355,11 +1373,15 @@ Log.WriteLine("Preparing reactive A");
showTfTcGood = true;
- if(showTfGood || showTcGood || showTfTcGood)
+ if(showHeightGood || showTfGood || showTcGood || showTfTcGood)
Util.PlaySound(Constants.SoundTypes.GOOD, volumeOn);
- if(showTfBad || showTcBad || showTfTcBad)
+ if(showHeightBad || showTfBad || showTcBad || showTfTcBad)
Util.PlaySound(Constants.SoundTypes.BAD, volumeOn);
+ if(showHeightGood)
+ event_execute_image_jump_reactive_height_good.Show();
+ if(showHeightBad)
+ event_execute_image_jump_reactive_height_bad.Show();
if(showTfGood)
event_execute_image_jump_reactive_tf_good.Show();
if(showTfBad)
@@ -1380,8 +1402,7 @@ Log.WriteLine("Preparing reactive A");
*/
//height
- event_execute_label_jump_reactive_height_now.Text = "<b>" + Util.TrimDecimals(
- Util.GetHeightInCentimeters(lastTv.ToString()), preferences.digitsNumber) +
"</b>";
+ event_execute_label_jump_reactive_height_now.Text = "<b>" +
Util.TrimDecimals(lastHeight.ToString(), preferences.digitsNumber) + "</b>";
event_execute_label_jump_reactive_height_now.UseMarkup = true;
event_execute_label_jump_reactive_height_avg.Text = Util.TrimDecimals(
Util.GetHeightInCentimeters(avgTV.ToString()), preferences.digitsNumber);
diff --git a/src/gui/repetitiveConditions.cs b/src/gui/repetitiveConditions.cs
index aae4a49..39151b4 100644
--- a/src/gui/repetitiveConditions.cs
+++ b/src/gui/repetitiveConditions.cs
@@ -38,6 +38,8 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.CheckButton checkbutton_jump_tf_tc_best;
[Widget] Gtk.CheckButton checkbutton_jump_tf_tc_worst;
+ [Widget] Gtk.CheckButton checkbutton_height_greater;
+ [Widget] Gtk.CheckButton checkbutton_height_lower;
[Widget] Gtk.CheckButton checkbutton_tf_greater;
[Widget] Gtk.CheckButton checkbutton_tf_lower;
[Widget] Gtk.CheckButton checkbutton_tc_greater;
@@ -45,6 +47,8 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.CheckButton checkbutton_tf_tc_greater;
[Widget] Gtk.CheckButton checkbutton_tf_tc_lower;
+ [Widget] Gtk.SpinButton spinbutton_height_greater;
+ [Widget] Gtk.SpinButton spinbutton_height_lower;
[Widget] Gtk.SpinButton spinbutton_tf_greater;
[Widget] Gtk.SpinButton spinbutton_tf_lower;
[Widget] Gtk.SpinButton spinbutton_tc_greater;
@@ -97,6 +101,7 @@ public class RepetitiveConditionsWindow
//bells good (green)
[Widget] Gtk.Image image_repetitive_best_tf_tc;
[Widget] Gtk.Image image_repetitive_best_time;
+ [Widget] Gtk.Image image_repetitive_height_greater;
[Widget] Gtk.Image image_repetitive_tf_greater;
[Widget] Gtk.Image image_repetitive_tc_lower;
[Widget] Gtk.Image image_repetitive_tf_tc_greater;
@@ -110,6 +115,7 @@ public class RepetitiveConditionsWindow
//bells bad (red)
[Widget] Gtk.Image image_repetitive_worst_tf_tc;
[Widget] Gtk.Image image_repetitive_worst_time;
+ [Widget] Gtk.Image image_repetitive_height_lower;
[Widget] Gtk.Image image_repetitive_tf_lower;
[Widget] Gtk.Image image_repetitive_tc_greater;
[Widget] Gtk.Image image_repetitive_tf_tc_lower;
@@ -194,6 +200,7 @@ public class RepetitiveConditionsWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_green.png");
image_repetitive_best_tf_tc.Pixbuf = pixbuf;
image_repetitive_best_time.Pixbuf = pixbuf;
+ image_repetitive_height_greater.Pixbuf = pixbuf;
image_repetitive_tf_greater.Pixbuf = pixbuf;
image_repetitive_tc_lower.Pixbuf = pixbuf;
image_repetitive_tf_tc_greater.Pixbuf = pixbuf;
@@ -208,6 +215,7 @@ public class RepetitiveConditionsWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_red.png");
image_repetitive_worst_tf_tc.Pixbuf = pixbuf;
image_repetitive_worst_time.Pixbuf = pixbuf;
+ image_repetitive_height_lower.Pixbuf = pixbuf;
image_repetitive_tf_lower.Pixbuf = pixbuf;
image_repetitive_tc_greater.Pixbuf = pixbuf;
image_repetitive_tf_tc_lower.Pixbuf = pixbuf;
@@ -257,6 +265,13 @@ public class RepetitiveConditionsWindow
/* Auto.mark checkbox if spinbutton is changed */
/* jumps */
+ void on_spinbutton_height_greater_value_changed (object o, EventArgs args) {
+ checkbutton_height_greater.Active = true;
+ }
+ void on_spinbutton_height_lower_value_changed (object o, EventArgs args) {
+ checkbutton_height_lower.Active = true;
+ }
+
void on_spinbutton_tf_greater_value_changed (object o, EventArgs args) {
checkbutton_tf_greater.Active = true;
}
@@ -331,6 +346,13 @@ public class RepetitiveConditionsWindow
get { return checkbutton_jump_tf_tc_worst.Active; }
}
+ public bool HeightGreater {
+ get { return checkbutton_height_greater.Active; }
+ }
+ public bool HeightLower {
+ get { return checkbutton_height_lower.Active; }
+ }
+
public bool TfGreater {
get { return checkbutton_tf_greater.Active; }
}
@@ -352,6 +374,13 @@ public class RepetitiveConditionsWindow
get { return checkbutton_tf_tc_lower.Active; }
}
+ public double HeightGreaterValue {
+ get { return Convert.ToDouble(spinbutton_height_greater.Value); }
+ }
+ public double HeightLowerValue {
+ get { return Convert.ToDouble(spinbutton_height_lower.Value); }
+ }
+
public double TfGreaterValue {
get { return Convert.ToDouble(spinbutton_tf_greater.Value); }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
