commit 40a20013045916b1aae3bc46ff969f7d8fb6fc4b
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Apr 15 09:42:50 2013 +0200
Encoder GUI capture better
glade/chronojump.glade | 892 ++++++++++++++++++++++++++-----------------------
src/gui/encoder.cs | 10 +-
2 files changed, 474 insertions(+), 428 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 8efd86a..7ff9bad 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -11987,36 +11987,33 @@ on current Chronojump version.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkVBox" id="vbox48">
+ <widget class="GtkFrame" id="frame18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkFrame" id="frame18">
+ <widget class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkAlignment" id="alignment22">
+ <widget class="GtkHBox" id="hbox58">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="spacing">22</property>
<child>
- <widget class="GtkHBox" id="hbox58">
+ <widget class="GtkVBox" id="vbox87">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkTable" id="table10">
+ <widget class="GtkHBox" id="hbox79">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkHBox"
id="hbox_combo_encoder_exercise">
<property name="visible">True</property>
@@ -12026,15 +12023,12 @@ on current Chronojump version.</property>
</child>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox94">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
<widget class="GtkButton"
id="button_encoder_exercise_info">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -12054,7 +12048,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -12076,17 +12070,22 @@ on current Chronojump version.</property>
</widget>
<packing>
<property name="expand">False</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="x_options">GTK_FILL</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="hbox86">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkLabel" id="label88">
<property name="visible">True</property>
@@ -12096,25 +12095,9 @@ on current Chronojump version.</property>
<property name="use_markup">True</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="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Kg</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -12133,56 +12116,66 @@ on current Chronojump version.</property>
<property name="numeric">True</property>
</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>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkLabel" id="label89">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Kg</property>
+ <property name="use_markup">True</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="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</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="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_eccon">
+ <widget class="GtkHBox"
id="hbox_combo_encoder_eccon">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox"
id="hbox_combo_encoder_laterality">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_combo_encoder_laterality">
<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>
</widget>
<packing>
<property name="expand">False</property>
@@ -12190,30 +12183,37 @@ on current Chronojump version.</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>
+ <child>
+ <widget class="GtkTable" id="table11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkTable" id="table11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label78">
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Minimal height</property>
<property name="use_markup">True</property>
- </widget>
- <packing>
+ </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="GtkSpinButton"
id="spin_encoder_capture_min_height">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_capture_min_height">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -12226,44 +12226,44 @@ on current Chronojump version.</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
- </widget>
- <packing>
+ </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>
<property name="x_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label81">
+ </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>
+ </widget>
+ <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options"/>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label82">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label82">
<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>
+ </widget>
+ <packing>
<property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton"
id="spin_encoder_capture_time">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_capture_time">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -12276,41 +12276,41 @@ on current Chronojump version.</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label71">
+ </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>
+ </widget>
+ <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_encoder_bells">
+ <widget class="GtkButton"
id="button_encoder_bells">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -12325,15 +12325,15 @@ on current Chronojump version.</property>
<property
name="stock">gtk-missing-image</property>
</widget>
</child>
- </widget>
- <packing>
+ </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_recalculate">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_recalculate">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -12350,42 +12350,48 @@ on current Chronojump version.</property>
<property name="stock">gtk-refresh</property>
</widget>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
</child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label84">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Exercise</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">0</property>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label84">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Exercise</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</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="GtkVBox" id="vbox48">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <property name="homogeneous">True</property>
<child>
<widget class="GtkFrame" id="frame16">
<property name="visible">True</property>
@@ -12403,6 +12409,7 @@ on current Chronojump version.</property>
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child>
<widget class="GtkHBox" id="hbox76">
<property name="visible">True</property>
@@ -12414,10 +12421,20 @@ on current Chronojump version.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label113">
+ <widget class="GtkButton"
id="button_encoder_capture_help">
+ <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="use_action_appearance">False</property>
+ <signal name="clicked"
handler="on_button_encoder_capture_help_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Capture:</property>
+ <property name="stock">gtk-help</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -12426,73 +12443,74 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_encoder_capture">
+ <widget class="GtkHBox" id="hbox75">
<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_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label93">
+ <widget class="GtkRadioButton"
id="radiobutton_encoder_capture_safe">
+ <property name="label"
translatable="yes">Safe</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">External</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_encoder_capture_csharp">
+ <widget class="GtkRadioButton"
id="radiobutton_encoder_capture_external">
+ <property name="label"
translatable="yes">Ext.</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="receives_default">False</property>
+ <property name="tooltip"
translatable="yes">External</property>
<property
name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
- <child>
- <widget class="GtkLabel" id="label111">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Safe</property>
+ <property name="image_position">right</property>
+ <property name="active">True</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="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_encoder_capture_help">
+ <widget class="GtkButton"
id="button_encoder_capture">
<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="use_action_appearance">False</property>
- <signal name="clicked"
handler="on_button_encoder_capture_help_clicked" swapped="no"/>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <signal name="clicked"
handler="on_button_encoder_capture_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkLabel" id="label93">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-help</property>
+ <property name="label">Capture</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -12702,6 +12720,114 @@ on current Chronojump version.</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox74">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_tabs">False</property>
+ <child>
+ <widget class="GtkDrawingArea"
id="encoder_capture_drawingarea">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <signal name="configure_event"
handler="on_encoder_capture_drawingarea_configure_event" swapped="no"/>
+ <signal name="expose_event"
handler="on_encoder_capture_drawingarea_expose_event" swapped="no"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">capture</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkViewport"
id="viewport_image_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="resize_mode">queue</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label115">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">curves</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</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="vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spin_encoder_capture_curves_height_range">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">On
capture: displayed positive and negative height in meters</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">1 0.5 3 0.5 1
0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">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>
+ </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>
</child>
</widget>
@@ -12721,282 +12847,202 @@ on current Chronojump version.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</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="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkVBox" id="vbox41">
+ <widget class="GtkFrame" id="frame7">
<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.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkHBox" id="hbox74">
+ <widget class="GtkAlignment" id="alignment20">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkSpinButton"
id="spin_encoder_capture_curves_height_range">
+ <widget class="GtkVBox" id="vbox41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow2">
+ <property name="width_request">200</property>
+ <property name="height_request">165</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">On
capture: displayed positive and negative height in meters</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">1 0.5 3 0.5 1
0</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkTreeView"
id="treeview_encoder_capture_curves">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
+ <property name="show_expanders">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
- </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">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_tabs">False</property>
<child>
- <widget class="GtkDrawingArea"
id="encoder_capture_drawingarea">
+ <widget class="GtkHBox" id="hbox78">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <signal name="configure_event"
handler="on_encoder_capture_drawingarea_configure_event" swapped="no"/>
- <signal name="expose_event"
handler="on_encoder_capture_drawingarea_expose_event" swapped="no"/>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_encoder_capture">
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_delete_curve">
+ <property name="label">Delete selected</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">capture</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkViewport"
id="viewport_image_encoder_capture">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ <signal name="clicked"
handler="on_button_encoder_delete_curve_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox80">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="resize_mode">queue</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkImage"
id="image_encoder_capture">
+ <widget class="GtkEntry"
id="entry_encoder_curve_comment">
+ <property name="width_request">125</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Add
a comment</property>
+ <property name="invisible_char">●</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
- <packing>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_save_curve">
+ <property name="label">Save selected</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ <signal name="clicked"
handler="on_button_encoder_save_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="GtkLabel" id="label115">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_save_all_curves">
+ <property name="label">Save all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ <signal name="clicked"
handler="on_button_encoder_save_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">curves</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_encoder_export_all_curves">
+ <property name="label">Export all</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ <signal name="clicked"
handler="on_button_encoder_export_all_curves_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="pack_type">end</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>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="width_request">200</property>
- <property name="height_request">175</property>
+ <widget class="GtkLabel" id="label85">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <widget class="GtkTreeView"
id="treeview_encoder_capture_curves">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="rules_hint">True</property>
- <property name="enable_search">False</property>
- <property name="show_expanders">False</property>
- </widget>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Curves</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox78">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkButton" id="button_encoder_delete_curve">
- <property name="label">Delete selected curve</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked"
handler="on_button_encoder_delete_curve_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox80">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkEntry"
id="entry_encoder_curve_comment">
- <property name="width_request">125</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Add a
comment</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- </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_save_curve">
- <property name="label">Save curve</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="on_button_encoder_save_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="GtkButton"
id="button_encoder_save_all_curves">
- <property name="label">Save all curves</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="on_button_encoder_save_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_encoder_export_all_curves">
- <property name="label">Export all curves</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="on_button_encoder_export_all_curves_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="pack_type">end</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>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 2685e98..513ba5f 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -34,7 +34,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton spin_encoder_extra_weight;
[Widget] Gtk.Button button_encoder_capture;
- [Widget] Gtk.Button button_encoder_capture_csharp;
+ [Widget] Gtk.RadioButton radiobutton_encoder_capture_safe;
+ [Widget] Gtk.RadioButton radiobutton_encoder_capture_external;
[Widget] Gtk.Button button_encoder_bells;
[Widget] Gtk.Button button_encoder_capture_cancel;
[Widget] Gtk.Button button_encoder_capture_finish;
@@ -245,7 +246,7 @@ public partial class ChronoJumpWindow
"", //no graph ouptut
Util.GetEncoderDataTempFileName(), "", ep);
- if (o == (object) button_encoder_capture) {
+ if (radiobutton_encoder_capture_external.Active) {
//title to sen to python software has to be without spaces
Util.RunEncoderCapturePython(
Util.ChangeSpaceAndMinusForUnderscore(currentPerson.Name) + "----" +
@@ -255,7 +256,7 @@ public partial class ChronoJumpWindow
entry_encoder_signal_comment.Text = "";
calculeCurves();
}
- else if (o == (object) button_encoder_capture_csharp) {
+ else if (radiobutton_encoder_capture_safe.Active) {
if(notebook_encoder_capture.CurrentPage == 1)
notebook_encoder_capture.PrevPage();
@@ -2771,7 +2772,7 @@ Log.Write("l");
private void encoderButtonsSensitive(encoderSensEnum option) {
//columns
- //c0 button_encoder_capture, button_encoder_capture_csharp,
+ //c0 button_encoder_capture
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
//c3 button_encoder_save_all_curves, button_encoder_export_all_curves,
@@ -2832,7 +2833,6 @@ Log.Write("l");
}
button_encoder_capture.Sensitive = Util.IntToBool(table[0]);
- button_encoder_capture_csharp.Sensitive = Util.IntToBool(table[0]);
button_encoder_recalculate.Sensitive = Util.IntToBool(table[1]);
button_encoder_load_signal.Sensitive = Util.IntToBool(table[2]);