commit 0818a9f048dc4a4bd4380110e1be5730f7a81fc7
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 25 18:06:57 2022 +0200
More tweaks on experimental 2_2_2 menu
glade/app1.glade | 167 +++++++++++++++++++++++++++++++++++----------
src/gui/app1/chronojump.cs | 38 ++++++++++-
2 files changed, 168 insertions(+), 37 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 917dd65ad..a8122e9b5 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -3118,7 +3118,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_view_menu_2_2_2_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -4784,23 +4784,47 @@
<property name="can_focus">False</property>
<property name="layout_style">spread</property>
<child>
- <widget class="GtkButton" id="button12">
+ <widget class="GtkVBox" id="vbox276">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label662">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Jumps</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_menu_2_2_2_jumps">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox276">
+ <widget class="GtkVBox" id="vbox280">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">2</property>
<property name="spacing">2</property>
<child>
+ <widget class="GtkEventBox"
id="eventbox_radio_menu_2_2_2_jumps">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkImage"
id="image_selector_start_jumps1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="yalign">1</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -4814,8 +4838,8 @@
<property name="label"
translatable="yes">Jumps</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -4823,16 +4847,27 @@
</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button13">
+ <widget class="GtkRadioButton"
id="radio_menu_2_2_2_races">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radio_menu_2_2_2_jumps</property>
+ <signal name="toggled"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox279">
<property name="visible">True</property>
@@ -4840,11 +4875,17 @@
<property name="border_width">2</property>
<property name="spacing">2</property>
<child>
+ <widget class="GtkEventBox"
id="eventbox_radio_menu_2_2_2_races">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkImage"
id="image_selector_start_runs1">
<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>
@@ -4873,21 +4914,33 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button14">
+ <widget class="GtkVBox" id="vbox278">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_menu_2_2_2_isometric">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radio_menu_2_2_2_jumps</property>
+ <signal name="toggled"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox278">
+ <widget class="GtkEventBox"
id="eventbox_radio_menu_2_2_2_isometric">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
<widget class="GtkImage"
id="image_selector_start_isometric">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -4907,8 +4960,6 @@
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4916,10 +4967,11 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button15">
+ <widget class="GtkButton"
id="button_menu_2_2_2_elastic">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox275">
<property name="visible">True</property>
@@ -4959,10 +5011,11 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button16">
+ <widget class="GtkButton"
id="button_menu_2_2_2_weights">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox273">
<property name="visible">True</property>
@@ -5002,10 +5055,11 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button17">
+ <widget class="GtkButton"
id="button_menu_2_2_2_inertial">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
<widget class="GtkVBox" id="vbox274">
<property name="visible">True</property>
@@ -5057,10 +5111,30 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkVBox" id="vbox277">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel"
id="label_selector_menu_2_2_2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox227">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkButton" id="button18">
- <property name="label"
translatable="yes">button</property>
- <property name="width_request">250</property>
- <property name="height_request">250</property>
+ <property name="label">Go!</property>
+ <property name="width_request">150</property>
+ <property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -5078,6 +5152,20 @@
<property name="position">1</property>
</packing>
</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="position">1</property>
+ </packing>
+ </child>
<child>
<widget class="GtkHBox" id="hbox224">
<property name="visible">True</property>
@@ -5088,7 +5176,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_menu_2_2_1_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_view_menu_2_2_1_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -27002,6 +27090,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -33410,18 +33501,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>
@@ -33458,6 +33537,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>
@@ -42813,6 +42904,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50812,6 +50906,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 9cf828661..2aad4a1d9 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -673,6 +673,9 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_micro_discover_cancel_close,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_exit_cancel, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_exit_confirm, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_menu_2_2_2_jumps, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_menu_2_2_2_races, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_menu_2_2_2_isometric, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
app1s_eventboxes_paint();
createComboSelectJumps(true);
@@ -4393,15 +4396,46 @@ public partial class ChronoJumpWindow
notebook_mode_selector.CurrentPage = 0; //main
}
- private void on_button_menu_2_2_2_clicked (object o, EventArgs args)
+ private void on_button_view_menu_2_2_2_clicked (object o, EventArgs args)
{
notebook_mode_selector.CurrentPage = 2;
}
- private void on_button_menu_2_2_1_clicked (object o, EventArgs args)
+ private void on_button_view_menu_2_2_1_clicked (object o, EventArgs args)
{
notebook_mode_selector.CurrentPage = 0;
}
+ [Widget] Gtk.RadioButton radio_menu_2_2_2_jumps;
+ [Widget] Gtk.RadioButton radio_menu_2_2_2_races;
+ [Widget] Gtk.RadioButton radio_menu_2_2_2_isometric;
+ [Widget] Gtk.Button button_menu_2_2_2_elastic;
+ [Widget] Gtk.Button button_menu_2_2_2_weights;
+ [Widget] Gtk.Button button_menu_2_2_2_inertial;
+ [Widget] Gtk.EventBox eventbox_radio_menu_2_2_2_jumps;
+ [Widget] Gtk.EventBox eventbox_radio_menu_2_2_2_races;
+ [Widget] Gtk.EventBox eventbox_radio_menu_2_2_2_isometric;
+ [Widget] Gtk.Label label_selector_menu_2_2_2;
+
+ private void on_button_menu_2_2_2_clicked (object o, EventArgs args)
+ {
+ string str = "";
+ if(o == (object) radio_menu_2_2_2_jumps)
+ str = "Jumps with contact platform";
+ if(o == (object) radio_menu_2_2_2_races)
+ str = "Races with photocells (Wichro or wired), or RaceAnalyzer";
+ if(o == (object) radio_menu_2_2_2_isometric)
+ str = "Isometric force exercises measured by a force sensor";
+ if(o == (object) button_menu_2_2_2_elastic)
+ str = "Elastic force exercises measured by a force sensor";
+ if(o == (object) button_menu_2_2_2_weights)
+ str = "Speed/power exercises displacing weights measured by an encoder";
+ if(o == (object) button_menu_2_2_2_inertial)
+ str = "Speed/power exercises rotating an inertial machine and measured by an encoder";
+
+ if (str != "")
+ label_selector_menu_2_2_2.Text = str;
+ }
+
private void on_button_contacts_capture_save_image_clicked (object o, EventArgs args)
{
if(current_mode == Constants.Modes.JUMPSSIMPLE)