commit d12340d7f03132c9553c0c57b4b1251971a2a3ca
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 26 13:03:24 2022 +0200
Several improvements to 2.2.2 menu
glade/app1.glade | 234 ++++++++++++++++++++++--------------------
images/md/elastic.png | Bin 2419 -> 15192 bytes
images/md/ic_jump_blue_2x.png | Bin 9704 -> 8945 bytes
images/md/isometric.png | Bin 11652 -> 12031 bytes
images/md/run_mov_blue_2x.png | Bin 7588 -> 8199 bytes
images/md/weight_mov_2x.png | Bin 7700 -> 8607 bytes
src/gui/app1/chronojump.cs | 18 ++--
7 files changed, 135 insertions(+), 117 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index a8122e9b5..bcd7adb68 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -4809,11 +4809,6 @@
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="on_button_menu_2_2_2_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox280">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
@@ -4825,17 +4820,7 @@
</widget>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <widget class="GtkLabel" id="label661">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Jumps</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -4844,14 +4829,22 @@
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox279">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label663">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Races</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -4869,12 +4862,6 @@
<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>
- <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_races">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -4886,27 +4873,15 @@
</widget>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <widget class="GtkLabel" id="label663">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Races</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>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4919,6 +4894,18 @@
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
+ <widget class="GtkLabel" id="label664">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Isometric</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_isometric">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -4944,155 +4931,169 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label664">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Isometric</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox275">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label665">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Elastic</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_2_2_2_elastic">
+ <widget class="GtkRadioButton"
id="radio_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"/>
+ <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="vbox275">
+ <widget class="GtkEventBox"
id="eventbox_radio_menu_2_2_2_elastic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
<widget class="GtkImage"
id="image_selector_start_elastic">
<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>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label665">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Elastic</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
- </widget>
- </child>
+ <child>
+ <widget class="GtkVBox" id="vbox273">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label667">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Weights</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_2_2_2_weights">
+ <widget class="GtkRadioButton"
id="radio_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"/>
+ <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="vbox273">
+ <widget class="GtkEventBox"
id="eventbox_radio_menu_2_2_2_weights">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
<child>
<widget class="GtkImage"
id="image_selector_start_displ_weights">
<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>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label667">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Weights</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
- </widget>
- </child>
+ <child>
+ <widget class="GtkVBox" id="vbox274">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label668">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Inertial</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_2_2_2_inertial">
+ <widget class="GtkRadioButton"
id="radio_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"/>
+ <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="vbox274">
+ <widget class="GtkEventBox"
id="eventbox_radio_menu_2_2_2_inertial">
<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="GtkImage"
id="image_selector_start_inertial">
<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="label668">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">Inertial</property>
+ </widget>
+ </child>
</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>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5101,8 +5102,9 @@
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">100</property>
<property name="position">0</property>
</packing>
</child>
@@ -5189,6 +5191,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -27093,6 +27096,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -33501,6 +33507,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>
@@ -33537,18 +33555,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>
@@ -42907,6 +42913,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50909,6 +50918,9 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/md/elastic.png b/images/md/elastic.png
index a3b333a68..2cf186392 100644
Binary files a/images/md/elastic.png and b/images/md/elastic.png differ
diff --git a/images/md/ic_jump_blue_2x.png b/images/md/ic_jump_blue_2x.png
index 19c885940..3a10ef550 100644
Binary files a/images/md/ic_jump_blue_2x.png and b/images/md/ic_jump_blue_2x.png differ
diff --git a/images/md/isometric.png b/images/md/isometric.png
index b85d9ab02..f080f7356 100644
Binary files a/images/md/isometric.png and b/images/md/isometric.png differ
diff --git a/images/md/run_mov_blue_2x.png b/images/md/run_mov_blue_2x.png
index b2969fea8..c79fc882d 100644
Binary files a/images/md/run_mov_blue_2x.png and b/images/md/run_mov_blue_2x.png differ
diff --git a/images/md/weight_mov_2x.png b/images/md/weight_mov_2x.png
index 1ae3e0dae..2d61a31b7 100644
Binary files a/images/md/weight_mov_2x.png and b/images/md/weight_mov_2x.png differ
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 2aad4a1d9..b4e83a794 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -676,6 +676,9 @@ public partial class ChronoJumpWindow
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);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_menu_2_2_2_elastic, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_menu_2_2_2_weights, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_menu_2_2_2_inertial, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
app1s_eventboxes_paint();
createComboSelectJumps(true);
@@ -4408,12 +4411,15 @@ public partial class ChronoJumpWindow
[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.RadioButton radio_menu_2_2_2_elastic;
+ [Widget] Gtk.RadioButton radio_menu_2_2_2_weights;
+ [Widget] Gtk.RadioButton radio_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.EventBox eventbox_radio_menu_2_2_2_elastic;
+ [Widget] Gtk.EventBox eventbox_radio_menu_2_2_2_weights;
+ [Widget] Gtk.EventBox eventbox_radio_menu_2_2_2_inertial;
[Widget] Gtk.Label label_selector_menu_2_2_2;
private void on_button_menu_2_2_2_clicked (object o, EventArgs args)
@@ -4425,11 +4431,11 @@ public partial class ChronoJumpWindow
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)
+ if(o == (object) radio_menu_2_2_2_elastic)
str = "Elastic force exercises measured by a force sensor";
- if(o == (object) button_menu_2_2_2_weights)
+ if(o == (object) radio_menu_2_2_2_weights)
str = "Speed/power exercises displacing weights measured by an encoder";
- if(o == (object) button_menu_2_2_2_inertial)
+ if(o == (object) radio_menu_2_2_2_inertial)
str = "Speed/power exercises rotating an inertial machine and measured by an encoder";
if (str != "")