commit decfff9c6a7039a6b8ce0b1f2864ce897390d7ee
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 19 10:27:07 2022 +0200
Improvements on detect buttons on top gui
glade/app1.glade | 122 +++++++++++++++++++++++++++++++++++++--------
src/gui/app1/chronojump.cs | 10 ++--
src/gui/app1/icons.cs | 4 ++
3 files changed, 111 insertions(+), 25 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index c5abd6ca8..a6380a5cf 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -6009,15 +6009,39 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox225">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_chronopic_connect_contacts1">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_button_contacts_detect">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Detect
-device</property>
+ <property name="label">Device</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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -6043,16 +6067,29 @@ device</property>
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_contacts_detect_and_execute">
+ <widget class="GtkHBox"
id="hbox_contacts_detect_and_execute">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkButton"
id="button_contacts_detect_small">
- <property name="label"
translatable="yes">Device</property>
+ <widget class="GtkVBox" id="vbox70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_contacts_detect_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkVBox" id="vbox272">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="label_button_contacts_detect2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Device</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -6061,6 +6098,35 @@ device</property>
</packing>
</child>
<child>
+ <widget class="GtkImage"
id="image_chronopic_connect_contacts2">
+ <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>
+ <packing>
+ <property name="expand">False</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="GtkButton"
id="button_execute_test">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6069,10 +6135,15 @@ device</property>
<signal name="clicked"
handler="on_button_execute_test_clicked" swapped="no"/>
<accelerator key="space" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
+ <widget class="GtkAlignment" id="alignment21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">2</property>
+ <child>
<widget class="GtkVBox" id="vbox271">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">2</property>
<child>
<widget class="GtkLabel"
id="label_button_execute_connect">
<property name="visible">True</property>
@@ -6099,6 +6170,8 @@ device</property>
</widget>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -26607,6 +26680,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -33015,6 +33091,18 @@ 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>
@@ -33051,18 +33139,6 @@ 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>
@@ -42403,6 +42479,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50413,6 +50492,9 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 04bfcc67a..0010ac589 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -301,7 +301,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VBox vbox_micro_discover;
[Widget] Gtk.Label label_micro_discover_title;
[Widget] Gtk.Table table_micro_discover;
- [Widget] Gtk.VBox vbox_contacts_detect_and_execute;
+ [Widget] Gtk.HBox hbox_contacts_detect_and_execute;
[Widget] Gtk.Button button_contacts_detect;
[Widget] Gtk.Label label_micro_discover_ports;
[Widget] Gtk.Label label_micro_discover_ports_detecting;
@@ -3582,7 +3582,7 @@ public partial class ChronoJumpWindow
vbox_event_execute_drawingarea_run_interval_realtime_capture_cairo.Visible = false;
button_contacts_detect.Visible = false;
- vbox_contacts_detect_and_execute.Visible = true;
+ hbox_contacts_detect_and_execute.Visible = true;
//blank exercise options: useful for changing from jumps or runs to forceSensor, runEncoder,
reaction time, other
label_contacts_exercise_selected_name.Visible = true; //will not be visible when all the
contacts_top combo is implemented
@@ -3688,7 +3688,7 @@ public partial class ChronoJumpWindow
button_execute_test_show_connect_or_execute(!
cp2016.SuccededConnectContactsRealThread);
button_contacts_detect.Visible = true;
- vbox_contacts_detect_and_execute.Visible = false;
+ hbox_contacts_detect_and_execute.Visible = false;
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
//notebook_capture_analyze.ShowTabs = true;
@@ -3876,7 +3876,7 @@ public partial class ChronoJumpWindow
{
button_execute_test_show_connect_or_execute(false);
button_contacts_detect.Visible = true;
- vbox_contacts_detect_and_execute.Visible = false;
+ hbox_contacts_detect_and_execute.Visible = false;
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
notebooks_change(m);
@@ -3926,7 +3926,7 @@ public partial class ChronoJumpWindow
{
button_execute_test_show_connect_or_execute(false);
button_contacts_detect.Visible = true;
- vbox_contacts_detect_and_execute.Visible = false;
+ hbox_contacts_detect_and_execute.Visible = false;
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
notebooks_change(m);
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index df5823698..bb72cb42b 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -53,6 +53,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_all_persons_events_h;
[Widget] Gtk.Image image_person_delete_h;
[Widget] Gtk.Image image_chronopic_connect_contacts;
+ [Widget] Gtk.Image image_chronopic_connect_contacts1;
+ [Widget] Gtk.Image image_chronopic_connect_contacts2;
[Widget] Gtk.Image image_chronopic_connect_encoder;
[Widget] Gtk.Image image_chronopic_connect_encoder1;
[Widget] Gtk.Image image_chronopic_connect_encoder2;
@@ -461,6 +463,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_chronopic_connect.png");
image_chronopic_connect_contacts.Pixbuf = pixbuf;
+ image_chronopic_connect_contacts1.Pixbuf = pixbuf;
+ image_chronopic_connect_contacts2.Pixbuf = pixbuf;
image_chronopic_connect_encoder.Pixbuf = pixbuf;
image_chronopic_connect_encoder1.Pixbuf = pixbuf;
image_chronopic_connect_encoder2.Pixbuf = pixbuf;