commit 39ac0f6e43c6158d8b34a272b5089fb8bb32ebac
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 24 12:38:21 2012 +0200
server tab moved into contacts
glade/chronojump.glade | 1894 ++++++++++++++++++++++++------------------------
src/gui/chronojump.cs | 2 -
2 files changed, 948 insertions(+), 948 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index ab4b3ed..b2894f5 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -14923,7 +14923,7 @@ by you</property>
<widget class="GtkNotebook" id="notebook_sup">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tab_hborder">12</property>
+ <property name="tab_hborder">18</property>
<property name="tab_vborder">4</property>
<child>
<widget class="GtkVBox" id="vbox44">
@@ -15235,7 +15235,7 @@ Chronopic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_border">False</property>
- <property name="tab_hborder">6</property>
+ <property name="tab_hborder">10</property>
<property name="tab_vborder">4</property>
<child>
<widget class="GtkVBox" id="vbox9">
@@ -23573,152 +23573,130 @@ on current Chronojump version.</property>
<property name="type">tab</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Contacts (platform or photocell)</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkNotebook" id="notebook2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tab_hborder">6</property>
- <property name="tab_vborder">4</property>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="spacing">8</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <widget class="GtkVBox" id="vbox45">
<property name="visible">True</property>
- <property name="spacing">12</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkFrame" id="frame16">
+ <widget class="GtkLabel" id="label18">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.69999998807907104</property>
- <property name="shadow_type">out</property>
+ <property name="label" translatable="yes">Chronojump has a server in order to share data between users.
+Data is collected by users contributions and server generates statistics and graphs.
+Anyone can check server stats and graphs and easily make querys to the server.</property>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment16">
+ <property name="visible">True</property>
+ <property name="top_padding">10</property>
<child>
- <widget class="GtkAlignment" id="alignment19">
+ <widget class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">10</property>
- <property name="right_padding">10</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkHBox" id="hbox58">
+ <widget class="GtkVBox" id="vbox46">
<property name="visible">True</property>
- <property name="spacing">5</property>
+ <property name="border_width">7</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkTable" id="table7">
+ <widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</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="label76">
+ <widget class="GtkButton" id="button_server_check_connection">
<property name="visible">True</property>
- <property name="label" translatable="yes">Kg</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"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label83">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">10</property>
+ <signal name="clicked" handler="on_server_ping"/>
+ <child>
+ <widget class="GtkHBox" id="hbox59">
<property name="visible">True</property>
- <property name="label" translatable="yes">Kg</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_jump_limit">
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage" id="image20">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">0 0 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="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_bar_limit">
+ <property name="stock">gtk-network</property>
+ <property name="icon-size">5</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label55">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">10 1 300 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="label" translatable="yes">Check connection</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox50">
+ <property name="visible">True</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox85">
+ <widget class="GtkFrame" id="frame10">
<property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_capture_jump">
- <property name="label" translatable="yes">Jump</property>
+ <widget class="GtkHButtonBox" id="hbuttonbox7">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">center</property>
+ <child>
+ <widget class="GtkButton" id="button_server_query">
+ <property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_capture_bar</property>
- <signal name="toggled" handler="on_radiobutton_encoder_capture_jump_toggled"/>
+ <property name="receives_default">True</property>
+ <property name="border_width">10</property>
+ <signal name="clicked" handler="on_menuitem_server_query"/>
+ <child>
+ <widget class="GtkHBox" id="hbox62">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage" id="image14">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox76">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label_encoder_person_weight">
+ <widget class="GtkLabel" id="label54">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">0</property>
+ <property name="label" translatable="yes">Query to the server</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23727,419 +23705,224 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label80">
+ <widget class="GtkButton" id="button_server_stats">
+ <property name="height_request">50</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="border_width">10</property>
+ <signal name="clicked" handler="on_menuitem_server_stats"/>
+ <child>
+ <widget class="GtkHBox" id="hbox64">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage" id="image_stats_win_graph2">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">+</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="label56">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Check basic stats</property>
+ </widget>
+ <packing>
<property name="position">1</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_capture_bar">
- <property name="label" translatable="yes">Weight bar</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label57">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_radiobutton_encoder_capture_bar_toggled"/>
+ <property name="label" translatable="yes"><b>Check data</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="expand">False</property>
+ <property name="padding">8</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_concentric">
- <property name="label" translatable="yes">Concentric</property>
+ <widget class="GtkFrame" id="frame_share_data">
<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_radiobutton_encoder_eccon_toggled"/>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_eccentric-concentric">
- <property name="label" translatable="yes">Eccentric-concentric</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_concentric</property>
- <signal name="toggled" handler="on_radiobutton_encoder_eccon_toggled"/>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table9">
- <property name="visible">True</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="label81">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">cm</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"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_min_height">
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkHBox" id="hbox52">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">30 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="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label78">
+ <property name="spacing">4</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkLabel" id="label61">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Minimal height</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label82">
+ <property name="xpad">8</property>
+ <property name="ypad">8</property>
+ <property name="label" translatable="yes">Privacy is respected:
+- Names, comments, photos and videos are not uploaded.
+- Dates of birth are hidden.
+
+Simulated tests will be discarded.
+Evaluator can use real name or nickname.</property>
+ </widget>
+ <packing>
+ <property name="padding">8</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox8">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Recording time</property>
- </widget>
- <packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spin_encoder_capture_time">
+ <child>
+ <widget class="GtkButton" id="button_upload_session">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">10 5 99 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="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label71">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">s</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkHBox" id="hbox86">
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_server_upload_session_pre"/>
+ <child>
+ <widget class="GtkVBox" id="vbox54">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label85">
+ <widget class="GtkImage" id="image7">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Smoothing</property>
+ <property name="stock">gtk-go-up</property>
+ <property name="icon-size">5</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_encoder_smooth">
+ <widget class="GtkLabel" id="label58">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">0.69999999999999996 0 1 0.01 0.10000000000000001 0</property>
- <property name="climb_rate">1</property>
- <property name="digits">2</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="label" translatable="yes">Upload (or update) session to server</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Share data!</b></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">False</property>
- <property name="position">0</property>
+ <property name="padding">7</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="padding">8</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox6">
+ <property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox72">
- <property name="visible">True</property>
- <child>
- <widget class="GtkButton" id="button_encoder_bells">
+ <widget class="GtkButton" id="button_server_website">
+ <property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Bells</property>
- <signal name="clicked" handler="on_button_encoder_bells_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment21">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <signal name="clicked" handler="on_menuitem_goto_server_website"/>
<child>
- <widget class="GtkHBox" id="hbox90">
+ <widget class="GtkHBox" id="hbox65">
<property name="visible">True</property>
- <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image_encoder_bell">
+ <widget class="GtkImage" id="image21">
<property name="visible">True</property>
- <property name="icon-size">2</property>
+ <property name="stock">gtk-jump-to</property>
+ <property name="icon-size">5</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label86">
+ <widget class="GtkLabel" id="label70">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes">Open server website (on browser)</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="pack_type">end</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>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Server actions</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
</child>
- <child>
- <widget class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Options</b></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">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox73">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox9">
- <property name="visible">True</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="button_encoder_capture">
- <property name="label" translatable="yes">Capture from encoder</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_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_capture_clicked"/>
- </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">
- <property name="label" translatable="yes">Recalculate</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_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_recalculate_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="encoder_pulsebar_capture">
- <property name="visible">True</property>
- <property name="activity_mode">True</property>
- <property name="show_text">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox10">
- <property name="visible">True</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="button_encoder_save">
- <property name="label">gtk-save</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_encoder_save_clicked"/>
- </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_load">
- <property name="label">gtk-open</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_button_encoder_load_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
<property name="position">1</property>
@@ -24147,333 +23930,486 @@ on current Chronojump version.</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="padding">4</property>
- <property name="position">0</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox8">
+ <widget class="GtkHBox" id="hbox_menu_server">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="width_request">200</property>
+ <widget class="GtkImage" id="image2">
<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_curves">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="rules_hint">True</property>
- <property name="enable_search">False</property>
- </widget>
- </child>
+ <property name="stock">gtk-connect</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox63">
+ <widget class="GtkLabel" id="label_server1">
<property name="visible">True</property>
- <child>
- <widget class="GtkViewport" id="viewport_image_encoder_capture">
- <property name="visible">True</property>
- <property name="resize_mode">queue</property>
- <child>
- <widget class="GtkImage" id="image_encoder_capture">
- <property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox41">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_capture_zoom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <accelerator key="z" signal="clicked"/>
- <child>
- <widget class="GtkImage" id="image_encoder_capture_zoom">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_encoder_capture_properties">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Properties</property>
- <child>
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-properties</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label">Server</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label73">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Capture</property>
- </widget>
<packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Contacts (platform or photocell)</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkNotebook" id="notebook2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tab_hborder">10</property>
+ <property name="tab_vborder">4</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkFrame" id="frame14">
+ <widget class="GtkFrame" id="frame16">
<property name="visible">True</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="alignment17">
+ <widget class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="top_padding">4</property>
<property name="bottom_padding">4</property>
<property name="left_padding">10</property>
<property name="right_padding">10</property>
<child>
- <widget class="GtkHBox" id="hbox79">
+ <widget class="GtkHBox" id="hbox58">
<property name="visible">True</property>
- <property name="spacing">30</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkTable" id="table12">
+ <widget class="GtkTable" id="table7">
<property name="visible">True</property>
<property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">4</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_powerbars">
- <property name="label" translatable="yes">Show power bars</property>
+ <widget class="GtkLabel" id="label76">
<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_radiobutton_encoder_analyze_powerbars_toggled"/>
+ <property name="label" translatable="yes">Kg</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"></property>
+ <property name="y_options"></property>
+ </packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_single">
- <property name="label" translatable="yes">Single curve</property>
+ <widget class="GtkLabel" id="label83">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Kg</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkSpinButton" id="spin_encoder_jump_limit">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_analyze_powerbars</property>
- <signal name="toggled" handler="on_radiobutton_encoder_analyze_single_toggled"/>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">0 0 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="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_side">
- <property name="label" translatable="yes">Side compare</property>
+ <widget class="GtkSpinButton" id="spin_encoder_bar_limit">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_analyze_powerbars</property>
- <signal name="toggled" handler="on_radiobutton_encoder_analyze_side_toggled"/>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">10 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="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_superpose">
- <property name="label" translatable="yes">Superpose</property>
+ <widget class="GtkHBox" id="hbox85">
+ <property name="visible">True</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton_encoder_capture_jump">
+ <property name="label" translatable="yes">Jump</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_analyze_powerbars</property>
- <signal name="toggled" handler="on_radiobutton_encoder_analyze_superpose_toggled"/>
+ <property name="group">radiobutton_encoder_capture_bar</property>
+ <signal name="toggled" handler="on_radiobutton_encoder_capture_jump_toggled"/>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox76">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label_encoder_person_weight">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">0</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="label80">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">+</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</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="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton_encoder_capture_bar">
+ <property name="label" translatable="yes">Weight bar</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_radiobutton_encoder_capture_bar_toggled"/>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator1">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton_encoder_concentric">
+ <property name="label" translatable="yes">Concentric</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_radiobutton_encoder_eccon_toggled"/>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton_encoder_eccentric-concentric">
+ <property name="label" translatable="yes">Eccentric-concentric</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_encoder_concentric</property>
+ <signal name="toggled" handler="on_radiobutton_encoder_eccon_toggled"/>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table10">
+ <widget class="GtkTable" id="table9">
<property name="visible">True</property>
<property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">4</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_encoder_analyze_eccon">
+ <widget class="GtkLabel" id="label81">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">cm</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"></property>
+ <property name="y_options"></property>
+ </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>
+ <property name="adjustment">30 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="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label78">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ecc-conc phases</property>
+ <property name="label" translatable="yes">Minimal height</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label82">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Recording time</property>
+ </widget>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </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>
+ <property name="adjustment">10 5 99 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="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label71">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">s</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox_encoder_analyze_eccon">
+ <widget class="GtkHBox" id="hbox86">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_eccon_together">
- <property name="label" translatable="yes">Together</property>
+ <widget class="GtkLabel" id="label85">
<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="xalign">0</property>
+ <property name="label" translatable="yes">Smoothing</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton_encoder_eccon_separated">
- <property name="label" translatable="yes">Separated</property>
+ <widget class="GtkSpinButton" id="spin_encoder_smooth">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">radiobutton_encoder_eccon_together</property>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">0.69999999999999996 0 1 0.01 0.10000000000000001 0</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">2</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</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>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_encoder_analyze_curve_num">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Curve number</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox74">
+ <widget class="GtkHBox" id="hbox72">
<property name="visible">True</property>
<child>
- <widget class="GtkSpinButton" id="spin_encoder_analyze_curve_num">
+ <widget class="GtkButton" id="button_encoder_bells">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">1 1 40 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Bells</property>
+ <signal name="clicked" handler="on_button_encoder_bells_clicked"/>
+ <child>
+ <widget class="GtkAlignment" id="alignment21">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox90">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image_encoder_bell">
+ <property name="visible">True</property>
+ <property name="icon-size">2</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label86">
+ <property name="visible">True</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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="position">2</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -24481,9 +24417,9 @@ on current Chronojump version.</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label87">
+ <widget class="GtkLabel" id="label75">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Mode</b></property>
+ <property name="label" translatable="yes"><b>Options</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -24498,42 +24434,101 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox75">
+ <widget class="GtkHBox" id="hbox73">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkButton" id="button_encoder_analyze">
- <property name="label" translatable="yes">Analyze</property>
- <property name="width_request">150</property>
+ <widget class="GtkHButtonBox" id="hbuttonbox9">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_analyze_clicked"/>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="button_encoder_capture">
+ <property name="label" translatable="yes">Capture from encoder</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_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_capture_clicked"/>
+ </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">
+ <property name="label" translatable="yes">Recalculate</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_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_recalculate_clicked"/>
+ </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">12</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkProgressBar" id="encoder_pulsebar_analyze">
- <property name="width_request">150</property>
+ <widget class="GtkProgressBar" id="encoder_pulsebar_capture">
<property name="visible">True</property>
<property name="activity_mode">True</property>
<property name="show_text">True</property>
<property name="pulse_step">0.10000000149</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="hbuttonbox10">
+ <property name="visible">True</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="button_encoder_save">
+ <property name="label">gtk-save</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_encoder_save_clicked"/>
+ </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_load">
+ <property name="label">gtk-open</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_encoder_load_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -24547,17 +24542,23 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_image_encoder_analyze">
+ <widget class="GtkVBox" id="vbox8">
<property name="visible">True</property>
+ <property name="homogeneous">True</property>
<child>
- <widget class="GtkViewport" id="viewport_image_encoder_analyze">
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="width_request">200</property>
<property name="visible">True</property>
- <property name="resize_mode">queue</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="GtkImage" id="image_encoder_analyze">
+ <widget class="GtkTreeView" id="treeview_encoder_curves">
<property name="visible">True</property>
- <property name="stock">gtk-missing-image</property>
- <property name="icon-size">6</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
</widget>
</child>
</widget>
@@ -24566,30 +24567,78 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox43">
+ <widget class="GtkHBox" id="hbox63">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="button_encoder_analyze_zoom">
+ <widget class="GtkViewport" id="viewport_image_encoder_capture">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <accelerator key="z" signal="clicked"/>
+ <property name="resize_mode">queue</property>
+ <child>
+ <widget class="GtkImage" id="image_encoder_capture">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox41">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_encoder_capture_zoom">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <accelerator key="z" signal="clicked"/>
+ <child>
+ <widget class="GtkImage" id="image_encoder_capture_zoom">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkImage" id="image_encoder_analyze_zoom">
+ <widget class="GtkButton" id="button_encoder_capture_properties">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Properties</property>
+ <child>
+ <widget class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="stock">gtk-properties</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -24598,420 +24647,373 @@ on current Chronojump version.</property>
</packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label74">
+ <widget class="GtkLabel" id="label73">
<property name="visible">True</property>
- <property name="label" translatable="yes">Analyze</property>
+ <property name="label" translatable="yes">Capture</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="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label67">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Linear encoder</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox45">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Chronojump has a server in order to share data between users.
-Data is collected by users contributions and server generates statistics and graphs.
-Anyone can check server stats and graphs and easily make querys to the server.</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkAlignment" id="alignment16">
+ <widget class="GtkVBox" id="vbox6">
<property name="visible">True</property>
- <property name="top_padding">10</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <widget class="GtkVBox" id="vbox7">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox46">
+ <widget class="GtkFrame" id="frame14">
<property name="visible">True</property>
- <property name="border_width">7</property>
- <property name="spacing">8</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.69999998807907104</property>
+ <property name="shadow_type">out</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox2">
+ <widget class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">10</property>
+ <property name="right_padding">10</property>
<child>
- <widget class="GtkButton" id="button_server_check_connection">
+ <widget class="GtkHBox" id="hbox79">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="border_width">10</property>
- <signal name="clicked" handler="on_server_ping"/>
+ <property name="spacing">30</property>
<child>
- <widget class="GtkHBox" id="hbox59">
+ <widget class="GtkTable" id="table12">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">4</property>
<child>
- <widget class="GtkImage" id="image20">
+ <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_powerbars">
+ <property name="label" translatable="yes">Show power bars</property>
<property name="visible">True</property>
- <property name="stock">gtk-network</property>
- <property name="icon-size">5</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_radiobutton_encoder_analyze_powerbars_toggled"/>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_single">
+ <property name="label" translatable="yes">Single curve</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Check connection</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_encoder_analyze_powerbars</property>
+ <signal name="toggled" handler="on_radiobutton_encoder_analyze_single_toggled"/>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox50">
- <property name="visible">True</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkFrame" id="frame10">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">out</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox7">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <property name="layout_style">center</property>
<child>
- <widget class="GtkButton" id="button_server_query">
- <property name="height_request">50</property>
+ <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_side">
+ <property name="label" translatable="yes">Side compare</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="border_width">10</property>
- <signal name="clicked" handler="on_menuitem_server_query"/>
- <child>
- <widget class="GtkHBox" id="hbox62">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image14">
- <property name="visible">True</property>
- <property name="stock">gtk-find</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label54">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Query to the server</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_encoder_analyze_powerbars</property>
+ <signal name="toggled" handler="on_radiobutton_encoder_analyze_side_toggled"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_server_stats">
- <property name="height_request">50</property>
+ <widget class="GtkRadioButton" id="radiobutton_encoder_analyze_superpose">
+ <property name="label" translatable="yes">Superpose</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="border_width">10</property>
- <signal name="clicked" handler="on_menuitem_server_stats"/>
- <child>
- <widget class="GtkHBox" id="hbox64">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image_stats_win_graph2">
- <property name="visible">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="label56">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Check basic stats</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_encoder_analyze_powerbars</property>
+ <signal name="toggled" handler="on_radiobutton_encoder_analyze_superpose_toggled"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label57">
+ <widget class="GtkVSeparator" id="vseparator1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Check data</b></property>
- <property name="use_markup">True</property>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">8</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame_share_data">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">out</property>
<child>
- <widget class="GtkHBox" id="hbox52">
+ <widget class="GtkTable" id="table10">
<property name="visible">True</property>
- <property name="spacing">4</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkLabel" id="label61">
- <property name="visible">True</property>
- <property name="xpad">8</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes">Privacy is respected:
-- Names, comments, photos and videos are not uploaded.
-- Dates of birth are hidden.
-
-Simulated tests will be discarded.
-Evaluator can use real name or nickname.</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label_encoder_analyze_eccon">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Ecc-conc phases</property>
</widget>
<packing>
- <property name="padding">8</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox8">
+ <widget class="GtkHBox" id="hbox_encoder_analyze_eccon">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkButton" id="button_upload_session">
+ <widget class="GtkRadioButton" id="radiobutton_encoder_eccon_together">
+ <property name="label" translatable="yes">Together</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_server_upload_session_pre"/>
- <child>
- <widget class="GtkVBox" id="vbox54">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
- <property name="icon-size">5</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label58">
+ <widget class="GtkRadioButton" id="radiobutton_encoder_eccon_separated">
+ <property name="label" translatable="yes">Separated</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Upload (or update) session to server</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radiobutton_encoder_eccon_together</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- </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>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_encoder_analyze_curve_num">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Curve number</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox74">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkSpinButton" id="spin_encoder_analyze_curve_num">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="adjustment">1 1 40 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>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label53">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Share data!</b></property>
- <property name="use_markup">True</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">7</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label87">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Mode</b></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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox75">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkButton" id="button_encoder_analyze">
+ <property name="label" translatable="yes">Analyze</property>
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_analyze_clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">12</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkProgressBar" id="encoder_pulsebar_analyze">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="pulse_step">0.10000000149</property>
+ </widget>
<packing>
- <property name="padding">8</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">4</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_image_encoder_analyze">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkViewport" id="viewport_image_encoder_analyze">
+ <property name="visible">True</property>
+ <property name="resize_mode">queue</property>
+ <child>
+ <widget class="GtkImage" id="image_encoder_analyze">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ <property name="icon-size">6</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox43">
+ <property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox6">
+ <widget class="GtkButton" id="button_encoder_analyze_zoom">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <accelerator key="z" signal="clicked"/>
<child>
- <widget class="GtkButton" id="button_server_website">
- <property name="height_request">50</property>
+ <widget class="GtkImage" id="image_encoder_analyze_zoom">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_menuitem_goto_server_website"/>
- <child>
- <widget class="GtkHBox" id="hbox65">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage" id="image21">
- <property name="visible">True</property>
- <property name="stock">gtk-jump-to</property>
- <property name="icon-size">5</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label70">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open server website (on browser)</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Server actions</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_menu_sup_server">
- <property name="visible">True</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkLabel" id="label_server1">
+ <widget class="GtkLabel" id="label74">
<property name="visible">True</property>
- <property name="label">Server</property>
+ <property name="label" translatable="yes">Analyze</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="position">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label67">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Linear encoder</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index a899832..2c53a3b 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -190,8 +190,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_run_interval_mtgug;
[Widget] Gtk.Button button_reaction_time_execute;
-
- [Widget] Gtk.Box hbox_menu_sup_server;
[Widget] Gtk.Notebook notebook_execute;
[Widget] Gtk.Notebook notebook_results;
[Widget] Gtk.Notebook notebook_options;