[chronojump] jumpRj top & options, icons mass and fall
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] jumpRj top & options, icons mass and fall
- Date: Wed, 24 Aug 2022 09:48:54 +0000 (UTC)
commit 793f44a5d2d261674858ffa9c1009274bd1c8354
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Aug 24 11:48:16 2022 +0200
jumpRj top & options, icons mass and fall
glade/app1.glade | 66 ++++++++++++++++++++++++++++++++++++++--
src/gui/app1/contactsExercise.cs | 8 +++--
src/gui/app1/icons.cs | 2 ++
src/gui/app1/jump.cs | 3 ++
4 files changed, 74 insertions(+), 5 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 6cea2a976..c885b90da 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -12534,6 +12534,11 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkHBox" id="hbox567">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
<widget class="GtkImage"
id="extra_window_jumps_image_fall">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12552,9 +12557,16 @@ EncoderInertialCapture</property>
<property name="label"
translatable="yes">Falling height</property>
</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>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -12576,7 +12588,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -12589,7 +12601,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -12959,6 +12971,23 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkHBox" id="hbox565">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="extra_window_jumps_rj_image_weight">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="extra_window_jumps_rj_label_weight">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -12967,6 +12996,13 @@ EncoderInertialCapture</property>
<property name="wrap">True</property>
</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">0</property>
@@ -13135,12 +13171,36 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkHBox" id="hbox566">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="extra_window_jumps_rj_image_fall">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="extra_window_jumps_rj_label_fall">
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Falling height</property>
</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>
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index 6b49be305..d661dd7a4 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -273,7 +273,9 @@ public partial class ChronoJumpWindow
name = extra_window_jumps_rj_spinbutton_weight.Value.ToString() + " kg";
label_contacts_exercise_selected_options2.Text = name;
- image_contacts_exercise_selected_options2.Visible = false; //TODO: change to true
when have the image;
+ image_contacts_exercise_selected_options2.Pixbuf =
+ new Pixbuf (null, Util.GetImagePath(false) + "extra-mass.png");
+ image_contacts_exercise_selected_options2.Visible = true;
} else {
label_contacts_exercise_selected_options2.Text = "";
image_contacts_exercise_selected_options2.Visible = false;
@@ -283,7 +285,9 @@ public partial class ChronoJumpWindow
{
name = extra_window_jumps_rj_spinbutton_fall.Value.ToString() + " cm";
label_contacts_exercise_selected_options3.Text = name;
- image_contacts_exercise_selected_options3.Visible = false; //TODO: change to true
when have the image;
+ image_contacts_exercise_selected_options3.Pixbuf =
+ new Pixbuf (null, Util.GetImagePath(false) + "image_fall.png");
+ image_contacts_exercise_selected_options3.Visible = true;
} else {
label_contacts_exercise_selected_options3.Text = "";
image_contacts_exercise_selected_options3.Visible = false;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index afae2535a..224983207 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -682,7 +682,9 @@ public partial class ChronoJumpWindow
image_tab_jumps_dj_optimal_fall.Pixbuf = pixbuf;
extra_window_jumps_image_fall.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_fall.png");
+ extra_window_jumps_rj_image_fall.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"image_fall.png");
extra_window_jumps_image_weight.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"extra-mass.png");
+ extra_window_jumps_rj_image_weight.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"extra-mass.png");
image_tab_jumps_weight_fv_profile.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"jumps-fv.png");
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index 91fb3e352..9f73ed585 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -43,6 +43,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label extra_window_jumps_label_dj_start_inside;
[Widget] Gtk.Label extra_window_jumps_label_dj_start_outside;
[Widget] Gtk.Image extra_window_jumps_image_fall;
+ [Widget] Gtk.Image extra_window_jumps_image_weight;
[Widget] Gtk.SpinButton extra_window_jumps_spinbutton_fall;
[Widget] Gtk.HBox hbox_extra_window_jumps_weight;
[Widget] Gtk.RadioButton extra_window_jumps_radiobutton_kg;
@@ -77,6 +78,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton extra_window_jumps_rj_radiobutton_kg;
[Widget] Gtk.RadioButton extra_window_jumps_rj_radiobutton_weight;
[Widget] Gtk.HBox hbox_extra_window_jumps_rj_weight;
+ [Widget] Gtk.Image extra_window_jumps_rj_image_fall;
+ [Widget] Gtk.Image extra_window_jumps_rj_image_weight;
//[Widget] Gtk.Label extra_window_jumps_rj_label_weight;
[Widget] Gtk.Label extra_window_jumps_rj_label_fall;
[Widget] Gtk.Label extra_window_jumps_rj_label_cm;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
