commit 3c7d1e9eb31d7694a69593d0cbf996ee6e01bd94
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jun 14 18:17:58 2017 +0200
contraction and laterality also on inertial top info
glade/app1.glade | 94 ++++++++++++++++++++++++++++++++++++++++----
src/gui/chronojumpIcons.cs | 4 ++
src/gui/encoder.cs | 2 +-
3 files changed, 91 insertions(+), 9 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 1244c4d..8dd54b5 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1325,6 +1325,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14812,13 +14815,12 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook"
id="notebook_encoder_top">
+ <widget class="GtkHBox" id="hbox73">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox96">
+ <widget class="GtkHBox" id="hbox107">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -14846,8 +14848,26 @@ Concentric</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="GtkHBox" id="hbox73">
+ <widget class="GtkNotebook"
id="notebook_encoder_top">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox96">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox75">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -14880,7 +14900,7 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -14893,7 +14913,7 @@ Concentric</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -14915,12 +14935,36 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
+ <widget class="GtkHBox" id="hbox112">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_inertial_top_weights">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Weights</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="label_encoder_top_weights">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">label</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>
@@ -14958,6 +15002,13 @@ Concentric</property>
</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="pack_type">end</property>
@@ -16684,12 +16735,36 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
+ <widget class="GtkHBox" id="hbox214">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_inertial_weights">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Extra mass</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="label183">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Weights</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>
@@ -20698,6 +20773,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 9967537..952397a 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -77,6 +77,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_laterality_l;
[Widget] Gtk.Image image_top_extra_mass;
[Widget] Gtk.Image image_extra_mass;
+ [Widget] Gtk.Image image_encoder_inertial_top_weights;
+ [Widget] Gtk.Image image_encoder_inertial_weights;
[Widget] Gtk.Image image_recalculate;
[Widget] Gtk.Image image_encoder_configuration;
[Widget] Gtk.Image image_encoder_exercise;
@@ -150,6 +152,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "extra-mass.png");
image_top_extra_mass.Pixbuf = pixbuf;
image_extra_mass.Pixbuf = pixbuf;
+ image_encoder_inertial_top_weights.Pixbuf = pixbuf;
+ image_encoder_inertial_weights.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_gravity.png");
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 08a592e..aece22d 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -560,7 +560,7 @@ public partial class ChronoJumpWindow
else
entry_encoder_im_weights_n.Text = spin_encoder_im_weights_n.Value.ToString();
- label_encoder_top_weights.Text = Catalog.GetString("Weights") + ": " +
entry_encoder_im_weights_n.Text;
+ label_encoder_top_weights.Text = entry_encoder_im_weights_n.Text;
}
// <---- end of spin_encoder_im_weights_n ----