[chronojump] only show cairo realtime drawingarea on jumpRj, runI (fixes recent commits)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] only show cairo realtime drawingarea on jumpRj, runI (fixes recent commits)
- Date: Tue, 28 Sep 2021 15:30:26 +0000 (UTC)
commit d0b7c4907cbe6bfe9d394c02be2115d675086754
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 28 17:29:26 2021 +0200
only show cairo realtime drawingarea on jumpRj, runI (fixes recent commits)
glade/app1.glade | 36 +++++++++++++++++++++---------------
src/gui/app1/chronojump.cs | 12 ++++++++----
src/gui/eventExecute.cs | 3 ++-
3 files changed, 31 insertions(+), 20 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index b794cb3f3..abd0eeb54 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7712,13 +7712,13 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
+ <widget class="GtkHBox"
id="hbox_drawingarea_realtime_capture_cairo">
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkDrawingArea"
id="event_execute_drawingarea_realtime_capture_cairo">
<property name="height_request">125</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="expose_event"
handler="on_event_execute_drawingarea_realtime_capture_cairo_expose_event" swapped="no"/>
</widget>
@@ -7729,7 +7729,7 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_event_execute_drawingarea_realtime_capture_cairo">
+ <widget class="GtkVBox"
id="vbox_event_execute_drawingarea_run_interval_realtime_capture_cairo">
<property name="can_focus">False</property>
<child>
<widget class="GtkCheckButton"
id="check_runI_realtime_rel_abs">
@@ -24740,6 +24740,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -31051,6 +31054,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>
@@ -31087,18 +31102,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>
@@ -40424,6 +40427,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/chronojump.cs b/src/gui/app1/chronojump.cs
index d35cba579..4d0a1a62d 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3488,8 +3488,9 @@ public partial class ChronoJumpWindow
event_execute_label_message.Text = "";
event_execute_drawingarea.Visible = false;
- event_execute_drawingarea_realtime_capture_cairo.Visible = false;
- vbox_event_execute_drawingarea_realtime_capture_cairo.Visible = false;
+
+ hbox_drawingarea_realtime_capture_cairo.Visible = false;
+ vbox_event_execute_drawingarea_run_interval_realtime_capture_cairo.Visible = false;
//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
@@ -3551,11 +3552,12 @@ public partial class ChronoJumpWindow
notebooks_change(m);
button_contacts_bells.Sensitive = true;
on_extra_window_jumps_rj_test_changed(new object(), new EventArgs());
- event_execute_drawingarea_realtime_capture_cairo.Visible = true;
event_graph_label_graph_test.Visible = false;
vbox_contacts_simple_graph_controls.Visible = true;
+ hbox_drawingarea_realtime_capture_cairo.Visible = true;
+
//align_check_vbox_contacts_graph_legend.Visible = false;
//vbox_contacts_graph_legend.Visible = false;
@@ -3613,12 +3615,14 @@ public partial class ChronoJumpWindow
button_contacts_bells.Sensitive = true;
on_extra_window_runs_interval_test_changed(new object(), new EventArgs());
event_execute_drawingarea_realtime_capture_cairo.Visible = true;
- vbox_event_execute_drawingarea_realtime_capture_cairo.Visible = true;
button_inspect_last_test_run_intervallic.Visible = true;
event_graph_label_graph_test.Visible = false;
vbox_contacts_simple_graph_controls.Visible = true;
+ hbox_drawingarea_realtime_capture_cairo.Visible = true;
+ vbox_event_execute_drawingarea_run_interval_realtime_capture_cairo.Visible =
true;
+
//align_check_vbox_contacts_graph_legend.Visible = false;
//vbox_contacts_graph_legend.Visible = false;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 39c53a355..b109d77aa 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -88,9 +88,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_results_data;
[Widget] Gtk.DrawingArea event_execute_drawingarea;
+ [Widget] Gtk.HBox hbox_drawingarea_realtime_capture_cairo;
[Widget] Gtk.DrawingArea event_execute_drawingarea_realtime_capture_cairo;
[Widget] Gtk.DrawingArea event_execute_drawingarea_cairo;
- [Widget] Gtk.VBox vbox_event_execute_drawingarea_realtime_capture_cairo;
+ [Widget] Gtk.VBox vbox_event_execute_drawingarea_run_interval_realtime_capture_cairo;
[Widget] Gtk.CheckButton check_runI_realtime_rel_abs;
[Widget] Gtk.Image image_check_runI_realtime_rel_abs;
[Widget] Gtk.Frame frame_run_simple_double_contacts;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
