commit 7b0a15d743222ae8db146b349a477cefb447ac09
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Feb 18 14:16:25 2017 +0100
Material design icons (blue) (10%). Encoder exercise stuff opens below (75%)
glade/app1.glade | 1759 ++++++++++++--------
images/md/ic_add_blue_24dp_1x.png | Bin 0 -> 172 bytes
images/md/ic_all_inclusive_blue_24dp_1x.png | Bin 0 -> 607 bytes
images/md/ic_build_blue_24dp_1x.png | Bin 0 -> 566 bytes
images/md/ic_cached_blue_24dp_1x.png | Bin 0 -> 470 bytes
images/md/ic_cached_blue_24dp_2x.png | Bin 0 -> 831 bytes
images/md/ic_close_blue_24dp_1x.png | Bin 0 -> 338 bytes
images/md/ic_close_blue_24dp_2x.png | Bin 0 -> 552 bytes
images/md/ic_delete_blue_24dp.png | Bin 0 -> 298 bytes
images/md/ic_delete_blue_24dp_1x.png | Bin 0 -> 212 bytes
images/md/ic_developer_board_blue_24dp_1x.png | Bin 0 -> 286 bytes
images/md/ic_developer_board_blue_24dp_2x.png | Bin 0 -> 376 bytes
images/md/ic_directions_run_blue_24dp_2x.png | Bin 0 -> 840 bytes
images/md/ic_edit_blue_24dp_1x.png | Bin 0 -> 391 bytes
images/md/ic_fitness_center_blue_24dp_1x.png | Bin 0 -> 482 bytes
images/md/ic_folder_open_black_24dp_2x.png | Bin 0 -> 390 bytes
images/md/ic_folder_open_blue_24dp_1x.png | Bin 0 -> 261 bytes
images/md/ic_gravity_1x.png | Bin 0 -> 333 bytes
images/md/ic_home_blue_24dp_1x.png | Bin 0 -> 361 bytes
images/md/ic_info_outline_blue_24dp_1x.png | Bin 0 -> 598 bytes
images/md/ic_insert_chart_blue_24dp_1x.png | Bin 0 -> 249 bytes
images/md/ic_insert_chart_blue_24dp_2x.png | Bin 0 -> 337 bytes
images/md/ic_looks_one_blue_24dp_1x.png | Bin 0 -> 247 bytes
images/md/ic_notifications_blue_24dp_1x.png | Bin 0 -> 373 bytes
images/md/ic_person_blue_24dp_1x.png | Bin 0 -> 359 bytes
images/md/ic_person_blue_24dp_2x.png | Bin 0 -> 544 bytes
images/md/ic_power_settings_new_blue_24dp_1x.png | Bin 0 -> 484 bytes
.../md/ic_settings_backup_restore_blue_24dp_1x.png | Bin 0 -> 593 bytes
.../md/ic_settings_backup_restore_blue_24dp_2x.png | Bin 0 -> 1046 bytes
images/md/ic_settings_blue_24dp_1x.png | Bin 0 -> 565 bytes
images/md/ic_timer_blue_24dp_1x.png | Bin 0 -> 552 bytes
images/md/ic_timer_blue_24dp_2x.png | Bin 0 -> 1022 bytes
src/Makefile.am | 25 +-
src/gui/chronojump.cs | 139 ++-
src/gui/encoder.cs | 72 +-
src/gui/stats.cs | 3 +-
36 files changed, 1237 insertions(+), 761 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 6daaf24..d9a85eb 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -13458,7 +13458,7 @@ Concentric</property>
<widget class="GtkImage"
id="image_mode_encoder_capture">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-execute</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13560,13 +13560,20 @@ Concentric</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_person_change">
- <property name="label"
translatable="yes">Person</property>
<property name="width_request">80</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="tooltip"
translatable="yes">Person</property>
<signal name="clicked"
handler="on_button_encoder_person_change_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image_person">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -13584,73 +13591,108 @@ Concentric</property>
<child>
<widget class="GtkHBox"
id="hbox_menu_and_preferences_outside_menu">
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">20</property>
<child>
<widget class="GtkHBox" id="hbox73">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label_encoder_not_menu">
- <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>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkButton"
id="button_gravitatory_not_menu">
- <property name="width_request">50</property>
+ <widget class="GtkRadioButton"
id="radiobutton_gravitatory_not_menu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
+ <property name="receives_default">False</property>
<property name="tooltip"
translatable="yes">Gravitatory</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_selector_start_encoder_gravitatory_clicked" swapped="no"/>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_button_selector_start_encoder_gravitatory_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_gravitatory_not_menu">
+ <widget class="GtkHBox" id="hbox121">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_gravitatory_not_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_gravitatory">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Gravitatory</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">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_inertial_not_menu">
- <property name="width_request">50</property>
+ <widget class="GtkRadioButton"
id="radiobutton_inertial_not_menu">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
+ <property name="receives_default">False</property>
<property name="tooltip"
translatable="yes">Inertial</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_selector_start_encoder_inertial_clicked" swapped="no"/>
+ <property name="relief">none</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radiobutton_gravitatory_not_menu</property>
+ <signal name="toggled"
handler="on_button_selector_start_encoder_inertial_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_inertial_not_menu">
+ <widget class="GtkHBox" id="hbox123">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkImage"
id="image_inertial_not_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_inertial">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Inertial</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">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -13672,10 +13714,10 @@ Concentric</property>
<signal name="activate"
handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
<signal name="clicked"
handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
<child>
- <widget class="GtkImage" id="image8">
+ <widget class="GtkImage" id="image_home">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-home</property>
+ <property name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
@@ -13698,10 +13740,10 @@ Concentric</property>
<property name="relief">half</property>
<signal name="clicked" handler="on_preferences_activate"
swapped="no"/>
<child>
- <widget class="GtkImage" id="image64">
+ <widget class="GtkImage" id="image_settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-preferences</property>
+ <property name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
@@ -13714,7 +13756,6 @@ Concentric</property>
</child>
<child>
<widget class="GtkButton"
id="button_preferences_not_menu_quit">
- <property name="label">gtk-quit</property>
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -13723,8 +13764,14 @@ Concentric</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Quit</property>
<property name="relief">half</property>
- <property name="use_stock">True</property>
<signal name="clicked" handler="on_quit1_activate"
swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image_quit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -13755,7 +13802,7 @@ Concentric</property>
<property name="tab_hborder">10</property>
<property name="tab_vborder">4</property>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <widget class="GtkVBox" id="vbox_encoder_capture">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -13796,13 +13843,44 @@ Concentric</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_select">
- <property name="label"
translatable="yes">Encoder configuration</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
+ <property name="relief">half</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_select_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_configuration">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label90">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Encoder configuration</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>
@@ -13819,6 +13897,7 @@ Concentric</property>
<property name="label">Read RFID</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="relief">half</property>
<signal name="clicked"
handler="on_button_rfid_read_clicked" swapped="no"/>
</widget>
<packing>
@@ -13833,6 +13912,7 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="relief">half</property>
<signal name="clicked"
handler="on_button_rfid_start_clicked" swapped="no"/>
</widget>
<packing>
@@ -14014,10 +14094,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image15">
+ <widget class="GtkImage"
id="image_chronopic_connect">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-connect</property>
+ <property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
<packing>
@@ -14058,213 +14138,49 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox96">
+ <widget class="GtkHBox" id="hbox_encoder_capture_top">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_capture_options">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkVBox" id="vbox18">
+ <widget class="GtkFrame"
id="frame_encoder_capture_options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkHBox" id="hbox86">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_exercise_capture">
+ <widget class="GtkHBox" id="hbox80">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Exercise</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_exercise_edit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Show/edit description of this exercise.</property>
- <signal name="clicked"
handler="on_button_encoder_exercise_edit_clicked" swapped="no"/>
+ <property name="border_width">2</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkImage" id="image4">
+ <widget class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-edit</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
<child>
- <widget class="GtkButton"
id="button_encoder_exercise_add">
+ <widget class="GtkButton"
id="button_encoder_exercise">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Add
new exercise</property>
- <signal name="clicked"
handler="on_button_encoder_exercise_add_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image2986">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox112">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_eccon">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Type
of contraction</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_exercise_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_laterality">
+ <widget class="GtkImage"
id="image_encoder_exercise">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Right, Left or both (RL)</property>
- <child>
- <placeholder/>
- </child>
+ <property
name="stock">gtk-missing-image</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook"
id="notebook_encoder_capture_extra_mass">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <child>
- <widget class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkHBox" id="hbox47">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkHBox"
id="hbox_encoder_capture_extra_mass_no_raspberry">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Extra mass</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel"
id="label_encoder_extra_weight_text">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Extra
mass</property>
- </widget>
- <packing>
- <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkSpinButton"
id="spin_encoder_extra_weight">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">3</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">10 0 300 1 10
0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property
name="update_policy">if-valid</property>
- <signal name="value_changed"
handler="on_spin_encoder_extra_weight_value_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_encoder_extra_weight_label_kg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Kg</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>
@@ -14273,156 +14189,19 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_encoder_capture_extra_mass_raspberry">
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_minus_10">
- <property name="label">-10</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_raspberry_extra_weight_minus_10_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_raspberry_extra_weight_minus_1">
- <property name="label"> -1 </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_raspberry_extra_weight_minus_1_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry"
id="entry_raspberry_extra_weight">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">3</property>
- <property name="has_frame">False</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">3</property>
- <property name="text">10</property>
- <property name="shadow_type">none</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>
- <signal name="changed"
handler="on_entry_raspberry_extra_weight_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_1">
- <property name="label"> +1 </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_raspberry_extra_weight_plus_1_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_10">
- <property name="label">+10</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_raspberry_extra_weight_plus_10_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox45">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Total mass</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel"
id="label_encoder_displaced_weight">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">10</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label40">
+ <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Kg</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>
<child>
- <widget class="GtkHBox" id="hbox_capture_1RM">
+ <widget class="GtkHBox" id="hbox144">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkLabel"
id="label_encoder_1RM_percent">
+ <widget class="GtkLabel"
id="label_encoder_exercise">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property
name="label">label_encoder_exercise</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -14431,227 +14210,22 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label86">
+ <widget class="GtkLabel"
id="label_encoder_contraction">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="label">%1RM</property>
- <property name="use_markup">True</property>
- </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_encoder_1RM_win">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">1RM
window</property>
- <signal name="clicked"
handler="on_button_encoder_1RM_win_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image31">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-dialog-info</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
+ <property name="label">contraction</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">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </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>
- </child>
<child>
- <widget class="GtkLabel" id="label85">
+ <widget class="GtkLabel" id="label_encoder_rl">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">page
1</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkHBox"
id="hbox_encoder_anchorage_diameter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Diameter</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_anchorage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label123">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">cm</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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox66">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkHBox" id="hbox160">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label183">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Weights</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton"
id="spin_encoder_im_weights_n">
- <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">0 0 50 1 1
0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property
name="update_policy">if-valid</property>
- <signal name="value_changed"
handler="on_spin_encoder_im_weights_n_value_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox"
id="hbox_encoder_im_weights_n">
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_im_weights_n_minus">
- <property name="label"> -1 </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_im_weights_n_minus_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry"
id="entry_encoder_im_weights_n">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">2</property>
- <property name="has_frame">False</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">2</property>
- <property name="text">0</property>
- <property name="shadow_type">none</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>
- <signal name="changed"
handler="on_entry_encoder_im_weights_n_changed" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_im_weights_n_plus">
- <property name="label"> +1 </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_im_weights_n_plus_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="label">RL</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -14661,34 +14235,17 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox157">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkLabel" id="label182">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Inertia moment</property>
- <property name="label"
translatable="yes">IM</property>
- </widget>
- <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_encoder_im_total">
+ <widget class="GtkLabel" id="label85">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Kg*cm^2</property>
+ <property name="xalign">0</property>
+ <property name="label">Mass stuff</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -14698,46 +14255,22 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</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="position">1</property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label129">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">page
2</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
+ <placeholder/>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -14757,24 +14290,25 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHBox"
id="hbox_encoder_capture_1_or_cont">
+ <widget class="GtkVBox"
id="vbox_encoder_capture_1_or_cont">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
<widget class="GtkRadioButton"
id="radio_encoder_capture_1set">
- <property name="label" translatable="yes">1
set</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="tooltip"
translatable="yes">Capture 1 set</property>
+ <property name="relief">none</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_capture_1set">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -14784,13 +14318,21 @@ Concentric</property>
</child>
<child>
<widget class="GtkRadioButton"
id="radio_encoder_capture_cont">
- <property name="label"
translatable="yes">cont</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="tooltip"
translatable="yes">Capture continuously</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
<property name="draw_indicator">False</property>
<property
name="group">radio_encoder_capture_1set</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_capture_cont">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -14801,8 +14343,8 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -14814,39 +14356,16 @@ Concentric</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Or
press 'CTRL + space'</property>
+ <property name="relief">half</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
<accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkHBox" id="hbox206">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label90">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Capture</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_encoder_capture_execute">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-apply</property>
- <property name="icon-size">3</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">6</property>
</widget>
</child>
</widget>
@@ -14856,13 +14375,6 @@ Concentric</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="GtkTable" id="table3">
<property name="visible">True</property>
@@ -14880,13 +14392,14 @@ Concentric</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Recalculate set with changed parameters</property>
+ <property name="relief">half</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_recalculate_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image23">
+ <widget class="GtkImage" id="image_recalculate">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-refresh</property>
+ <property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
@@ -14901,13 +14414,14 @@ Concentric</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip" translatable="yes">Load
set</property>
+ <property name="relief">half</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_load_signal_clicked" swapped="no"/>
<child>
<widget class="GtkImage"
id="image_encoder_capture_open">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property
name="stock">gtk-missing-image</property>
<property name="icon-size">2</property>
</widget>
</child>
@@ -14925,6 +14439,7 @@ Concentric</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Delete set</property>
+ <property name="relief">half</property>
<signal name="clicked"
handler="on_button_encoder_delete_signal_clicked" swapped="no"/>
<child>
<widget class="GtkImage"
id="image_encoder_signal_delete">
@@ -14950,6 +14465,7 @@ Concentric</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Feedback</property>
+ <property name="relief">half</property>
<property name="xalign">0</property>
<signal name="clicked"
handler="on_button_encoder_bells_clicked" swapped="no"/>
<child>
@@ -14970,7 +14486,7 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -15145,6 +14661,7 @@ Concentric</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="relief">half</property>
<signal name="clicked"
handler="on_button_encoder_signal_save_comment_clicked" swapped="no"/>
</widget>
<packing>
@@ -15201,7 +14718,7 @@ Concentric</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <widget class="GtkNotebook"
id="notebook_encoder_capture_or_instructions">
+ <widget class="GtkNotebook"
id="notebook_encoder_capture_or_exercise_or_instructions">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -15440,6 +14957,829 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment20">
+ <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>
+ <child>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">25</property>
+ <child>
+ <widget class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <property name="row_spacing">20</property>
+ <child>
+ <widget class="GtkLabel" id="label138">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Exercise</property>
+ </widget>
+ <packing>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox86">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_combo_encoder_exercise_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Exercise</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_exercise_edit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Show/edit description of this exercise.</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_exercise_edit_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_exercise_edit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_exercise_add">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Add
new exercise</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_exercise_add_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_exercise_add">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox112">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_combo_encoder_eccon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Type
of contraction</property>
+ <child>
+ <placeholder/>
+ </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="hbox_combo_encoder_laterality">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Right, Left or both (RL)</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox"
id="vbox_encoder_exercise_mass">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox47">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_capture_extra_mass_no_raspberry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Extra mass</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_extra_weight_text">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Extra</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_extra_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">3</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">10 0 300 1 10
0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property
name="update_policy">if-valid</property>
+ <signal name="value_changed"
handler="on_spin_encoder_extra_weight_value_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_extra_weight_label_kg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Kg</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="hbox_encoder_capture_extra_mass_raspberry">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_minus_10">
+ <property name="label">-10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_raspberry_extra_weight_minus_10_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_raspberry_extra_weight_minus_1">
+ <property name="label"> -1 </property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_raspberry_extra_weight_minus_1_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry"
id="entry_raspberry_extra_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">3</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">3</property>
+ <property name="text">10</property>
+ <property name="shadow_type">none</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>
+ <signal name="changed"
handler="on_entry_raspberry_extra_weight_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_1">
+ <property name="label"> +1 </property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_raspberry_extra_weight_plus_1_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_raspberry_extra_weight_plus_10">
+ <property name="label">+10</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_raspberry_extra_weight_plus_10_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkHBox" id="hbox49">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label137">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Total</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox124">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Total mass</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_displaced_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">10</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Kg</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">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_capture_1RM">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_1RM_percent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label86">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="label">%1RM</property>
+ <property name="use_markup">True</property>
+ </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_encoder_1RM_win">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">1RM
window</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_1RM_win_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_1RM_info">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">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="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox"
id="vbox_encoder_exercise_inertia">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_anchorage_diameter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label123">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Diameter</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_anchorage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label129">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">cm</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox66">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkHBox" id="hbox160">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label183">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Weights</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_im_weights_n">
+ <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">0 0 50 1 1
0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ <property
name="update_policy">if-valid</property>
+ <signal name="value_changed"
handler="on_spin_encoder_im_weights_n_value_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_im_weights_n">
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_im_weights_n_minus">
+ <property name="label"> -1 </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_im_weights_n_minus_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry"
id="entry_encoder_im_weights_n">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">2</property>
+ <property name="has_frame">False</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</property>
+ <property name="text">0</property>
+ <property name="shadow_type">none</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>
+ <signal name="changed"
handler="on_entry_encoder_im_weights_n_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_im_weights_n_plus">
+ <property name="label"> +1 </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_im_weights_n_plus_clicked" swapped="no"/>
+ </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">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox157">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label182">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Inertia moment</property>
+ <property name="label"
translatable="yes">IM</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_im_total">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Kg*cm^2</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">True</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>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</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">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox43">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_exercise_mass">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Mass</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_exercise_inertia">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Inertia</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</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="GtkHButtonBox" id="hbuttonbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_11">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Close</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_encoder_exercise_close_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_exercise_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </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="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_exercise1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">encoder
exercise</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkVBox" id="vbox81">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -15525,7 +15865,7 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -15534,7 +15874,7 @@ then click this button.</property>
<property name="label">encoder inertial
instructions</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>
@@ -16149,35 +16489,10 @@ then click this button.</property>
</widget>
</child>
<child>
- <widget class="GtkHBox" id="hbox131">
+ <widget class="GtkLabel" id="label73">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image40">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-execute</property>
- <property name="icon-size">2</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="label73">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Capture</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Capture</property>
</widget>
<packing>
<property name="tab_fill">False</property>
@@ -16185,7 +16500,7 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox43">
+ <widget class="GtkVBox" id="vbox_encoder_analyze">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -18614,6 +18929,24 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -18947,36 +19280,10 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox27">
+ <widget class="GtkLabel" id="label74">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_stats_win_graph3_old">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label74">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Analyze</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="label" translatable="yes">Analyze</property>
</widget>
<packing>
<property name="position">1</property>
diff --git a/images/md/ic_add_blue_24dp_1x.png b/images/md/ic_add_blue_24dp_1x.png
new file mode 100644
index 0000000..3e47e34
Binary files /dev/null and b/images/md/ic_add_blue_24dp_1x.png differ
diff --git a/images/md/ic_all_inclusive_blue_24dp_1x.png b/images/md/ic_all_inclusive_blue_24dp_1x.png
new file mode 100644
index 0000000..5c2ac16
Binary files /dev/null and b/images/md/ic_all_inclusive_blue_24dp_1x.png differ
diff --git a/images/md/ic_build_blue_24dp_1x.png b/images/md/ic_build_blue_24dp_1x.png
new file mode 100644
index 0000000..8c41190
Binary files /dev/null and b/images/md/ic_build_blue_24dp_1x.png differ
diff --git a/images/md/ic_cached_blue_24dp_1x.png b/images/md/ic_cached_blue_24dp_1x.png
new file mode 100644
index 0000000..3a396b7
Binary files /dev/null and b/images/md/ic_cached_blue_24dp_1x.png differ
diff --git a/images/md/ic_cached_blue_24dp_2x.png b/images/md/ic_cached_blue_24dp_2x.png
new file mode 100644
index 0000000..f319623
Binary files /dev/null and b/images/md/ic_cached_blue_24dp_2x.png differ
diff --git a/images/md/ic_close_blue_24dp_1x.png b/images/md/ic_close_blue_24dp_1x.png
new file mode 100644
index 0000000..d2aadb8
Binary files /dev/null and b/images/md/ic_close_blue_24dp_1x.png differ
diff --git a/images/md/ic_close_blue_24dp_2x.png b/images/md/ic_close_blue_24dp_2x.png
new file mode 100644
index 0000000..d59590f
Binary files /dev/null and b/images/md/ic_close_blue_24dp_2x.png differ
diff --git a/images/md/ic_delete_blue_24dp.png b/images/md/ic_delete_blue_24dp.png
new file mode 100644
index 0000000..c203e64
Binary files /dev/null and b/images/md/ic_delete_blue_24dp.png differ
diff --git a/images/md/ic_delete_blue_24dp_1x.png b/images/md/ic_delete_blue_24dp_1x.png
new file mode 100644
index 0000000..ca600cf
Binary files /dev/null and b/images/md/ic_delete_blue_24dp_1x.png differ
diff --git a/images/md/ic_developer_board_blue_24dp_1x.png b/images/md/ic_developer_board_blue_24dp_1x.png
new file mode 100644
index 0000000..863f287
Binary files /dev/null and b/images/md/ic_developer_board_blue_24dp_1x.png differ
diff --git a/images/md/ic_developer_board_blue_24dp_2x.png b/images/md/ic_developer_board_blue_24dp_2x.png
new file mode 100644
index 0000000..1e20911
Binary files /dev/null and b/images/md/ic_developer_board_blue_24dp_2x.png differ
diff --git a/images/md/ic_directions_run_blue_24dp_2x.png b/images/md/ic_directions_run_blue_24dp_2x.png
new file mode 100644
index 0000000..9400f8b
Binary files /dev/null and b/images/md/ic_directions_run_blue_24dp_2x.png differ
diff --git a/images/md/ic_edit_blue_24dp_1x.png b/images/md/ic_edit_blue_24dp_1x.png
new file mode 100644
index 0000000..9481068
Binary files /dev/null and b/images/md/ic_edit_blue_24dp_1x.png differ
diff --git a/images/md/ic_fitness_center_blue_24dp_1x.png b/images/md/ic_fitness_center_blue_24dp_1x.png
new file mode 100644
index 0000000..089590d
Binary files /dev/null and b/images/md/ic_fitness_center_blue_24dp_1x.png differ
diff --git a/images/md/ic_folder_open_black_24dp_2x.png b/images/md/ic_folder_open_black_24dp_2x.png
new file mode 100644
index 0000000..b9ed7e1
Binary files /dev/null and b/images/md/ic_folder_open_black_24dp_2x.png differ
diff --git a/images/md/ic_folder_open_blue_24dp_1x.png b/images/md/ic_folder_open_blue_24dp_1x.png
new file mode 100644
index 0000000..0e08c7e
Binary files /dev/null and b/images/md/ic_folder_open_blue_24dp_1x.png differ
diff --git a/images/md/ic_gravity_1x.png b/images/md/ic_gravity_1x.png
new file mode 100644
index 0000000..944de0a
Binary files /dev/null and b/images/md/ic_gravity_1x.png differ
diff --git a/images/md/ic_home_blue_24dp_1x.png b/images/md/ic_home_blue_24dp_1x.png
new file mode 100644
index 0000000..fc26d2c
Binary files /dev/null and b/images/md/ic_home_blue_24dp_1x.png differ
diff --git a/images/md/ic_info_outline_blue_24dp_1x.png b/images/md/ic_info_outline_blue_24dp_1x.png
new file mode 100644
index 0000000..5623500
Binary files /dev/null and b/images/md/ic_info_outline_blue_24dp_1x.png differ
diff --git a/images/md/ic_insert_chart_blue_24dp_1x.png b/images/md/ic_insert_chart_blue_24dp_1x.png
new file mode 100644
index 0000000..207d12c
Binary files /dev/null and b/images/md/ic_insert_chart_blue_24dp_1x.png differ
diff --git a/images/md/ic_insert_chart_blue_24dp_2x.png b/images/md/ic_insert_chart_blue_24dp_2x.png
new file mode 100644
index 0000000..bfc8ac5
Binary files /dev/null and b/images/md/ic_insert_chart_blue_24dp_2x.png differ
diff --git a/images/md/ic_looks_one_blue_24dp_1x.png b/images/md/ic_looks_one_blue_24dp_1x.png
new file mode 100644
index 0000000..985e44e
Binary files /dev/null and b/images/md/ic_looks_one_blue_24dp_1x.png differ
diff --git a/images/md/ic_notifications_blue_24dp_1x.png b/images/md/ic_notifications_blue_24dp_1x.png
new file mode 100644
index 0000000..bed08b0
Binary files /dev/null and b/images/md/ic_notifications_blue_24dp_1x.png differ
diff --git a/images/md/ic_person_blue_24dp_1x.png b/images/md/ic_person_blue_24dp_1x.png
new file mode 100644
index 0000000..93f7712
Binary files /dev/null and b/images/md/ic_person_blue_24dp_1x.png differ
diff --git a/images/md/ic_person_blue_24dp_2x.png b/images/md/ic_person_blue_24dp_2x.png
new file mode 100644
index 0000000..ca34be1
Binary files /dev/null and b/images/md/ic_person_blue_24dp_2x.png differ
diff --git a/images/md/ic_power_settings_new_blue_24dp_1x.png
b/images/md/ic_power_settings_new_blue_24dp_1x.png
new file mode 100644
index 0000000..d5160df
Binary files /dev/null and b/images/md/ic_power_settings_new_blue_24dp_1x.png differ
diff --git a/images/md/ic_settings_backup_restore_blue_24dp_1x.png
b/images/md/ic_settings_backup_restore_blue_24dp_1x.png
new file mode 100644
index 0000000..130b824
Binary files /dev/null and b/images/md/ic_settings_backup_restore_blue_24dp_1x.png differ
diff --git a/images/md/ic_settings_backup_restore_blue_24dp_2x.png
b/images/md/ic_settings_backup_restore_blue_24dp_2x.png
new file mode 100644
index 0000000..1d5dcc8
Binary files /dev/null and b/images/md/ic_settings_backup_restore_blue_24dp_2x.png differ
diff --git a/images/md/ic_settings_blue_24dp_1x.png b/images/md/ic_settings_blue_24dp_1x.png
new file mode 100644
index 0000000..01be9b7
Binary files /dev/null and b/images/md/ic_settings_blue_24dp_1x.png differ
diff --git a/images/md/ic_timer_blue_24dp_1x.png b/images/md/ic_timer_blue_24dp_1x.png
new file mode 100644
index 0000000..f30eb45
Binary files /dev/null and b/images/md/ic_timer_blue_24dp_1x.png differ
diff --git a/images/md/ic_timer_blue_24dp_2x.png b/images/md/ic_timer_blue_24dp_2x.png
new file mode 100644
index 0000000..3672995
Binary files /dev/null and b/images/md/ic_timer_blue_24dp_2x.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 584f3ff..1136d03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -330,7 +330,7 @@ RESOURCES = \
../images/mini/plataforma_contactos.jpg,mini/plataforma_contactos.jpg \
../images/infrared.jpg,infrared.jpg \
../images/mini/infrared.jpg,mini/infrared.jpg \
- ../images/stock_bell.png,stock_bell.png \
+ ../images/md/ic_notifications_blue_24dp_1x.png,stock_bell.png \
../images/stock_bell_green.png,stock_bell_green.png \
../images/stock_bell_red.png,stock_bell_red.png \
../images/line_session_max.png,line_session_max.png \
@@ -347,7 +347,28 @@ RESOURCES = \
../images/spreadsheet.png,spreadsheet.png \
../images/report_view.png,report_view.png \
../images/preferences-system.png,preferences-system.png \
- ../images/stock_delete.png,stock_delete.png \
+ ../images/md/ic_home_blue_24dp_1x.png,image_home.png \
+ ../images/md/ic_settings_blue_24dp_1x.png,image_settings.png \
+ ../images/md/ic_close_blue_24dp_1x.png,image_close.png \
+ ../images/md/ic_close_blue_24dp_2x.png,image_close_big.png \
+ ../images/md/ic_power_settings_new_blue_24dp_1x.png,image_quit.png \
+ ../images/md/ic_gravity_1x.png,image_gravity.png \
+ ../images/md/ic_settings_backup_restore_blue_24dp_1x.png,image_inertia.png \
+ ../images/md/ic_timer_blue_24dp_1x.png,image_capture.png \
+ ../images/md/ic_insert_chart_blue_24dp_1x.png,image_analyze.png \
+ ../images/md/ic_developer_board_blue_24dp_1x.png,image_chronopic_connect.png \
+ ../images/md/ic_person_blue_24dp_1x.png,image_person.png \
+ ../images/md/ic_cached_blue_24dp_1x.png,image_recalculate.png \
+ ../images/md/ic_delete_blue_24dp_1x.png,stock_delete.png \
+ ../images/md/ic_folder_open_blue_24dp_1x.png,folder_open.png \
+ ../images/md/ic_looks_one_blue_24dp_1x.png,one.png \
+ ../images/md/ic_all_inclusive_blue_24dp_1x.png,cont.png \
+ ../images/md/ic_directions_run_blue_24dp_2x.png,run.png \
+ ../images/md/ic_build_blue_24dp_1x.png,image_build.png \
+ ../images/md/ic_edit_blue_24dp_1x.png,image_edit.png \
+ ../images/md/ic_add_blue_24dp_1x.png,image_add.png \
+ ../images/md/ic_info_outline_blue_24dp_1x.png,image_info.png \
+ ../images/md/ic_fitness_center_blue_24dp_1x.png,image_exercise.png \
../images/chronojump_icon.png,chronojump_icon.png \
../images/chronojump_icon_graph.png,chronojump_icon_graph.png \
../images/stock_right.png,stock_right.png \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index f3b7392..628c262 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -697,7 +697,27 @@ public partial class ChronoJumpWindow
" " + ((Label) radio_menuitem_mode_power_inertial.Child).Text;
}
- private void putNonStandardIcons() {
+ [Widget] Gtk.Image image_home;
+ [Widget] Gtk.Image image_settings;
+ [Widget] Gtk.Image image_quit;
+ [Widget] Gtk.Image image_mode_encoder_capture;
+ [Widget] Gtk.Image image_person;
+ [Widget] Gtk.Image image_encoder_1RM_info;
+ [Widget] Gtk.Image image_chronopic_connect;
+ [Widget] Gtk.Image image_recalculate;
+ [Widget] Gtk.Image image_encoder_configuration;
+ [Widget] Gtk.Image image_encoder_exercise;
+ [Widget] Gtk.Image image_encoder_exercise1;
+ [Widget] Gtk.Image image_encoder_capture_open;
+ [Widget] Gtk.Image image_encoder_capture_1set;
+ [Widget] Gtk.Image image_encoder_capture_cont;
+ [Widget] Gtk.Image image_encoder_capture_execute;
+ [Widget] Gtk.Image image_encoder_exercise_add;
+ [Widget] Gtk.Image image_encoder_exercise_edit;
+ [Widget] Gtk.Image image_encoder_exercise_close;
+
+ private void putNonStandardIcons()
+ {
Pixbuf pixbuf;
viewport_chronojump_logo.ModifyBg(StateType.Normal, new Gdk.Color(0x0e,0x1e,0x46));
@@ -707,6 +727,70 @@ public partial class ChronoJumpWindow
//change colors of tests mode
/*
+ * start of material design icons ---->
+ */
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_home.png");
+ image_home.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_settings.png");
+ image_settings.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_quit.png");
+ image_quit.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_gravity.png");
+ image_mode_encoder_gravitatory.Pixbuf = pixbuf;
+ image_gravitatory_not_menu.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_inertia.png");
+ image_mode_encoder_inertial.Pixbuf = pixbuf;
+ image_inertial_not_menu.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_capture.png");
+ image_mode_encoder_capture.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person.png");
+ image_person.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_info.png");
+ image_encoder_1RM_info.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_chronopic_connect.png");
+ image_chronopic_connect.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_recalculate.png");
+ image_recalculate.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_build.png");
+ image_encoder_configuration.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_exercise.png");
+ image_encoder_exercise.Pixbuf = pixbuf;
+ image_encoder_exercise1.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
+ image_encoder_capture_open.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "one.png");
+ image_encoder_capture_1set.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "cont.png");
+ image_encoder_capture_cont.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "run.png"); //or use "timer"
+ image_encoder_capture_execute.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_add.png");
+ image_encoder_exercise_add.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_edit.png");
+ image_encoder_exercise_edit.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close_big.png");
+ image_encoder_exercise_close.Pixbuf = pixbuf;
+
+
+ /*
+ * <------ end of material design icons
+ */
+
+ /*
* gui for small screens
*/
viewport_selector_start_jumps.ModifyBg(StateType.Normal, new Gdk.Color(0x0b,0x48,0x6b));
@@ -730,13 +814,6 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameRunsInterval);
image_mode_runs_intervallic_small.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameEncoderGravitatory);
- image_mode_encoder_gravitatory.Pixbuf = pixbuf;
- image_gravitatory_not_menu.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameEncoderInertial);
- image_mode_encoder_inertial.Pixbuf = pixbuf;
- image_inertial_not_menu.Pixbuf = pixbuf;
-
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameReactionTime);
image_mode_reaction_times_small.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNamePulse);
@@ -3107,7 +3184,14 @@ public partial class ChronoJumpWindow
currentEncoderGI = Constants.EncoderGI.GRAVITATORY;
hbox_capture_1RM.Visible = true;
- notebook_encoder_capture_extra_mass.CurrentPage = 0;
+
+ //notebook_encoder_capture_extra_mass.CurrentPage = 0;
+ //TODO: show also info on the top
+ label_encoder_exercise_mass.Visible = true;
+ vbox_encoder_exercise_mass.Visible = true;
+ label_encoder_exercise_inertia.Visible = false;
+ vbox_encoder_exercise_inertia.Visible = false;
+
if(radio_encoder_analyze_individual_current_set.Active ||
radio_encoder_analyze_individual_current_session.Active)
{
radiobutton_encoder_analyze_1RM.Visible = true;
@@ -3118,9 +3202,12 @@ public partial class ChronoJumpWindow
//hbox_encoder_capture_1_or_cont.Visible = true;
vscale_encoder_capture_inertial_angle_now.Visible = false;
- label_encoder_not_menu.Text = Catalog.GetString("Gravitatory");
- button_gravitatory_not_menu.Sensitive = false;
- button_inertial_not_menu.Sensitive = true;
+ if(! radiobutton_gravitatory_not_menu.Active)
+ {
+ radiobutton_dont_follow_signals = true;
+ radiobutton_gravitatory_not_menu.Active = true;
+ radiobutton_dont_follow_signals = false;
+ }
} else {
menuitem_mode_selected_power_inertial.Visible = true;
@@ -3136,7 +3223,14 @@ public partial class ChronoJumpWindow
currentEncoderGI = Constants.EncoderGI.INERTIAL;
hbox_capture_1RM.Visible = false;
- notebook_encoder_capture_extra_mass.CurrentPage = 1;
+
+ //notebook_encoder_capture_extra_mass.CurrentPage = 1;
+ //TODO: show also info on the top
+ label_encoder_exercise_mass.Visible = false;
+ vbox_encoder_exercise_mass.Visible = false;
+ label_encoder_exercise_inertia.Visible = true;
+ vbox_encoder_exercise_inertia.Visible = true;
+
radiobutton_encoder_analyze_1RM.Visible = false;
hbox_combo_encoder_analyze_1RM.Visible=false;
radiobutton_encoder_analyze_neuromuscular_profile.Visible = false;
@@ -3145,9 +3239,12 @@ public partial class ChronoJumpWindow
//hbox_encoder_capture_1_or_cont.Visible = false;
vscale_encoder_capture_inertial_angle_now.Visible = true;
- label_encoder_not_menu.Text = Catalog.GetString("Inertial");
- button_gravitatory_not_menu.Sensitive = true;
- button_inertial_not_menu.Sensitive = false;
+ if(! radiobutton_inertial_not_menu.Active)
+ {
+ radiobutton_dont_follow_signals = true;
+ radiobutton_inertial_not_menu.Active = true;
+ radiobutton_dont_follow_signals = false;
+ }
}
encoderGuiChangesAfterEncoderConfigurationWin(true);
if(changed) {
@@ -3400,8 +3497,13 @@ public partial class ChronoJumpWindow
notebook_selector_start_runs.CurrentPage = 0;
notebook_selector_start_encoder.CurrentPage = 1;
}
+
+ bool radiobutton_dont_follow_signals = false;
private void on_button_selector_start_encoder_gravitatory_clicked(object o, EventArgs args)
{
+ if(radiobutton_dont_follow_signals)
+ return;
+
if(radio_menuitem_mode_power_gravitatory.Active)
select_menuitem_mode_toggled(Constants.Menuitem_modes.POWERGRAVITATORY);
else
@@ -3409,12 +3511,15 @@ public partial class ChronoJumpWindow
}
private void on_button_selector_start_encoder_inertial_clicked(object o, EventArgs args)
{
+ if(radiobutton_dont_follow_signals)
+ return;
+
if(radio_menuitem_mode_power_inertial.Active)
select_menuitem_mode_toggled(Constants.Menuitem_modes.POWERINERTIAL);
else
radio_menuitem_mode_power_inertial.Active = true;
}
-
+
private void on_button_selector_start_other_clicked(object o, EventArgs args)
{
if(radio_menuitem_mode_other.Active)
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 49763ed..15ece02 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -34,7 +34,12 @@ using LongoMatch.Gui;
public partial class ChronoJumpWindow
{
- [Widget] Gtk.Notebook notebook_encoder_capture_extra_mass;
+ [Widget] Gtk.HBox hbox_encoder_capture_top;
+ //[Widget] Gtk.Notebook notebook_encoder_capture_extra_mass;
+ [Widget] Gtk.Label label_encoder_exercise_mass;
+ [Widget] Gtk.VBox vbox_encoder_exercise_mass;
+ [Widget] Gtk.Label label_encoder_exercise_inertia;
+ [Widget] Gtk.VBox vbox_encoder_exercise_inertia;
[Widget] Gtk.Button button_encoder_select;
[Widget] Gtk.SpinButton spin_encoder_extra_weight;
@@ -54,9 +59,10 @@ public partial class ChronoJumpWindow
//at graph.R is converted to Kg*m^2 ( /10000 )
//[Widget] Gtk.SpinButton spin_encoder_capture_inertial;
+ [Widget] Gtk.Box hbox_encoder_sup_capture_analyze;
[Widget] Gtk.Box hbox_encoder_sup_capture_analyze_two_buttons;
[Widget] Gtk.Box hbox_encoder_configuration;
- [Widget] Gtk.Box hbox_encoder_capture_options;
+ [Widget] Gtk.Frame frame_encoder_capture_options;
[Widget] Gtk.Box hbox_encoder_capture_wait;
[Widget] Gtk.Box vbox_encoder_capture_doing;
@@ -68,9 +74,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_inertial_calibrate;
[Widget] Gtk.Label label_wait;
- [Widget] Gtk.Label label_encoder_not_menu;
- [Widget] Gtk.Button button_gravitatory_not_menu;
- [Widget] Gtk.Button button_inertial_not_menu;
+ [Widget] Gtk.Label label_gravitatory;
+ [Widget] Gtk.Label label_inertial;
+ [Widget] Gtk.RadioButton radiobutton_gravitatory_not_menu;
+ [Widget] Gtk.RadioButton radiobutton_inertial_not_menu;
[Widget] Gtk.Image image_encoder_bell;
@@ -122,6 +129,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_capture_curves_none;
[Widget] Gtk.Button button_encoder_capture_curves_4top;
+ [Widget] Gtk.Notebook notebook_encoder_exercise;
[Widget] Gtk.Box hbox_combo_encoder_exercise_analyze;
[Widget] Gtk.ComboBox combo_encoder_exercise_analyze;
@@ -255,7 +263,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.TreeView treeview_encoder_capture_curves;
[Widget] Gtk.TreeView treeview_encoder_analyze_curves;
- [Widget] Gtk.Notebook notebook_encoder_capture_or_instructions;
+ [Widget] Gtk.Notebook notebook_encoder_capture_or_exercise_or_instructions;
[Widget] Gtk.DrawingArea encoder_capture_signal_drawingarea;
@@ -666,7 +674,7 @@ public partial class ChronoJumpWindow
sensitiveGuiEventDoing(radio_encoder_capture_cont.Active);
button_encoder_inertial_calibrate.Sensitive = true;
label_wait.Text = " ";
- notebook_encoder_capture_or_instructions.Page = 1;
+ notebook_encoder_capture_or_exercise_or_instructions.Page = 2;
return;
}
@@ -1474,8 +1482,14 @@ public partial class ChronoJumpWindow
void encoderConfigurationGUIUpdate()
{
- if(encoderConfigurationCurrent.has_inertia) {
- notebook_encoder_capture_extra_mass.CurrentPage = 1;
+ if(encoderConfigurationCurrent.has_inertia)
+ {
+ //notebook_encoder_capture_extra_mass.CurrentPage = 1;
+ //TODO: show also info on the top
+ label_encoder_exercise_mass.Visible = false;
+ vbox_encoder_exercise_mass.Visible = false;
+ label_encoder_exercise_inertia.Visible = true;
+ vbox_encoder_exercise_inertia.Visible = true;
if(encoderConfigurationCurrent.list_d != null &&
encoderConfigurationCurrent.list_d.Count > 0)
{
@@ -1491,8 +1505,14 @@ public partial class ChronoJumpWindow
label_encoder_im_total.Text = encoderConfigurationCurrent.inertiaTotal.ToString();
}
- else
- notebook_encoder_capture_extra_mass.CurrentPage = 0;
+ else {
+ //notebook_encoder_capture_extra_mass.CurrentPage = 0
+ //TODO: show also info on the top
+ label_encoder_exercise_mass.Visible = true;
+ vbox_encoder_exercise_mass.Visible = true;
+ label_encoder_exercise_inertia.Visible = false;
+ vbox_encoder_exercise_inertia.Visible = false;
+ }
}
void encoderSignalDelete (string signalURL, int signalID)
@@ -3551,6 +3571,28 @@ public partial class ChronoJumpWindow
// ---------end of helpful methods -----------
+ void on_button_encoder_exercise_clicked (object o, EventArgs args)
+ {
+ encoder_exercise_show_hide (true);
+ }
+ void on_button_encoder_exercise_close_clicked (object o, EventArgs args)
+ {
+ encoder_exercise_show_hide (false);
+ }
+ private void encoder_exercise_show_hide (bool show)
+ {
+ if(show)
+ notebook_encoder_capture_or_exercise_or_instructions.Page = 1;
+ else
+ notebook_encoder_capture_or_exercise_or_instructions.Page = 0;
+
+ main_menu.Sensitive = ! show;
+ hbox_encoder_sup_capture_analyze.Sensitive = ! show;
+ notebook_session_person.Sensitive = ! show;
+ hbox_encoder_configuration.Sensitive = ! show;
+ hbox_encoder_capture_top.Sensitive = ! show;
+ vpaned_encoder_capture_video_and_set_graph.Sensitive = ! show;
+ }
//info is now info and edit (all values can be changed), and detete (there's delete button)
void on_button_encoder_exercise_edit_clicked (object o, EventArgs args)
@@ -3846,7 +3888,7 @@ public partial class ChronoJumpWindow
//columns
//c0 button_encoder_capture, hbox_encoder_sup_capture_analyze_two_buttons,
- // hbox_encoder_configuration, hbox_encoder_capture_options
+ // hbox_encoder_configuration, frame_encoder_capture_options
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
//c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal
@@ -3904,7 +3946,7 @@ public partial class ChronoJumpWindow
button_encoder_capture.Sensitive = Util.IntToBool(table[0]);
hbox_encoder_sup_capture_analyze_two_buttons.Sensitive = Util.IntToBool(table[0]);
hbox_encoder_configuration.Sensitive = Util.IntToBool(table[0]);
- hbox_encoder_capture_options.Sensitive = Util.IntToBool(table[0]);
+ frame_encoder_capture_options.Sensitive = Util.IntToBool(table[0]);
button_encoder_recalculate.Sensitive = Util.IntToBool(table[1]);
@@ -5118,8 +5160,8 @@ public partial class ChronoJumpWindow
}
//if on inertia and already showing instructions, return to page 0
- if(notebook_encoder_capture_or_instructions.Page == 1)
- notebook_encoder_capture_or_instructions.Page = 0;
+ if(notebook_encoder_capture_or_exercise_or_instructions.Page == 2)
+ notebook_encoder_capture_or_exercise_or_instructions.Page = 0;
if(! encoderThread.IsAlive || encoderProcessCancel)
{
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index 496c94d..57b2edb 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -289,7 +289,8 @@ public partial class ChronoJumpWindow {
private void stats_win_putNonStandardIcons() {
Pixbuf pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "gpm-statistics.png");
+ //pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "gpm-statistics.png");
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_analyze.png");
image_stats_win_graph.Pixbuf = pixbuf;
image_stats_win_graph1.Pixbuf = pixbuf;
image_stats_win_graph2.Pixbuf = pixbuf;