commit 1a40fa37154228560796b0d80b832f32d2f87c42
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Nov 27 13:42:24 2019 +0100
Use at all program button for exercise instructions... like on encoder
glade/app1.glade | 231 +++++++++++++++++++++++++++++++++++++++------
src/gui/chronojump.cs | 10 ++
src/gui/chronojumpIcons.cs | 8 +-
3 files changed, 217 insertions(+), 32 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5b353adf..6d111128 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -5622,6 +5622,59 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
+ <child>
+ <widget class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">10</property>
+ <property name="bottom_padding">10</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_contacts_exercise">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_contacts_exercise_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_contacts_exercise">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</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="alignment2">
<property name="visible">True</property>
@@ -7402,7 +7455,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -7823,7 +7876,7 @@ EncoderInertialCapture</property>
<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>
@@ -7834,17 +7887,22 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">4</property>
<child>
- <widget class="GtkVBox" id="vbox_execute_test">
+ <widget class="GtkNotebook"
id="notebook_contacts_execute_or_instructions">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
<child>
- <widget class="GtkHBox" id="hbox183">
+ <widget class="GtkVBox" id="vbox_execute_test">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox183">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -10689,7 +10747,7 @@ Resisted race analyzer</property>
<child>
<widget class="GtkNotebook"
id="notebook_options_at_execute_button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
@@ -11574,7 +11632,7 @@ Resisted race analyzer</property>
<child>
<widget class="GtkNotebook"
id="notebook_last_test_buttons">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
@@ -11715,15 +11773,15 @@ Resisted race analyzer</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox16">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -15535,13 +15593,120 @@ Resisted race analyzer</property>
<property name="position">2</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label413">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">execute test</property>
</widget>
<packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkVBox" id="vbox147">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label416">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">TODO</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Close</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_contacts_exercise_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox334">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage"
id="image_contacts_exercise_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label415">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Close</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label414">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">instruccions</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -15581,8 +15746,8 @@ Resisted race analyzer</property>
</child>
</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">2</property>
</packing>
</child>
@@ -22208,6 +22373,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24455,18 +24623,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>
@@ -24503,6 +24659,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>
@@ -26151,7 +26319,7 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkImage"
id="image_encoder_exercise1">
+ <widget class="GtkImage"
id="image_encoder_exercise_close">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -31528,6 +31696,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 2dee26cc..d1b03a4a 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -75,6 +75,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_sup;
[Widget] Gtk.HBox hbox_other;
[Widget] Gtk.Notebook notebook_capture_analyze; //not encoder
+ [Widget] Gtk.Notebook notebook_contacts_execute_or_instructions;
[Widget] Gtk.Notebook notebook_analyze; //not encoder
[Widget] Gtk.Notebook notebook_capture_graph_table;
[Widget] Gtk.HBox hbox_message_permissions_at_boot;
@@ -490,6 +491,15 @@ public partial class ChronoJumpWindow
//createMainWindow("");
}
+ private void on_button_contacts_exercise_clicked (object o, EventArgs args)
+ {
+ notebook_contacts_execute_or_instructions.CurrentPage = 1;
+ }
+ private void on_button_contacts_exercise_close_clicked (object o, EventArgs args)
+ {
+ notebook_contacts_execute_or_instructions.CurrentPage = 0;
+ }
+
private void on_button_image_test_zoom_clicked(object o, EventArgs args)
{
EventType myType;
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 855f5a11..fbe39921 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -53,6 +53,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_edit_current_person_h;
//[Widget] Gtk.Image image_persons_up;
//[Widget] Gtk.Image image_persons_down;
+ [Widget] Gtk.Image image_contacts_exercise;
+ [Widget] Gtk.Image image_contacts_exercise_close;
[Widget] Gtk.Image image_rest;
[Widget] Gtk.Image image_all_persons_events;
[Widget] Gtk.Image image_all_persons_events_h;
@@ -133,7 +135,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_recalculate;
[Widget] Gtk.Image image_encoder_configuration;
[Widget] Gtk.Image image_encoder_exercise;
- [Widget] Gtk.Image image_encoder_exercise1;
+ [Widget] Gtk.Image image_encoder_exercise_close;
[Widget] Gtk.Image image_encoder_capture_open;
[Widget] Gtk.Image image_encoder_capture_open1;
[Widget] Gtk.Image image_encoder_capture_1set;
@@ -372,6 +374,7 @@ public partial class ChronoJumpWindow
image_encoder_analyze_mode_options.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_exercise.png");
+ image_contacts_exercise.Pixbuf = pixbuf;
image_encoder_exercise.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_new_big.png");
@@ -412,7 +415,8 @@ public partial class ChronoJumpWindow
image_session_edit.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
- image_encoder_exercise1.Pixbuf = pixbuf;
+ image_contacts_exercise_close.Pixbuf = pixbuf;
+ image_encoder_exercise_close.Pixbuf = pixbuf;
image_force_sensor_analyze_options_close.Pixbuf = pixbuf;
image_encoder_analyze_mode_options_close.Pixbuf = pixbuf;
image_force_sensor_capture_adjust_close.Pixbuf = pixbuf;