[chronojump] encoder concentric/exc-con muscle arm images
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] encoder concentric/exc-con muscle arm images
- Date: Tue, 23 May 2017 16:00:49 +0000 (UTC)
commit af723e00b7c70d215f4dd9a6c743b7c65a17e6b1
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 23 17:59:34 2017 +0200
encoder concentric/exc-con muscle arm images
glade/app1.glade | 54 +++++++++++++++++++++----------
howto_compile.txt | 3 ++
images/muscle-concentric.png | Bin 0 -> 2127 bytes
images/muscle-excentric-concentric.png | Bin 0 -> 2174 bytes
src/Makefile.am | 2 +
src/gui/chronojump.cs | 2 +
src/gui/chronojumpIcons.cs | 4 ++
src/gui/encoder.cs | 23 ++++++++++++--
8 files changed, 67 insertions(+), 21 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index cc30dc1..85727a7 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1257,6 +1257,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>
@@ -14689,10 +14692,10 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel"
id="label_encoder_top_exercise">
+ <widget class="GtkLabel"
id="label_encoder_top_selected">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="label">label_encoder_exercise</property>
+ <property name="label">label_enc_sel</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -14701,10 +14704,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_encoder_top_eccon">
+ <widget class="GtkLabel"
id="label_encoder_top_exercise">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">contraction</property>
+ <property name="label">label_enc_ex</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -14712,18 +14715,6 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel"
id="label_encoder_top_laterality">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">RL</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -14743,6 +14734,30 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
+ <widget class="GtkImage" id="image_muscle">
+ <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="label_encoder_top_laterality">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">RL</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_encoder_top_extra_mass">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14751,7 +14766,7 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -14764,7 +14779,7 @@ Concentric</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -20273,6 +20288,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/howto_compile.txt b/howto_compile.txt
index 28a2d9a..e47b17b 100644
--- a/howto_compile.txt
+++ b/howto_compile.txt
@@ -44,6 +44,9 @@ And inside the chronojump directory
make osx-installer
+#to be used by Owncloud
+mv file.dmg ~/BinarisMac/
+
#if there are problems on hdiuti do:
hdiutil create -size 200m ...
diff --git a/images/muscle-concentric.png b/images/muscle-concentric.png
new file mode 100644
index 0000000..fcab239
Binary files /dev/null and b/images/muscle-concentric.png differ
diff --git a/images/muscle-excentric-concentric.png b/images/muscle-excentric-concentric.png
new file mode 100644
index 0000000..c6d95dc
Binary files /dev/null and b/images/muscle-excentric-concentric.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index a3aadb1..258d4a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -447,6 +447,8 @@ RESOURCES = \
../images/chronojump-logo-transparent.png,chronojump-logo-transparent.png \
../images/chronojump-logo-2013_320.png,chronojump-logo-2013_320.png \
../images/chronojump-logo-2013.png,chronojump-logo-2013.png \
+ ../images/muscle-concentric.png,muscle-concentric.png \
+ ../images/muscle-excentric-concentric.png,muscle-excentric-concentric.png \
../images/encoder-analyze-individual-current-set.png,encoder-analyze-individual-current-set.png \
../images/encoder-analyze-individual-current-session.png,encoder-analyze-individual-current-session.png \
../images/encoder-analyze-individual-all-sessions.png,encoder-analyze-individual-all-sessions.png \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index a041ff4..3ea97f3 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2919,6 +2919,7 @@ public partial class ChronoJumpWindow
EncoderConfigurationSQLObject econfSO =
SqliteEncoderConfiguration.SelectActive(Constants.EncoderGI.GRAVITATORY);
encoderConfigurationCurrent = econfSO.encoderConfiguration;
label_encoder_selected.Text = econfSO.name;
+ label_encoder_top_selected.Text = econfSO.name;
changed = true;
}
@@ -2953,6 +2954,7 @@ public partial class ChronoJumpWindow
EncoderConfigurationSQLObject econfSO =
SqliteEncoderConfiguration.SelectActive(Constants.EncoderGI.INERTIAL);
encoderConfigurationCurrent = econfSO.encoderConfiguration;
label_encoder_selected.Text = econfSO.name;
+ label_encoder_top_selected.Text = econfSO.name;
changed = true;
}
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 393d4d1..0883c2c 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -67,6 +67,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_selector_start_cancel;
//encoder images
+ [Widget] Gtk.Image image_muscle;
[Widget] Gtk.Image image_recalculate;
[Widget] Gtk.Image image_encoder_configuration;
[Widget] Gtk.Image image_encoder_exercise;
@@ -118,6 +119,9 @@ public partial class ChronoJumpWindow
image_quit.Pixbuf = pixbuf;
image_quit1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
+ image_muscle.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_gravity.png");
image_mode_encoder_gravitatory.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_inertia.png");
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index d35797f..5655740 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -53,8 +53,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_encoder_selected;
[Widget] Gtk.Notebook notebook_encoder_top;
+ [Widget] Gtk.Label label_encoder_top_selected;
[Widget] Gtk.Label label_encoder_top_exercise;
- [Widget] Gtk.Label label_encoder_top_eccon;
[Widget] Gtk.Label label_encoder_top_laterality;
[Widget] Gtk.Label label_encoder_top_extra_mass;
[Widget] Gtk.Label label_encoder_top_1RM_percent;
@@ -408,6 +408,7 @@ public partial class ChronoJumpWindow
EncoderConfigurationSQLObject econfSO =
SqliteEncoderConfiguration.SelectActive(Constants.EncoderGI.GRAVITATORY);
encoderConfigurationCurrent = econfSO.encoderConfiguration;
label_encoder_selected.Text = econfSO.name;
+ label_encoder_top_selected.Text = econfSO.name;
encoderCaptureListStore = new Gtk.ListStore (typeof (EncoderCurve));
@@ -480,6 +481,7 @@ public partial class ChronoJumpWindow
EncoderConfiguration eConfNew = encoder_configuration_win.GetAcceptedValues();
label_encoder_selected.Text = encoder_configuration_win.Entry_save_name;
+ label_encoder_top_selected.Text = encoder_configuration_win.Entry_save_name;
if(encoderConfigurationCurrent == eConfNew)
return;
@@ -1558,6 +1560,7 @@ public partial class ChronoJumpWindow
encoderConfigurationGUIUpdate();
label_encoder_selected.Text = econfSO.name;
+ label_encoder_top_selected.Text = econfSO.name;
//triggers
triggerList = new TriggerList(
@@ -3402,7 +3405,15 @@ public partial class ChronoJumpWindow
hbox_combo_encoder_analyze_curve_num_combo.Visible = false; //do not show hbox at start
label_encoder_top_exercise.Text = UtilGtk.ComboGetActive(combo_encoder_exercise_capture);
- label_encoder_top_eccon.Text = UtilGtk.ComboGetActive(combo_encoder_eccon);
+
+ //label_encoder_top_eccon.Text = UtilGtk.ComboGetActive(combo_encoder_eccon);
+ Pixbuf pixbuf;
+ if(UtilGtk.ComboGetActive(combo_encoder_eccon) == Catalog.GetString("Concentric"))
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
+ else
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"muscle-excentric-concentric.png");
+ image_muscle.Pixbuf = pixbuf;
+
label_encoder_top_laterality.Text = UtilGtk.ComboGetActive(combo_encoder_laterality);
label_encoder_top_extra_mass.Text = Catalog.GetString("Extra mass") + ": " +
entry_raspberry_extra_weight.Text + " Kg";
label_encoder_top_1RM_percent.Text = label_encoder_1RM_percent.Text + " %1RM";
@@ -3531,7 +3542,13 @@ public partial class ChronoJumpWindow
check_encoder_analyze_eccon_together.Sensitive = true;
block_check_encoder_analyze_eccon_together_if_needed();
- label_encoder_top_eccon.Text = UtilGtk.ComboGetActive(combo_encoder_eccon);
+ //label_encoder_top_eccon.Text = UtilGtk.ComboGetActive(combo_encoder_eccon);
+ Pixbuf pixbuf;
+ if(UtilGtk.ComboGetActive(combo_encoder_eccon) == Catalog.GetString("Concentric"))
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
+ else
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"muscle-excentric-concentric.png");
+ image_muscle.Pixbuf = pixbuf;
}
void on_combo_encoder_laterality_changed (object o, EventArgs args)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
