[chronojump] Several improvements on repetitive conditions window
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Several improvements on repetitive conditions window
- Date: Thu, 4 Jun 2020 11:51:54 +0000 (UTC)
commit 8843ece3d17f0b52c4aaabc8791977d2008da4ad
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jun 4 13:26:43 2020 +0200
Several improvements on repetitive conditions window
glade/repetitive_conditions.glade | 1529 ++++++++++++++++++++-----------------
src/gui/repetitiveConditions.cs | 79 +-
2 files changed, 882 insertions(+), 726 deletions(-)
---
diff --git a/glade/repetitive_conditions.glade b/glade/repetitive_conditions.glade
index 2b93595d..064e6619 100644
--- a/glade/repetitive_conditions.glade
+++ b/glade/repetitive_conditions.glade
@@ -22,11 +22,11 @@
<property name="tab_hborder">10</property>
<property name="tab_vborder">4</property>
<child>
- <widget class="GtkVBox" id="vbox9">
+ <widget class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="spacing">14</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkFrame" id="frame_best_and_worst">
<property name="visible">True</property>
@@ -1630,104 +1630,283 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_encoder_stuff">
+ <widget class="GtkHBox" id="hbox_test_bells_contacts">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">14</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox39">
+ <widget class="GtkLabel" id="label58">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">30</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Test bells</property>
+ </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_test_good1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Test "Good" bell</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_test_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkHBox" id="hbox37">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Main variable</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-media-play</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="image_repetitive_test_good1">
+ <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">1</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_test_bad1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Test "Bad" bell</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_test_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox_combo_encoder_main_variable">
+ <widget class="GtkHBox" id="hbox50">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <widget class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-media-play</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="image_repetitive_test_bad1">
+ <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">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_test_sound_result1">
+ <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">3</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">jumps/runs</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_encoder_stuff">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkAlignment" id="alignment18">
+ <widget class="GtkVBox" id="vbox_main_variable">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">20</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkFrame" id="frame_encoder_automatic_conditions">
+ <widget class="GtkHBox" id="hbox39">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="spacing">30</property>
<child>
- <widget class="GtkAlignment" id="alignment19">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">10</property>
- <property name="bottom_padding">10</property>
- <property name="left_padding">10</property>
- <property name="right_padding">10</property>
+ <property name="label" translatable="yes">Main variable</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="hbox_combo_encoder_main_variable">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">14</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkTable" id="table9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="n_rows">2</property>
+ <property name="column_spacing">10</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox13">
+ <widget class="GtkHBox" id="hbox35">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkRadioButton" id="radio_encoder_relative_to_set">
- <property name="label" translatable="yes">this set</property>
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_radio_encoder_relative_to_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label"><=</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="radio_encoder_relative_to_historical">
- <property name="label" translatable="yes">historical of this
person on same exercise/encoder configuration</property>
+ <widget class="GtkHBox" id="hbox45">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radio_encoder_relative_to_set</property>
- <signal name="toggled"
handler="on_radio_encoder_relative_to_toggled" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spinbutton_encoder_automatic_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">70 10 100 1 1 0</property>
+ <property name="climb_rate">10</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed"
handler="on_spinbutton_encoder_automatic_lower_value_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <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="expand">False</property>
@@ -1735,32 +1914,21 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <widget class="GtkHBox" id="hbox47">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment23">
+ <widget class="GtkButton"
id="button_encoder_automatic_lower_minus_1">
+ <property name="label"> -1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel" id="label_main_variable_text">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <signal name="clicked"
handler="on_button_encoder_automatic_lower_minus_1_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">True</property>
@@ -1768,458 +1936,466 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_automatic_lower_plus_1">
+ <property name="label"> +1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <signal name="clicked"
handler="on_button_encoder_automatic_lower_plus_1_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">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table9">
+ <widget class="GtkCheckButton"
id="checkbutton_encoder_automatic_lower">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="column_spacing">10</property>
- <property name="row_spacing">6</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 bad</property>
+ <property name="draw_indicator">True</property>
<child>
- <widget class="GtkHBox" id="hbox35">
+ <widget class="GtkAlignment" id="alignment20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label9">
- <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">0</property>
- </packing>
- </child>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox45">
+ <widget class="GtkHBox" id="hbox36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkSpinButton"
id="spinbutton_encoder_automatic_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">70 10 100 1 1
0</property>
- <property name="climb_rate">10</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <signal name="value_changed"
handler="on_spinbutton_encoder_automatic_lower_value_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkImage"
id="image_repetitive_encoder_automatic_lower">
<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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox47">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_automatic_lower_minus_1">
- <property name="label"> -1 </property>
- <property name="width_request">40</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <signal name="clicked"
handler="on_button_encoder_automatic_lower_minus_1_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_encoder_automatic_lower_plus_1">
- <property name="label"> +1 </property>
- <property name="width_request">40</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <signal name="clicked"
handler="on_button_encoder_automatic_lower_plus_1_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="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton"
id="checkbutton_encoder_automatic_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
bad</property>
- <property name="draw_indicator">True</property>
- <child>
- <widget class="GtkAlignment" id="alignment20">
- <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="hbox36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage"
id="image_repetitive_encoder_automatic_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="padding">20</property>
- <property name="position">3</property>
- </packing>
</child>
</widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">20</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox44">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spinbutton_encoder_automatic_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">90 10 100 1 1 0</property>
+ <property name="climb_rate">10</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed"
handler="on_spinbutton_encoder_automatic_greater_value_changed" swapped="no"/>
+ </widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"/>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox33">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label8">
- <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">0</property>
- </packing>
- </child>
+ <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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_automatic_greater_minus_1">
+ <property name="label"> -1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <signal name="clicked"
handler="on_button_encoder_automatic_greater_minus_1_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_encoder_automatic_greater_plus_1">
+ <property name="label"> +1 </property>
+ <property name="width_request">40</property>
+ <property name="height_request">40</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <signal name="clicked"
handler="on_button_encoder_automatic_greater_plus_1_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="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="checkbutton_encoder_automatic_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="alignment28">
+ <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="hbox44">
+ <widget class="GtkHBox" id="hbox34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkSpinButton"
id="spinbutton_encoder_automatic_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">90 10 100 1 1
0</property>
- <property name="climb_rate">10</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <signal name="value_changed"
handler="on_spinbutton_encoder_automatic_greater_value_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkImage"
id="image_repetitive_encoder_automatic_greater">
<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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox46">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_automatic_greater_minus_1">
- <property name="label"> -1 </property>
- <property name="width_request">40</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <signal name="clicked"
handler="on_button_encoder_automatic_greater_minus_1_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_encoder_automatic_greater_plus_1">
- <property name="label"> +1 </property>
- <property name="width_request">40</property>
- <property name="height_request">40</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <signal name="clicked"
handler="on_button_encoder_automatic_greater_plus_1_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="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton"
id="checkbutton_encoder_automatic_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="alignment28">
- <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="hbox34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage"
id="image_repetitive_encoder_automatic_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="padding">20</property>
- <property name="position">3</property>
- </packing>
</child>
</widget>
- <packing>
- <property name="x_options"/>
- </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="padding">20</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Feedback relative to the
maximum repetition of ...</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_encoder_relative_to_set">
+ <property name="label" translatable="yes">this set</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_radio_encoder_relative_to_toggled" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_encoder_relative_to_historical">
+ <property name="label" translatable="yes">historical of this
person on same exercise/encoder configuration</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">radio_encoder_relative_to_set</property>
+ <signal name="toggled"
handler="on_radio_encoder_relative_to_toggled" swapped="no"/>
+ </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">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">On eccentric-concentric
have feedback ...</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox11">
+ <widget class="GtkAlignment" id="alignment30">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label41">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">On
eccentric-concentric have feedback ...</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="left_padding">20</property>
<child>
- <widget class="GtkAlignment" id="alignment30">
+ <widget class="GtkHBox" id="hbox49">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">20</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox49">
+ <widget class="GtkRadioButton" id="radio_encoder_eccon_both">
+ <property name="label" translatable="yes">on both
phases</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkRadioButton"
id="radio_encoder_eccon_both">
- <property name="label" translatable="yes">on both
phases</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </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_encoder_eccon_ecc">
- <property name="label" translatable="yes">on
eccentric</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property
name="group">radio_encoder_eccon_both</property>
- </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_encoder_eccon_con">
- <property name="label" translatable="yes">on
concentric</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property
name="group">radio_encoder_eccon_both</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </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_encoder_eccon_ecc">
+ <property name="label" translatable="yes">on
eccentric</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_encoder_eccon_both</property>
+ </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_encoder_eccon_con">
+ <property name="label" translatable="yes">on
concentric</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_encoder_eccon_both</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkCheckButton"
id="check_encoder_inertial_ecc_overload">
+ <property name="label" translatable="yes">Show eccentric overload on
inertial</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_check_encoder_inertial_ecc_overload_toggled" swapped="no"/>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="check_encoder_inertial_ecc_overload_percent">
+ <property name="label" translatable="yes">Show also
percentage</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Feedback relative to the maximum
repetition of ...</property>
- <property name="use_markup">True</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -2260,47 +2436,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkCheckButton" id="check_encoder_inertial_ecc_overload">
- <property name="label" translatable="yes">Show eccentric overload on
inertial</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_check_encoder_inertial_ecc_overload_toggled"
swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="check_encoder_inertial_ecc_overload_percent">
- <property name="label" translatable="yes">Show also percentage</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -3763,18 +3899,18 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</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>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_test_bells">
+ <widget class="GtkHBox" id="hbox_test_bells_encoder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
@@ -3822,227 +3958,55 @@
<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">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_test_bad">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Test "Bad" bell</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_test_clicked" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-media-play</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="image_repetitive_test_bad">
- <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">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_test_sound_result">
- <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">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox_force_capture_feedback">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkCheckButton" id="check_force_sensor_capture_feedback">
- <property name="label" translatable="yes">Show feedback rectangle</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_check_force_sensor_capture_feedback_toggled"
swapped="no"/>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment29">
+ <widget class="GtkButton" id="button_test_bad">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">20</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Test "Bad" bell</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_test_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox_force_sensor_capture_feedback">
+ <widget class="GtkHBox" id="hbox15">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox324">
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label395">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">at</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_force_sensor_capture_feedback_at">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">100 0 9999 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label397">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">N</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="stock">gtk-media-play</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox323">
+ <widget class="GtkImage" id="image_repetitive_test_bad">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label396">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">range</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton"
id="spin_force_sensor_capture_feedback_range">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
- <property name="adjustment">40 2 200 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label398">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">N</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -4050,19 +4014,33 @@
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_test_sound_result">
+ <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">3</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label46">
@@ -4071,6 +4049,7 @@
<property name="label" translatable="yes">Feedback</property>
</widget>
<packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -4800,7 +4779,7 @@
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -4809,7 +4788,179 @@
<property name="can_focus">False</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox_force_capture_feedback">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">14</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkCheckButton" id="check_force_sensor_capture_feedback">
+ <property name="label" translatable="yes">Show feedback rectangle</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_check_force_sensor_capture_feedback_toggled"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <widget class="GtkHBox" id="hbox_force_sensor_capture_feedback">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkHBox" id="hbox324">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label395">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">at</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spin_force_sensor_capture_feedback_at">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">100 0 9999 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label397">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">N</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox323">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label396">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">range</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spin_force_sensor_capture_feedback_range">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">40 2 200 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label398">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">N</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label59">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">force sensor</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
diff --git a/src/gui/repetitiveConditions.cs b/src/gui/repetitiveConditions.cs
index e3b9bc0e..84199ecd 100644
--- a/src/gui/repetitiveConditions.cs
+++ b/src/gui/repetitiveConditions.cs
@@ -30,13 +30,9 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.Notebook notebook_main;
//[Widget] Gtk.ScrolledWindow scrolled_conditions;
- [Widget] Gtk.Frame frame_best_and_worst;
[Widget] Gtk.Box hbox_jump_best_worst;
[Widget] Gtk.Box hbox_run_best_worst;
- [Widget] Gtk.VBox vbox_encoder_stuff;
- [Widget] Gtk.Frame frame_conditions;
-
/* jumps */
[Widget] Gtk.Box hbox_jump_conditions;
[Widget] Gtk.CheckButton checkbutton_jump_tf_tc_best;
@@ -72,12 +68,10 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.SpinButton spinbutton_time_lower;
/* encoder */
- [Widget] Gtk.Frame frame_encoder_automatic_conditions;
[Widget] Gtk.HBox hbox_combo_encoder_main_variable;
[Widget] Gtk.ComboBox combo_encoder_main_variable;
[Widget] Gtk.RadioButton radio_encoder_relative_to_set;
[Widget] Gtk.RadioButton radio_encoder_relative_to_historical;
- [Widget] Gtk.Label label_main_variable_text;
[Widget] Gtk.CheckButton checkbutton_encoder_automatic_greater;
[Widget] Gtk.CheckButton checkbutton_encoder_automatic_lower;
[Widget] Gtk.SpinButton spinbutton_encoder_automatic_greater;
@@ -129,10 +123,13 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.Button button_test_good;
+ [Widget] Gtk.Button button_test_good1;
+ [Widget] Gtk.Button button_test_bad;
+ [Widget] Gtk.Button button_test_bad1;
[Widget] Gtk.Label label_test_sound_result;
+ [Widget] Gtk.Label label_test_sound_result1;
[Widget] Gtk.Button button_close;
- [Widget] Gtk.HBox hbox_test_bells;
//bells good (green)
[Widget] Gtk.Image image_repetitive_best_tf_tc;
[Widget] Gtk.Image image_repetitive_best_time;
@@ -150,6 +147,7 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.Image image_encoder_power_higher;
[Widget] Gtk.Image image_encoder_peakpower_higher;
[Widget] Gtk.Image image_repetitive_test_good;
+ [Widget] Gtk.Image image_repetitive_test_good1;
//bells bad (red)
[Widget] Gtk.Image image_repetitive_worst_tf_tc;
[Widget] Gtk.Image image_repetitive_worst_time;
@@ -167,6 +165,7 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.Image image_encoder_power_lower;
[Widget] Gtk.Image image_encoder_peakpower_lower;
[Widget] Gtk.Image image_repetitive_test_bad;
+ [Widget] Gtk.Image image_repetitive_test_bad1;
//encoder rhythm
[Widget] Gtk.Label label_rhythm_tab;
@@ -191,14 +190,15 @@ public class RepetitiveConditionsWindow
[Widget] Gtk.CheckButton check_rhythm_rest_reps;
//forceSensor
- [Widget] Gtk.VBox vbox_force_capture_feedback;
[Widget] Gtk.CheckButton check_force_sensor_capture_feedback;
[Widget] Gtk.HBox hbox_force_sensor_capture_feedback;
[Widget] Gtk.SpinButton spin_force_sensor_capture_feedback_at;
[Widget] Gtk.SpinButton spin_force_sensor_capture_feedback_range;
- const int FEEDBACKPAGE = 0;
- const int RHYTHMPAGE = 1;
+ const int JUMPSRUNSPAGE = 0;
+ const int ENCODERPAGE = 1;
+ const int ENCODERRHYTHMPAGE = 2;
+ const int FORCESENSORPAGE = 3;
public Gtk.Button FakeButtonClose;
@@ -296,38 +296,35 @@ public class RepetitiveConditionsWindow
int forceSensorCaptureFeedbackAt,
int forceSensorCaptureFeedbackRange)
{
- frame_best_and_worst.Hide();
- frame_conditions.Hide();
hbox_jump_best_worst.Hide();
hbox_run_best_worst.Hide();
hbox_jump_conditions.Hide();
hbox_run_conditions.Hide();
- frame_encoder_automatic_conditions.Hide();
vbox_encoder_manual.Hide();
notebook_encoder_conditions.Hide();
- vbox_encoder_stuff.Hide();
- vbox_force_capture_feedback.Hide();
- hbox_test_bells.Hide();
- notebook_main.GetNthPage(RHYTHMPAGE).Hide();
+ notebook_main.GetNthPage(JUMPSRUNSPAGE).Hide();
+ notebook_main.GetNthPage(ENCODERPAGE).Hide();
+ notebook_main.GetNthPage(ENCODERRHYTHMPAGE).Hide();
+ notebook_main.GetNthPage(FORCESENSORPAGE).Hide();
notebook_main.ShowTabs = false;
- if(bellMode == Constants.BellModes.JUMPS) {
- frame_best_and_worst.Show();
+ if(bellMode == Constants.BellModes.JUMPS)
+ {
hbox_jump_best_worst.Show();
hbox_jump_conditions.Show();
- frame_conditions.Show();
- hbox_test_bells.Show();
- } else if(bellMode == Constants.BellModes.RUNS) {
- frame_best_and_worst.Show();
+
+ notebook_main.GetNthPage(JUMPSRUNSPAGE).Show();
+ }
+ else if(bellMode == Constants.BellModes.RUNS)
+ {
hbox_run_best_worst.Show();
hbox_run_conditions.Show();
- frame_conditions.Show();
- hbox_test_bells.Show();
- } else if (bellMode == Constants.BellModes.ENCODERGRAVITATORY || bellMode ==
Constants.BellModes.ENCODERINERTIAL)
+
+ notebook_main.GetNthPage(JUMPSRUNSPAGE).Show();
+ }
+ else if (bellMode == Constants.BellModes.ENCODERGRAVITATORY || bellMode ==
Constants.BellModes.ENCODERINERTIAL)
{
- vbox_encoder_stuff.Show();
- frame_encoder_automatic_conditions.Show();
notebook_main.ShowTabs = true;
vbox_encoder_manual.Show();
@@ -386,9 +383,11 @@ public class RepetitiveConditionsWindow
else
radio_encoder_eccon_both.Active = true;
- notebook_main.GetNthPage(RHYTHMPAGE).Show();
+ notebook_main.GetNthPage(ENCODERPAGE).Show();
+ notebook_main.GetNthPage(ENCODERRHYTHMPAGE).Show();
+ notebook_main.CurrentPage = ENCODERPAGE;
+
encoder_rhythm_set_values(encoderRhythm);
- hbox_test_bells.Show();
}
else if(bellMode == Constants.BellModes.FORCESENSOR)
{
@@ -404,10 +403,11 @@ public class RepetitiveConditionsWindow
spin_force_sensor_capture_feedback_at.Value = forceSensorCaptureFeedbackAt;
spin_force_sensor_capture_feedback_range.Value = forceSensorCaptureFeedbackRange;
- vbox_force_capture_feedback.Visible = true;
+ notebook_main.GetNthPage(FORCESENSORPAGE).Show();
}
label_test_sound_result.Text = "";
+ label_test_sound_result1.Text = "";
}
private void createComboEncoderMainAndSecondaryVariables()
@@ -446,8 +446,6 @@ public class RepetitiveConditionsWindow
if(mainVariable != "Mean power" && mainVariable != "Mean speed" && mainVariable != "Mean
force")
radio_encoder_relative_to_set.Active = true;
-
- label_main_variable_text.Text = mainVariable;
}
private void on_check_encoder_show_secondary_variable_toggled (object o, EventArgs args)
@@ -481,6 +479,7 @@ public class RepetitiveConditionsWindow
image_encoder_power_higher.Pixbuf = pixbuf;
image_encoder_peakpower_higher.Pixbuf = pixbuf;
image_repetitive_test_good.Pixbuf = pixbuf;
+ image_repetitive_test_good1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_bell_red.png");
image_repetitive_worst_tf_tc.Pixbuf = pixbuf;
@@ -499,6 +498,7 @@ public class RepetitiveConditionsWindow
image_encoder_power_lower.Pixbuf = pixbuf;
image_encoder_peakpower_lower.Pixbuf = pixbuf;
image_repetitive_test_bad.Pixbuf = pixbuf;
+ image_repetitive_test_bad1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_info.png");
image_clusters_info.Pixbuf = pixbuf;
@@ -511,16 +511,21 @@ public class RepetitiveConditionsWindow
Util.TestSound = true;
label_test_sound_result.Text = "";
+ label_test_sound_result1.Text = "";
+
Util.SoundCodes sc;
- if (o == button_test_good)
+ if (o == button_test_good || o == button_test_good1)
sc = Util.PlaySound(Constants.SoundTypes.GOOD, true, gstreamer);
- else //button_test_bad
+ else //if (o == button_test_bad || o == button_test_good1)
sc = Util.PlaySound(Constants.SoundTypes.BAD, true, gstreamer);
- if(sc == Util.SoundCodes.OK)
+ if(sc == Util.SoundCodes.OK) {
label_test_sound_result.Text = Catalog.GetString("Sound working");
- else
+ label_test_sound_result1.Text = Catalog.GetString("Sound working");
+ } else {
label_test_sound_result.Text = Catalog.GetString("Sound not working");
+ label_test_sound_result1.Text = Catalog.GetString("Sound working");
+ }
Util.TestSound = false;
} else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
