[chronojump] Better order on encoder graph options
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Better order on encoder graph options
- Date: Fri, 22 Jan 2016 18:28:17 +0000 (UTC)
commit e93aec56f31308b31783c368fc07d793bfd7d13d
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jan 22 19:26:29 2016 +0100
Better order on encoder graph options
glade/chronojump.glade | 71 ++++++++++++++++++++++++++++++++++++++++++++---
src/gui/encoder.cs | 26 +++++++++---------
2 files changed, 79 insertions(+), 18 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index b7bba28..631617d 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7925,6 +7925,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9384,6 +9387,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10484,6 +10490,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -17276,7 +17285,8 @@ on current Chronojump version.</property>
<widget class="GtkImage" id="image24">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-dialog-info</property>
+ <property name="stock">gtk-info</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -17729,7 +17739,7 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-cancel</property>
- <property name="icon-size">2</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -22197,6 +22207,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23196,6 +23209,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24687,6 +24703,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -25235,6 +25254,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -37131,6 +37153,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -39090,6 +39130,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40391,9 +40443,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -41392,6 +41441,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -45163,6 +45215,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -45826,6 +45881,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -46504,6 +46562,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 4352d1b..f23de02 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2133,18 +2133,18 @@ public partial class ChronoJumpWindow
(
crossNameTemp == "Speed,Power / Load" ||
crossNameTemp == Catalog.GetString("Speed,Power / Load") ||
- crossNameTemp == "1RM Bench Press" ||
- crossNameTemp == Catalog.GetString("1RM Bench Press") ||
crossNameTemp == "1RM Any exercise" ||
- crossNameTemp == Catalog.GetString("1RM Any exercise")
+ crossNameTemp == Catalog.GetString("1RM Any exercise") ||
+ crossNameTemp == "1RM Bench Press" ||
+ crossNameTemp == Catalog.GetString("1RM Bench Press")
//no 1RM Indirect because cannot be done with saved curves
)) {
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, this graph is not supported yet.") +
"\n\nSaved repetitions - compare - cross variables" +
"\n- Speed,Power / Load" +
- "\n- 1RM Bench Press" +
- "\n- 1RM Any exercise"
+ "\n- 1RM Any exercise" +
+ "\n- 1RM Bench Press"
//no 1RM Indirect because cannot be done with saved curves
);
@@ -2153,10 +2153,10 @@ public partial class ChronoJumpWindow
//cannot do 1RM with different exercises
if(encoderAnalysis == "cross" && (
- crossNameTemp == "1RM Bench Press" ||
- crossNameTemp == Catalog.GetString("1RM Bench Press") ||
crossNameTemp == "1RM Any exercise" ||
- crossNameTemp == Catalog.GetString("1RM Any exercise")
+ crossNameTemp == Catalog.GetString("1RM Any exercise") ||
+ crossNameTemp == "1RM Bench Press" ||
+ crossNameTemp == Catalog.GetString("1RM Bench Press")
//no 1RM Indirect because cannot be done with saved curves
))
{
@@ -3403,13 +3403,13 @@ public partial class ChronoJumpWindow
//create combo analyze cross (variables)
string [] comboAnalyzeCrossOptions = {
- "Speed / Load", "Force / Load", "Power / Load", "Speed,Power / Load", "Force /
Speed", "Power / Speed",
- "1RM Bench Press", "1RM Any exercise", "1RM Indirect"};
+ "Power / Load", "Speed / Load", "Force / Load", "Speed,Power / Load", "Force /
Speed", "Power / Speed",
+ "1RM Any exercise", "1RM Bench Press", "1RM Indirect"};
string [] comboAnalyzeCrossOptionsTranslated = {
- Catalog.GetString("Speed / Load"), Catalog.GetString("Force / Load"),
- Catalog.GetString("Power / Load"), Catalog.GetString("Speed,Power / Load"),
+ Catalog.GetString("Power / Load"), Catalog.GetString("Speed / Load"),
+ Catalog.GetString("Force / Load"), Catalog.GetString("Speed,Power / Load"),
Catalog.GetString("Force / Speed"), Catalog.GetString("Power / Speed"),
- Catalog.GetString("1RM Bench Press"), Catalog.GetString("1RM Any exercise"),
+ Catalog.GetString("1RM Any exercise"), Catalog.GetString("1RM Bench Press"),
Catalog.GetString("1RM Indirect")
}; //if added more, change the int in the 'for' below
encoderAnalyzeCrossTranslation = new String [comboAnalyzeCrossOptions.Length];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
