[chronojump] EncoderCaptureOptions -> preferences
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] EncoderCaptureOptions -> preferences
- Date: Thu, 11 Aug 2016 12:37:40 +0000 (UTC)
commit 515e7ca824f7962e5cac2af9e59e7e156fccbde7
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Aug 11 14:37:07 2016 +0200
EncoderCaptureOptions -> preferences
glade/chronojump.glade | 1256 ++++++++++++++++++++++++++++--------------------
src/constants.cs | 6 +
src/gui/encoder.cs | 16 +-
src/gui/preferences.cs | 83 +++-
src/preferences.cs | 16 +-
5 files changed, 812 insertions(+), 565 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index a6edadc..e6f10c3 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -18047,6 +18047,15 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -22844,6 +22853,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24122,6 +24140,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25892,6 +25919,15 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26719,6 +26755,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -28603,431 +28648,6 @@ comments</property>
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="encoder_capture_options">
- <property name="can_focus">False</property>
- <property name="border_width">10</property>
- <property name="title" translatable="yes">Encoder capture options</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <signal name="delete_event" handler="on_delete_event" swapped="no"/>
- <child>
- <widget class="GtkVBox" id="vbox27">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkTable" id="table7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">16</property>
- <property name="row_spacing">12</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">Mode</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox102">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_capture_safe">
- <property name="label" translatable="yes">Safe</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip">Safe</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_capture_external">
- <property name="label">External DEPRECATED</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip">External DEPRECATED</property>
- <property name="image_position">right</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_capture_safe</property>
- </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="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Recording time</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox114">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_time">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Recording time</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">60 5 180 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</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="label71">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">s</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>
- </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="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Main variable</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_combo_main_variable">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">End at n inactivity seconds</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_inactivity_end_time">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Recording time</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">3 1 20 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</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="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">s</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_inactivity_help">
- <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_inactivity_help_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>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Minimal height</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox_height_gravitatory">
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_min_height_gravitatory">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Minimal height</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">20 1 300 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</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="label81">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">cm</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>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_height_inertial">
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_min_height_inertial">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Minimal height</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">5 1 300 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</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="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">cm</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>
- </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">3</property>
- <property name="bottom_attach">4</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="GtkCheckButton" id="check_show_start_and_duration">
- <property name="label" translatable="yes">Show start and duration of each repetition</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox17">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="button_close">
- <property name="label">gtk-close</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="use_stock">True</property>
- <signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
- <accelerator key="Escape" signal="clicked"/>
- </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="padding">8</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkWindow" id="encoder_configuration">
<property name="can_focus">False</property>
<property name="border_width">12</property>
@@ -40340,6 +39960,60 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -43415,6 +43089,42 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -44556,15 +44266,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -45842,6 +45543,15 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -46180,6 +45890,7 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<widget class="GtkLabel" id="label528">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Main</property>
</widget>
<packing>
@@ -46772,6 +46483,7 @@ show elevation as:</property>
<widget class="GtkLabel" id="label_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Jumps</property>
</widget>
<packing>
@@ -47289,6 +47001,7 @@ It starts before and arrives there with some speed.</property>
<widget class="GtkLabel" id="label_runs">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Runs</property>
</widget>
<packing>
@@ -47298,55 +47011,204 @@ It starts before and arrives there with some speed.</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <widget class="GtkScrolledWindow" id="scrolled_encoder_capture">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="border_width">16</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<child>
- <widget class="GtkViewport" id="viewport2">
+ <widget class="GtkViewport" id="viewport3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox123">
+ <widget class="GtkVBox" id="vbox23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">8</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkTable" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">16</property>
+ <property name="row_spacing">10</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_encoder_propulsive">
- <property name="label" translatable="yes">Propulsive</property>
+ <widget class="GtkLabel" id="label60">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">On concentric evaluate only
propulsive phase</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recording time</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkHBox" id="hbox114">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton" id="spin_encoder_capture_time">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Recording time</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">60 5 180 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</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="label71">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">s</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>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label61">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">On inertial machines this option
is not used.</property>
+ <property name="label" translatable="yes">Main variable</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_combo_main_variable">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label62">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">End at n inactivity
seconds</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_capture_inactivity_end_time">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Recording time</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">3 1 20 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</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="label63">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">s</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_inactivity_help">
+ <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_inactivity_help_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>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">10</property>
+ <property name="position">2</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>
</widget>
@@ -47357,42 +47219,29 @@ It starts before and arrives there with some speed.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <widget class="GtkFrame" id="frame9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkCheckButton" id="checkbutton_encoder_capture_fully_extended">
- <property name="label" translatable="yes">Check if string is fully extended
at start of inertial capture.</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_checkbutton_encoder_capture_fully_extended_toggled" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkAlignment" id="alignment8">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">8</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox_encoder_capture_fully_extended">
+ <widget class="GtkHBox" id="hbox24">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Is string is not extended by
this value or more, signal will be corrected.</property>
- <property name="spacing">10</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label56">
+ <widget class="GtkLabel" id="label67">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Turns</property>
+ <property name="label" translatable="yes">Minimal height</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -47401,49 +47250,156 @@ It starts before and arrives there with some speed.</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_fully_extended">
+ <widget class="GtkHBox" id="hbox_height_gravitatory">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">2</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">4 1 20 1 1 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_capture_min_height_gravitatory">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Minimal
height</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">20 1 300 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</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="label81">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">cm</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>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label66">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gravitatory</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox20">
+ <widget class="GtkHBox" id="hbox23">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label57">
+ <widget class="GtkLabel" id="label64">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Recommended:</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Minimal
height</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label58">
+ <widget class="GtkHBox" id="hbox_height_inertial">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">4</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_capture_min_height_inertial">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Minimal
height</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">5 1 300 1 10 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</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="label65">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">cm</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>
</widget>
<packing>
<property name="expand">False</property>
@@ -47455,24 +47411,148 @@ It starts before and arrives there with some speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton"
id="checkbutton_encoder_capture_fully_extended">
+ <property name="label" translatable="yes">Check if string is
fully extended at start of capture.</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_checkbutton_encoder_capture_fully_extended_toggled" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_encoder_capture_fully_extended">
+ <property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Is string is not
extended by this value or more, signal will be corrected.</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Turns</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_capture_fully_extended">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</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">4 1 20 1 1 0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Recommended:</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="label58">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">4</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">20</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label68">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Inertial</property>
+ <property name="use_markup">True</property>
+ </widget>
<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">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -47578,7 +47658,6 @@ It starts before and arrives there with some speed.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_encoder_auto_save_curve_best</property>
<child>
@@ -47665,7 +47744,6 @@ It starts before and arrives there with some speed.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">radio_encoder_auto_save_curve_best</property>
</widget>
@@ -47681,7 +47759,6 @@ It starts before and arrives there with some speed.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">radio_encoder_auto_save_curve_best</property>
</widget>
@@ -47706,7 +47783,7 @@ It starts before and arrives there with some speed.</property>
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save repetitions automatically on
capture</property>
+ <property name="label" translatable="yes">Save repetitions
automatically</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -47717,7 +47794,103 @@ It starts before and arrives there with some speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="check_show_start_and_duration">
+ <property name="label" translatable="yes">Show start and duration of each
repetition</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label59">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Encoder
+Capture</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolled_encoder_other">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">16</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkViewport" id="viewport2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox123">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton_encoder_propulsive">
+ <property name="label" translatable="yes">Propulsive</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">On concentric evaluate only
propulsive phase</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</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="label17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">On inertial machines this option
is not used.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -47728,7 +47901,7 @@ It starts before and arrives there with some speed.</property>
<property name="label_yalign">0.69999998807907104</property>
<property name="shadow_type">out</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -47851,7 +48024,7 @@ It starts before and arrives there with some speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -47862,7 +48035,7 @@ It starts before and arrives there with some speed.</property>
<property name="label_yalign">0.69999998807907104</property>
<property name="shadow_type">out</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
@@ -47976,7 +48149,7 @@ It starts before and arrives there with some speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -47985,17 +48158,18 @@ It starts before and arrives there with some speed.</property>
</child>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label_encoder">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Encoder</property>
+ <property name="label" translatable="yes">Encoder
+Other</property>
</widget>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -48034,17 +48208,18 @@ It starts before and arrives there with some speed.</property>
</child>
</widget>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Camera</property>
</widget>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -48426,17 +48601,18 @@ It starts before and arrives there with some speed.</property>
</child>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Language</property>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -48671,17 +48847,18 @@ It starts before and arrives there with some speed.</property>
</child>
</widget>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Advanced</property>
</widget>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -50206,6 +50383,15 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -51148,6 +51334,15 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -52105,6 +52300,15 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/constants.cs b/src/constants.cs
index 49f9edd..199929f 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -820,6 +820,12 @@ public class Constants
public const string MaxForce = "Max force";
public const string MeanPower = "Mean power";
public const string PeakPower = "Peak power";
+ public enum EncoderVariablesCapture {
+ MeanSpeed, MaxSpeed, MeanForce, MaxForce, MeanPower, PeakPower
+ }
+ public static string [] EncoderVariablesCaptureList = {
+ MeanSpeed, MaxSpeed, MeanForce, MaxForce, MeanPower, PeakPower
+ };
public enum Encoder1RMMethod { NONWEIGHTED, WEIGHTED, WEIGHTED2, WEIGHTED3 }
public enum ContextMenu { NONE, EDITDELETE, DELETE }
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 0ca6278..4cd32ed 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -409,8 +409,8 @@ public partial class ChronoJumpWindow
encoderRProcCapture = new EncoderRProcCapture();
encoderRProcAnalyze = new EncoderRProcAnalyze();
- encoderCaptureOptionsWin = EncoderCaptureOptionsWindow.Create(repetitiveConditionsWin);
- encoderCaptureOptionsWin.FakeButtonClose.Clicked += new
EventHandler(on_encoder_capture_options_closed);
+// encoderCaptureOptionsWin = EncoderCaptureOptionsWindow.Create(repetitiveConditionsWin);
+// encoderCaptureOptionsWin.FakeButtonClose.Clicked += new
EventHandler(on_encoder_capture_options_closed);
captureCurvesBarsData = new ArrayList(0);
@@ -5835,14 +5835,11 @@ public partial class ChronoJumpWindow
}
-
public class EncoderCaptureOptionsWindow {
[Widget] Gtk.Window encoder_capture_options;
static EncoderCaptureOptionsWindow EncoderCaptureOptionsWindowBox;
- [Widget] public Gtk.RadioButton radiobutton_encoder_capture_safe;
- [Widget] public Gtk.RadioButton radiobutton_encoder_capture_external;
[Widget] public Gtk.SpinButton spin_encoder_capture_time;
[Widget] public Gtk.SpinButton spin_encoder_capture_inactivity_end_time;
[Widget] Gtk.HBox hbox_height_gravitatory;
@@ -5977,15 +5974,6 @@ public class EncoderCaptureOptionsWindow {
spin_encoder_capture_min_height_gravitatory.Value = height;
}
- private void on_button_inactivity_help_clicked (object o, EventArgs args)
- {
- new DialogMessage(Constants.MessageTypes.INFO,
- Catalog.GetString("If a repetition has been found, test will end at selected
inactivity seconds.") + "\n\n" +
- Catalog.GetString("If a repetition has not been found, test will end at
selected inactivity seconds (x2).") + "\n" +
- Catalog.GetString("This will let the person to have more time to start
movement.")
- );
- }
-
protected virtual void on_button_close_clicked (object o, EventArgs args)
{
EncoderCaptureOptionsWindowBox.encoder_capture_options.Hide();
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 633428c..c22a190 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -89,21 +89,30 @@ public class PreferencesWindow {
[Widget] Gtk.RadioButton radio_runs_i_prevent_double_contact_average;
[Widget] Gtk.RadioButton radio_runs_i_prevent_double_contact_last;
- //encoder tab
- [Widget] Gtk.CheckButton checkbutton_encoder_propulsive;
+ //encoder capture tab
+ [Widget] Gtk.SpinButton spin_encoder_capture_time;
+ [Widget] Gtk.SpinButton spin_encoder_capture_inactivity_end_time;
+ [Widget] Gtk.Box hbox_combo_main_variable;
+ [Widget] Gtk.ComboBox combo_main_variable;
+ [Widget] Gtk.SpinButton spin_encoder_capture_min_height_gravitatory;
+ [Widget] Gtk.SpinButton spin_encoder_capture_min_height_inertial;
[Widget] Gtk.CheckButton checkbutton_encoder_capture_fully_extended;
[Widget] Gtk.HBox hbox_encoder_capture_fully_extended;
[Widget] Gtk.SpinButton spin_encoder_capture_fully_extended;
+ [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_best;
+ [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_4top;
+ [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_all;
+ [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_none;
+ [Widget] Gtk.CheckButton check_show_start_and_duration;
+
+ //encoder other tab
+ [Widget] Gtk.CheckButton checkbutton_encoder_propulsive;
[Widget] Gtk.SpinButton spin_encoder_smooth_con;
[Widget] Gtk.Label label_encoder_con;
[Widget] Gtk.RadioButton radio_encoder_1RM_nonweighted;
[Widget] Gtk.RadioButton radio_encoder_1RM_weighted;
[Widget] Gtk.RadioButton radio_encoder_1RM_weighted2;
[Widget] Gtk.RadioButton radio_encoder_1RM_weighted3;
- [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_best;
- [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_4top;
- [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_all;
- [Widget] Gtk.RadioButton radio_encoder_auto_save_curve_none;
//camera tab
[Widget] Gtk.Box hbox_combo_camera;
@@ -168,8 +177,10 @@ public class PreferencesWindow {
PreferencesWindowBox.notebook.GetNthPage(1).Hide();
if(menu_mode != Constants.Menuitem_modes.RUNS)
PreferencesWindowBox.notebook.GetNthPage(2).Hide();
- if(menu_mode != Constants.Menuitem_modes.POWERGRAVITATORY && menu_mode !=
Constants.Menuitem_modes.POWERINERTIAL)
- PreferencesWindowBox.notebook.GetNthPage(3).Hide();
+ if(menu_mode != Constants.Menuitem_modes.POWERGRAVITATORY && menu_mode !=
Constants.Menuitem_modes.POWERINERTIAL) {
+ PreferencesWindowBox.notebook.GetNthPage(3).Hide();
+ PreferencesWindowBox.notebook.GetNthPage(4).Hide();
+ }
PreferencesWindowBox.preferences = preferences;
@@ -283,12 +294,27 @@ public class PreferencesWindow {
PreferencesWindowBox.radio_export_non_latin.Active = true;
- //encoder
- PreferencesWindowBox.checkbutton_encoder_propulsive.Active = preferences.encoderPropulsive;
-
+ //encoder capture -->
+ PreferencesWindowBox.spin_encoder_capture_time.Value = preferences.encoderCaptureTime;
+ PreferencesWindowBox.spin_encoder_capture_inactivity_end_time.Value =
preferences.encoderCaptureInactivityEndTime;
+
PreferencesWindowBox.createComboEncoderCaptureMainVariable(preferences.encoderCaptureMainVariable);
+ PreferencesWindowBox.spin_encoder_capture_min_height_gravitatory.Value =
preferences.encoderCaptureMinHeightGravitatory;
+ PreferencesWindowBox.spin_encoder_capture_min_height_inertial.Value =
preferences.encoderCaptureMinHeightInertial;
PreferencesWindowBox.checkbutton_encoder_capture_fully_extended.Active =
preferences.encoderCaptureCheckFullyExtended;
PreferencesWindowBox.spin_encoder_capture_fully_extended.Value =
preferences.encoderCaptureCheckFullyExtendedValue;
PreferencesWindowBox.hbox_encoder_capture_fully_extended.Visible =
preferences.encoderCaptureCheckFullyExtended;
+ if(preferences.encoderAutoSaveCurve == Constants.EncoderAutoSaveCurve.BEST)
+ PreferencesWindowBox.radio_encoder_auto_save_curve_best.Active = true;
+ else if(preferences.encoderAutoSaveCurve == Constants.EncoderAutoSaveCurve.FROM4TOPENULTIMATE)
+ PreferencesWindowBox.radio_encoder_auto_save_curve_4top.Active = true;
+ else if(preferences.encoderAutoSaveCurve == Constants.EncoderAutoSaveCurve.ALL)
+ PreferencesWindowBox.radio_encoder_auto_save_curve_all.Active = true;
+ else
+ PreferencesWindowBox.radio_encoder_auto_save_curve_none.Active = true;
+
+
+ //encoder other -->
+ PreferencesWindowBox.checkbutton_encoder_propulsive.Active = preferences.encoderPropulsive;
PreferencesWindowBox.spin_encoder_smooth_con.Value = preferences.encoderSmoothCon;
@@ -304,6 +330,7 @@ public class PreferencesWindow {
//done here and not in glade to be shown with the decimal point of user language
PreferencesWindowBox.label_encoder_con.Text = (0.7).ToString();
+ //language -->
if(preferences.language == "")
PreferencesWindowBox.radio_language_detected.Active = true;
else
@@ -322,20 +349,23 @@ public class PreferencesWindow {
else
PreferencesWindowBox.radio_do_not_use_heights_on_jump_indexes.Active = true;
- if(preferences.encoderAutoSaveCurve == Constants.EncoderAutoSaveCurve.BEST)
- PreferencesWindowBox.radio_encoder_auto_save_curve_best.Active = true;
- else if(preferences.encoderAutoSaveCurve == Constants.EncoderAutoSaveCurve.FROM4TOPENULTIMATE)
- PreferencesWindowBox.radio_encoder_auto_save_curve_4top.Active = true;
- else if(preferences.encoderAutoSaveCurve == Constants.EncoderAutoSaveCurve.ALL)
- PreferencesWindowBox.radio_encoder_auto_save_curve_all.Active = true;
- else
- PreferencesWindowBox.radio_encoder_auto_save_curve_none.Active = true;
-
PreferencesWindowBox.preferences_win.Show ();
return PreferencesWindowBox;
}
+ private void createComboEncoderCaptureMainVariable(Constants.EncoderVariablesCapture v) {
+ combo_main_variable = ComboBox.NewText ();
+ string [] values = Constants.EncoderVariablesCaptureList;
+ UtilGtk.ComboUpdate(combo_main_variable, values, "");
+ combo_main_variable.Active = UtilGtk.ComboMakeActive(combo_main_variable, v.ToString());
+
+ hbox_combo_main_variable.PackStart(combo_main_variable, false, false, 0);
+ hbox_combo_main_variable.ShowAll();
+ combo_main_variable.Sensitive = true;
+ }
+
+
private void createComboCamera(string [] devices, int current) {
combo_camera = ComboBox.NewText ();
@@ -362,7 +392,6 @@ public class PreferencesWindow {
// ---- Language stuff
- //private void createComboLanguage(string myLanguageCode) {
private void createComboLanguage() {
combo_language = ComboBox.NewText ();
@@ -748,7 +777,17 @@ public class PreferencesWindow {
}
}
*/
-
+
+ //encoder
+ private void on_button_inactivity_help_clicked (object o, EventArgs args)
+ {
+ new DialogMessage(Constants.MessageTypes.INFO,
+ Catalog.GetString("If a repetition has been found, test will end at selected
inactivity seconds.") + "\n\n" +
+ Catalog.GetString("If a repetition has not been found, test will end at
selected inactivity seconds (x2).") + "\n" +
+ Catalog.GetString("This will let the person to have more time to start
movement.")
+ );
+ }
+
// ---- start SQL stress tests ---->
diff --git a/src/preferences.cs b/src/preferences.cs
index 8bcbda4..2c28741 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -45,17 +45,27 @@ public class Preferences
public Constants.DoubleContact runIDoubleContactsMode; //default AVERAGE
public int runIDoubleContactsMS; //milliseconds
- public bool encoderPropulsive;
+ //encoder capture
+ public int encoderCaptureTime;
+ public int encoderCaptureInactivityEndTime;
+ public Constants.EncoderVariablesCapture encoderCaptureMainVariable;
+ public int encoderCaptureMinHeightGravitatory;
+ public int encoderCaptureMinHeightInertial;
public bool encoderCaptureCheckFullyExtended;
public int encoderCaptureCheckFullyExtendedValue;
+ public Constants.EncoderAutoSaveCurve encoderAutoSaveCurve;
+ public bool encoderShowStartAndDuration;
+
+ //encoder other
+ public bool encoderPropulsive;
public double encoderSmoothCon;
- public int videoDeviceNum; //AKA videoDevice
public Constants.Encoder1RMMethod encoder1RMMethod;
+
+ public int videoDeviceNum; //AKA videoDevice
public string CSVExportDecimalSeparator;
public string language;
public bool RGraphsTranslate;
public bool useHeightsOnJumpIndexes;
- public Constants.EncoderAutoSaveCurve encoderAutoSaveCurve;
/*
* these are NOT sent to preferences window
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
