commit 791a86e906373c5156c260d3dbd4df44d03cd67c
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Feb 9 16:55:43 2021 +0100
ForceSensor export: better gui
glade/app1.glade | 103 ++++++++++++++++++++++++++++++-------
src/gui/app1/forceSensorAnalyze.cs | 8 +++
2 files changed, 93 insertions(+), 18 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index be218c2c..44cb08da 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -23835,6 +23835,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24189,11 +24192,60 @@ Concentric</property>
<widget class="GtkVBox" id="vbox249">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkLabel" id="label253">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Export
to CSV</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox449">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label594">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Data:</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="label_export_data">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox454">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
<property name="spacing">4</property>
<child>
<widget class="GtkNotebook"
id="notebook_force_sensor_export">
@@ -24276,6 +24328,11 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkVBox" id="vbox250">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
<widget class="GtkHBox" id="hbox456">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -24286,8 +24343,8 @@ Concentric</property>
<property name="can_focus">False</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -24313,6 +24370,13 @@ Concentric</property>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="position">1</property>
</packing>
</child>
@@ -24330,8 +24394,8 @@ Concentric</property>
</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>
@@ -24339,7 +24403,7 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -28874,18 +28938,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </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>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -28922,6 +28974,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </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>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -37213,6 +37277,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index ef2de709..db5b64e7 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -155,6 +155,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_force_sensor_ai_variability_units;
[Widget] Gtk.Notebook notebook_force_sensor_export;
+ [Widget] Gtk.Label label_export_data;
[Widget] Gtk.ProgressBar progressbar_force_sensor_export;
private RepetitionMouseLimits fsAIRepetitionMouseLimits;
@@ -708,10 +709,17 @@ public partial class ChronoJumpWindow
}
private void on_radio_force_sensor_analyze_individual_current_session_toggled (object o, EventArgs
args)
{
+ if(currentPerson != null)
+ label_export_data.Text = currentPerson.Name;
+ else
+ label_export_data.Text = "";
+
notebook_force_sensor_analyze_top.CurrentPage = 1;
}
private void on_radio_force_sensor_analyze_groupal_current_session_toggled (object o, EventArgs args)
{
+ label_export_data.Text = currentSession.Name;
+
notebook_force_sensor_analyze_top.CurrentPage = 1;
}