commit 8a7356defe96b68d119b2427b38e87f492d0d41a
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 20 12:47:36 2018 +0200
nicer gui for last test buttons (camera play again at right)
glade/app1.glade | 183 +++++++++++++++++++-------------------------------
src/gui/chronojump.cs | 7 +-
2 files changed, 73 insertions(+), 117 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 2ac8629e..ecca62ed 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1715,6 +1715,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -8671,45 +8674,6 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox59">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">4</property>
- <property name="row_spacing">4</property>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkCheckButton"
id="checkbutton_video">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -8753,28 +8717,10 @@ EncoderInertialCapture</property>
</widget>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkButton"
id="button_video_play_this_test">
- <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">Play
Video (v)</property>
- <signal name="clicked"
handler="on_video_play_last_test_clicked" swapped="no"/>
- <accelerator key="v" signal="clicked"/>
- <child>
- <widget class="GtkImage"
id="image_video_play_this_test">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -8783,15 +8729,16 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -8993,41 +8940,45 @@ EncoderInertialCapture</property>
<widget class="GtkVBox"
id="vbox_last_test_buttons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox254">
+ <widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <placeholder/>
+ <property name="label" translatable="yes">Last
test</property>
+ </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_inspect_last_test">
+ <widget class="GtkHBox" id="hbox52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_video_play_this_test">
+ <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">Inspect</property>
- <signal name="clicked"
handler="on_button_inspect_last_test_clicked" swapped="no"/>
+ <property name="tooltip" translatable="yes">Play
Video (v)</property>
+ <signal name="clicked"
handler="on_video_play_last_test_clicked" swapped="no"/>
<accelerator key="v" signal="clicked"/>
<child>
- <widget class="GtkImage" id="image_test_inspect">
+ <widget class="GtkImage"
id="image_video_play_this_test">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">1</property>
</widget>
</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">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -9055,6 +9006,35 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_inspect_last_test">
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Inspect</property>
+ <signal name="clicked"
handler="on_button_inspect_last_test_clicked" swapped="no"/>
+ <accelerator key="v" signal="clicked"/>
+ <child>
+ <widget class="GtkImage" id="image_test_inspect">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</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="expand">False</property>
@@ -19312,42 +19292,6 @@ Concentric</property>
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel"
id="label_force_sensor_ai_rfd_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19623,6 +19567,9 @@ Concentric</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkCheckButton"
id="checkbutton_force_sensor_ai_b">
<property name="width_request">30</property>
<property name="visible">True</property>
@@ -19696,6 +19643,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27924,6 +27874,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 03faa4f1..2fab9a63 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -329,6 +329,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_video_play_this_test;
[Widget] Gtk.Button button_delete_last_test;
[Widget] Gtk.Button button_inspect_last_test;
+ [Widget] Gtk.VBox vbox_last_test_buttons;
[Widget] Gtk.HBox hbox_chronopics_and_more;
[Widget] Gtk.Button button_activate_chronopics;
@@ -7640,8 +7641,10 @@ LogB.Debug("mc finished 5");
//to sensitive on and off the play_this_test and delete_this_test
private void sensitiveLastTestButtons(bool sensitive)
{
- button_video_play_this_test.Sensitive = sensitive;
- button_delete_last_test.Sensitive = sensitive;
+ //button_video_play_this_test.Sensitive = sensitive;
+ //button_delete_last_test.Sensitive = sensitive;
+ vbox_last_test_buttons.Sensitive = sensitive;
+
}
/*
* sensitive GUI on executeAuto methods