commit ce978dd421d15b213a76c999457aefc0a32e9b71
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Jun 13 18:38:17 2020 +0200
contacts threshold & forceSensor adjust to 1st row. camera stuff to 2nd
glade/app1.glade | 243 ++++++++++++++++++++++-----------------
src/gui/app1/chronojump.cs | 36 +++---
src/gui/app1/contactsExercise.cs | 4 +-
src/gui/app1/forceSensor.cs | 4 +-
4 files changed, 159 insertions(+), 128 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 53dabd84..6ccca6de 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7189,89 +7189,23 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_contacts_device_adjust_threshold">
+ <widget class="GtkVBox" id="vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkHBox"
id="hbox_chronopics_and_more">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkViewport"
id="viewport_chronopics">
+ <widget class="GtkHBox"
id="hbox_contacts_device_adjust_threshold">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment35">
+ <widget class="GtkHBox" id="hbox170">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkButton"
id="button_activate_chronopics">
- <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="tooltip"
translatable="yes">Connect Chronopics</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_chronopic_contacts_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox117">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label250">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Device</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage"
id="image_chronopic_connect_contacts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-connect</property>
- <property name="icon-size">2</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>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</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="hbox170">
+ <widget class="GtkAlignment"
id="alignment_button_force_sensor_adjust">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">8</property>
<child>
<widget class="GtkButton"
id="button_force_sensor_adjust">
<property name="visible">True</property>
@@ -7310,6 +7244,8 @@ EncoderInertialCapture</property>
</widget>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7318,6 +7254,11 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
+ <widget class="GtkAlignment"
id="alignment_button_threshold">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">8</property>
+ <child>
<widget class="GtkButton" id="button_threshold">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -7330,6 +7271,8 @@ EncoderInertialCapture</property>
</widget>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7339,57 +7282,80 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">2</property>
- <child>
- <widget class="GtkNotebook"
id="notebook_contacts_execute_or_instructions">
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_chronopics_and_more">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkVBox" id="vbox_execute_test">
+ <widget class="GtkViewport"
id="viewport_chronopics">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkVBox" id="vbox16">
+ <widget class="GtkButton"
id="button_activate_chronopics">
+ <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="tooltip"
translatable="yes">Connect Chronopics</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_chronopic_contacts_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox375">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox98">
+ <widget class="GtkLabel" id="label250">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Device</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="event_execute_label_message">
+ <widget class="GtkImage"
id="image_chronopic_connect_contacts">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="ellipsize">end</property>
- <property name="single_line_mode">True</property>
+ <property name="stock">gtk-connect</property>
+ <property name="icon-size">2</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="expand">True</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="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7666,10 +7632,63 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <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">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">2</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_contacts_execute_or_instructions">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_execute_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHBox" id="hbox98">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="event_execute_label_message">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">end</property>
+ <property name="single_line_mode">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -24064,6 +24083,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -34861,6 +34886,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index c010127e..ea07e4f3 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -220,7 +220,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_contacts_signal_save_comment;
[Widget] Gtk.Frame frame_jumps_automatic;
[Widget] Gtk.Notebook notebook_jumps_automatic;
- [Widget] Gtk.VBox vbox_contacts_device_adjust_threshold;
+ [Widget] Gtk.HBox hbox_contacts_device_adjust_threshold;
//jumps
[Widget] Gtk.Button button_edit_selected_jump;
@@ -320,8 +320,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_chronopics_and_more;
[Widget] Gtk.Button button_activate_chronopics;
- [Widget] Gtk.Button button_threshold;
- [Widget] Gtk.Button button_force_sensor_adjust;
+ [Widget] Gtk.Alignment alignment_button_threshold;
+ [Widget] Gtk.Alignment alignment_button_force_sensor_adjust;
//non standard icons
[Widget] Gtk.Image image_jump_reactive_bell;
@@ -2868,7 +2868,7 @@ public partial class ChronoJumpWindow
radio_mode_contacts_sprint.Visible = false;
notebook_analyze.CurrentPage = Convert.ToInt32(notebook_analyze_pages.STATISTICS);
button_inspect_last_test_run_intervallic.Visible = false;
- button_force_sensor_adjust.Visible = false;
+ alignment_button_force_sensor_adjust.Visible = false;
vbox_contacts_load_recalculate.Visible = false;
vbox_contacts_signal_comment.Visible = false;
frame_jumps_automatic.Visible = false;
@@ -2902,7 +2902,7 @@ public partial class ChronoJumpWindow
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
//notebook_capture_analyze.ShowTabs = true;
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
- button_threshold.Visible = true;
+ alignment_button_threshold.Visible = true;
if(m == Constants.Menuitem_modes.JUMPSSIMPLE)
{
notebooks_change(m);
@@ -2941,7 +2941,7 @@ public partial class ChronoJumpWindow
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
//notebook_capture_analyze.ShowTabs = true;
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
- button_threshold.Visible = true;
+ alignment_button_threshold.Visible = true;
if(m == Constants.Menuitem_modes.RUNSSIMPLE)
{
@@ -3096,8 +3096,8 @@ public partial class ChronoJumpWindow
button_contacts_bells.Sensitive = true;
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
- button_threshold.Visible = false;
- button_force_sensor_adjust.Visible = true;
+ alignment_button_threshold.Visible = false;
+ alignment_button_force_sensor_adjust.Visible = true;
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
hbox_contacts_graph_last_limit.Visible = false;
@@ -3124,7 +3124,7 @@ public partial class ChronoJumpWindow
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
- button_threshold.Visible = false;
+ alignment_button_threshold.Visible = false;
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
hbox_contacts_graph_last_limit.Visible = false;
@@ -3151,7 +3151,7 @@ public partial class ChronoJumpWindow
notebook_capture_analyze.CurrentPage = 0;
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
hbox_contacts_sup_capture_analyze_two_buttons.Visible = false;
- button_threshold.Visible = true;
+ alignment_button_threshold.Visible = true;
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"reaction_time_icon.png");
@@ -3169,7 +3169,7 @@ public partial class ChronoJumpWindow
notebook_capture_analyze.CurrentPage = 0;
//notebook_capture_analyze.ShowTabs = false; //only capture tab is shown (only valid
for "OTHER" tests)
hbox_contacts_sup_capture_analyze_two_buttons.Visible = false;
- button_threshold.Visible = true;
+ alignment_button_threshold.Visible = true;
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) + "other_icon.png");
@@ -7037,7 +7037,7 @@ LogB.Debug("mc finished 5");
vbox_execute_test.Sensitive = false;
button_execute_test.Sensitive = false;
button_auto_start.Sensitive = false;
- button_force_sensor_adjust.Sensitive = false;
+ alignment_button_force_sensor_adjust.Sensitive = false;
encoderButtonsSensitive(encoderSensEnum.NOSESSION);
@@ -7056,7 +7056,7 @@ LogB.Debug("mc finished 5");
button_contacts_person_change.Sensitive = true;
button_encoder_person_change.Sensitive = true;
- button_force_sensor_adjust.Sensitive = true;
+ alignment_button_force_sensor_adjust.Sensitive = true;
menuSessionSensitive(true);
vbox_stats.Sensitive = true;
@@ -7182,8 +7182,8 @@ LogB.Debug("mc finished 5");
button_activate_chronopics.Sensitive = false;
button_activate_chronopics_encoder.Sensitive = false;
- button_threshold.Sensitive = false;
- button_force_sensor_adjust.Sensitive = false;
+ alignment_button_threshold.Sensitive = false;
+ alignment_button_force_sensor_adjust.Sensitive = false;
button_auto_start.Sensitive = false;
button_contacts_exercise.Sensitive = false;
event_execute_button_update.Sensitive = false;
@@ -7246,8 +7246,8 @@ LogB.Debug("mc finished 5");
if(! configChronojump.Compujump)
button_activate_chronopics_encoder.Sensitive = true;
- button_threshold.Sensitive = true;
- button_force_sensor_adjust.Sensitive = true;
+ alignment_button_threshold.Sensitive = true;
+ alignment_button_force_sensor_adjust.Sensitive = true;
button_auto_start.Sensitive = true;
button_contacts_exercise.Sensitive = true;
event_execute_button_update.Sensitive = true;
@@ -7395,7 +7395,7 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiAutoExecuteOrWait (bool execute) {
//if automode, sensitiveGuiEventDoing, sensitiveGuiEventDone don't work
button_activate_chronopics.Sensitive = ! execute;
- button_threshold.Sensitive = ! execute;
+ alignment_button_threshold.Sensitive = ! execute;
button_execute_test.Sensitive = ! execute;
sensitiveLastTestButtons(! execute);
}
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index 0d3395a6..2a078a0c 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -30,7 +30,7 @@ public partial class ChronoJumpWindow
{
menus_and_mode_sensitive(false);
notebook_contacts_capture_doing_wait.Sensitive = false;
- vbox_contacts_device_adjust_threshold.Sensitive = false;
+ hbox_contacts_device_adjust_threshold.Sensitive = false;
viewport_persons.Sensitive = false;
button_contacts_exercise.Sensitive = false;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = false;
@@ -43,7 +43,7 @@ public partial class ChronoJumpWindow
{
menus_and_mode_sensitive(true);
notebook_contacts_capture_doing_wait.Sensitive = true;
- vbox_contacts_device_adjust_threshold.Sensitive = true;
+ hbox_contacts_device_adjust_threshold.Sensitive = true;
viewport_persons.Sensitive = true;
button_contacts_exercise.Sensitive = true;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = true;
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 94f6915e..490bb2eb 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -2260,7 +2260,7 @@ LogB.Information(" fs R ");
private void on_button_force_sensor_adjust_clicked (object o, EventArgs args)
{
- button_force_sensor_adjust.Sensitive = false; //to not be called again
+ alignment_button_force_sensor_adjust.Sensitive = false; //to not be called again
//hbox_force_capture_buttons.Sensitive = false;
notebook_contacts_execute_or_instructions.Sensitive = false;
@@ -2274,7 +2274,7 @@ LogB.Information(" fs R ");
}
private void on_button_force_sensor_adjust_close_clicked (object o, EventArgs args)
{
- button_force_sensor_adjust.Sensitive = true;
+ alignment_button_force_sensor_adjust.Sensitive = true;
//hbox_force_capture_buttons.Sensitive = true;
notebook_contacts_execute_or_instructions.Sensitive = true;