commit ea6a9d7a513245b9514d1d2e9f53d854f4b6b0aa
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon May 23 12:00:42 2022 +0200
experimental 2.2.2 mode selection top icons/buttons done
glade/app1.glade | 383 ++++++++++++++++++++++++++++++++++++++++++++-
src/Makefile.am | 7 +
src/gui/app1/chronojump.cs | 9 ++
src/gui/app1/icons.cs | 19 +++
4 files changed, 416 insertions(+), 2 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 261830b7f..94abd3cfd 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -3112,6 +3112,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton" id="button_menu_2_2_2">
+ <property name="label">2.2.2 menu</property>
+ <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"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -3240,7 +3254,7 @@
<widget class="GtkLabel" id="label271">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">page
1</property>
+ <property name="label">page 1</property>
</widget>
<packing>
<property name="tab_fill">False</property>
@@ -4752,10 +4766,357 @@
<widget class="GtkLabel" id="label272">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">page
2</property>
+ <property name="label">page 2</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox271">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox27">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="button12">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox276">
+ <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_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>
+ <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">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </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">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <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="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>
+ <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="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button14">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox278">
+ <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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</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>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button15">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <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="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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</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>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button16">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <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="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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</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>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button17">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox274">
+ <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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox62">
+ <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="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </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>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_menu_2_2_1">
+ <property name="label">2.2.1 menu</property>
+ <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"/>
+ </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>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label669">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">select mode
2.2.2</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -26632,6 +26993,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -42434,6 +42801,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50413,6 +50786,12 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b7019197..d3e069071 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -483,7 +483,10 @@ RESOURCES = \
../images/md/ic_power_settings_new_red_1x.png,image_quit.png \
../images/md/weight.png,image_weight.png \
../images/md/weight_yellow.png,image_weight_yellow.png \
+ ../images/md/weight_mov_2x.png,image_weight_mov_2x.png \
../images/md/ic_settings_backup_restore_blue_1x.png,image_inertia.png \
+ ../images/md/ic_settings_backup_restore_blue_2x.png,image_inertia_2x.png \
+ ../images/md/ic_settings_backup_restore_blue_2x_2col.png,image_inertia_2x_2col.png \
../images/md/ic_settings_backup_restore_yellow_1x.png,image_inertia_yellow.png \
../images/md/ic_timer_blue_1x.png,image_capture.png \
../images/md/ic_timer_blue_2x.png,image_capture_big.png \
@@ -530,9 +533,11 @@ RESOURCES = \
../images/md/ic_add_circle_blue_1x.png,image_add_test.png \
../images/md/ic_all_inclusive_blue_1x.png,cont.png \
../images/md/ic_jump_blue_1x.png,image_jump.png \
+ ../images/md/ic_jump_blue_2x.png,image_jump_2x.png \
../images/md/ic_jump_simple_blue_1x.png,image_jump_simple.png \
../images/md/ic_jump_reactive_blue_1x.png,image_jump_reactive.png \
../images/md/run_blue_2x.png,run_2x.png \
+ ../images/md/run_mov_blue_2x.png,run_mov_2x.png \
../images/md/run_blue_1x.png,image_run.png \
../images/md/run_simple_blue_1x.png,image_run_simple.png \
../images/md/run_simple_yellow_1x.png,image_run_simple_yellow.png \
@@ -610,6 +615,8 @@ RESOURCES = \
../images/force_sensor_menu.png,force_sensor_menu.png \
../images/force_sensor_icon.png,force_sensor_icon.png \
../images/force_sensor_icon_yellow.png,force_sensor_icon_yellow.png \
+ ../images/md/isometric.png,isometric.png \
+ ../images/md/elastic.png,elastic.png \
../images/reaction_time_icon.png,reaction_time_icon.png \
../images/other_icon.png,other_icon.png \
../images/other_icon_yellow.png,other_icon_yellow.png \
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 799e15271..e296d50b5 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4392,6 +4392,15 @@ public partial class ChronoJumpWindow
notebook_mode_selector.CurrentPage = 0; //main
}
+ private void on_button_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)
+ {
+ notebook_mode_selector.CurrentPage = 0;
+ }
+
private void on_button_contacts_capture_save_image_clicked (object o, EventArgs args)
{
if(current_mode == Constants.Modes.JUMPSSIMPLE)
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index bb72cb42b..539f4a555 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -97,6 +97,13 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_selector_start_other;
[Widget] Gtk.Image image_selector_start_back;
+ [Widget] Gtk.Image image_selector_start_jumps1;
+ [Widget] Gtk.Image image_selector_start_runs1;
+ [Widget] Gtk.Image image_selector_start_isometric;
+ [Widget] Gtk.Image image_selector_start_elastic;
+ [Widget] Gtk.Image image_selector_start_displ_weights;
+ [Widget] Gtk.Image image_selector_start_inertial;
+
[Widget] Gtk.Image image_mode_jumps_small;
[Widget] Gtk.Image image_mode_jumps_reactive_small;
[Widget] Gtk.Image image_mode_runs_small;
@@ -648,6 +655,18 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "selector-multichronopic.png");
image_selector_start_other.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_jump_2x.png");
+ image_selector_start_jumps1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "run_mov_2x.png");
+ image_selector_start_runs1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "isometric.png");
+ image_selector_start_isometric.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "elastic.png");
+ image_selector_start_elastic.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_weight_mov_2x.png");
+ image_selector_start_displ_weights.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_inertia_2x_2col.png");
+ image_selector_start_inertial.Pixbuf = pixbuf;
/*
* gui for small screens
*/