commit 157b3c6da3172c884abf83f6f5af2e29c290ceec
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Jul 4 22:34:44 2015 +0200
Minor GUI changes
glade/chronojump.glade | 301 ++++++++++++++++++++++++++++++++++++++-------
src/gui/jump.cs | 10 --
src/gui/multiChronopic.cs | 1 -
3 files changed, 254 insertions(+), 58 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index eb35397..dbbc627 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3691,20 +3691,25 @@ weight</property>
</packing>
</child>
<child>
+ <widget class="GtkAlignment" id="alignment13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <child>
<widget class="GtkHBox"
id="hbox_extra_window_jumps_single_leg_radios">
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">16</property>
<child>
- <widget class="GtkHBox" id="hbox172">
+ <widget class="GtkHBox" id="hbox173">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label101">
+ <widget class="GtkLabel" id="label100">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Type</property>
+ <property name="label"
translatable="yes">Dominance</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3713,17 +3718,17 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox97">
+ <widget class="GtkHBox" id="hbox99">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_vertical">
- <property name="label">V</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_unknown">
+ <property name="label">Unknown</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Vertical</property>
+ <property name="tooltip"
translatable="yes">Unknown</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
</widget>
@@ -3734,14 +3739,15 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_horizontal">
- <property name="label">H</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_this_limb">
+ <property name="label"
translatable="yes">This</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Horizontal</property>
+ <property name="tooltip" translatable="yes">This
limb</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3750,14 +3756,13 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_lateral">
- <property name="label"
translatable="yes">L</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_opposite">
+ <property name="label"
translatable="yes">Opposite</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Lateral</property>
<property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3767,8 +3772,8 @@ weight</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -3780,35 +3785,35 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox173">
+ <widget class="GtkHBox" id="hbox172">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label100">
+ <widget class="GtkLabel" id="label101">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Dominance</property>
+ <property name="label"
translatable="yes">Type</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox99">
+ <widget class="GtkHBox" id="hbox97">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_unknown">
- <property name="label">Unknown</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_vertical">
+ <property name="label">V</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Unknown</property>
+ <property name="tooltip"
translatable="yes">Vertical</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
</widget>
@@ -3819,15 +3824,14 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_this_limb">
- <property name="label"
translatable="yes">This</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_horizontal">
+ <property name="label">H</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip" translatable="yes">This
limb</property>
- <property name="xalign">0</property>
+ <property name="tooltip"
translatable="yes">Horizontal</property>
<property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3836,13 +3840,14 @@ weight</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_dominance_opposite">
- <property name="label"
translatable="yes">Opposite</property>
+ <widget class="GtkRadioButton"
id="extra_window_jumps_radiobutton_single_leg_mode_lateral">
+ <property name="label"
translatable="yes">L</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip"
translatable="yes">Lateral</property>
<property name="draw_indicator">False</property>
- <property
name="group">extra_window_jumps_radiobutton_single_leg_dominance_unknown</property>
+ <property
name="group">extra_window_jumps_radiobutton_single_leg_mode_vertical</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -3852,8 +3857,8 @@ weight</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -3936,8 +3941,8 @@ weight</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -3949,6 +3954,8 @@ weight</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3958,7 +3965,7 @@ weight</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -5153,7 +5160,7 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox167">
+ <widget class="GtkHBox" id="hbox186">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -5162,6 +5169,7 @@ after time</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
+ <property name="width_chars">7</property>
<property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
@@ -5174,8 +5182,8 @@ after time</property>
<signal name="changed"
handler="on_extra_window_pulses_spinbutton_pulse_step_changed" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -5187,8 +5195,8 @@ after time</property>
<property name="label"
translatable="yes">seconds</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -5200,7 +5208,7 @@ after time</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox168">
+ <widget class="GtkHBox" id="hbox188">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -5209,6 +5217,7 @@ after time</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
+ <property name="width_chars">7</property>
<property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
@@ -5221,8 +5230,8 @@ after time</property>
<signal name="changed"
handler="on_extra_window_pulses_spinbutton_ppm_changed" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -7202,6 +7211,15 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8538,6 +8556,15 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -9515,6 +9542,15 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -21035,6 +21071,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -21911,6 +21956,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23279,6 +23333,15 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -23704,6 +23767,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -34806,6 +34878,60 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36273,6 +36399,42 @@ 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>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37613,6 +37775,15 @@ 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>
</widget>
</child>
</widget>
@@ -38527,6 +38698,15 @@ 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>
</widget>
</child>
</widget>
@@ -41899,6 +42079,15 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -42439,6 +42628,15 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42994,6 +43192,15 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 38c0b8a..bf9cd0d 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -1109,16 +1109,13 @@ partial class ChronoJumpWindow
{
currentEventType = myJumpType;
changeTestImage(EventType.Types.JUMP.ToString(), myJumpType.Name, myJumpType.ImageFileName);
- bool hasOptions = false;
if(myJumpType.HasWeight) {
- hasOptions = true;
extra_window_showWeightData(myJumpType, true);
} else
extra_window_showWeightData(myJumpType, false);
if(myJumpType.HasFall) {
- hasOptions = true;
extra_window_showFallData(myJumpType, true);
} else
extra_window_showFallData(myJumpType, false);
@@ -1130,11 +1127,9 @@ partial class ChronoJumpWindow
else //myJumpType.Name == "DJna"
extra_window_jumps_check_dj_arms.Active = false;
- hasOptions = true;
extra_window_showTechniqueArmsData(true, false); //visible, sensitive
} else if(myJumpType.Name == "DJ") {
//user has pressed DJ button
- hasOptions = true;
extra_window_jumps_check_dj_arms.Active = extra_window_jumps_arms;
on_extra_window_jumps_check_dj_arms_clicked(new object(), new EventArgs());
@@ -1152,7 +1147,6 @@ partial class ChronoJumpWindow
extra_window_showSingleLegStuff(myJumpType.Name == "slCMJleft" || myJumpType.Name ==
"slCMJright");
if(myJumpType.Name == "slCMJleft" || myJumpType.Name == "slCMJright") {
- hasOptions = true;
frame_extra_window_jumps_single_leg_input.Sensitive = false;
extra_window_jumps_spin_single_leg_distance.Value = 0;
extra_window_jumps_spin_single_leg_angle.Value = 90;
@@ -1163,11 +1157,9 @@ partial class ChronoJumpWindow
{
currentEventType = myJumpType;
changeTestImage(EventType.Types.JUMP.ToString(), myJumpType.Name, myJumpType.ImageFileName);
- bool hasOptions = false;
checkbutton_allow_finish_rj_after_time.Visible = false;
if(myJumpType.FixedValue >= 0) {
- hasOptions = true;
string jumpsName = Catalog.GetString("jumps");
string secondsName = Catalog.GetString("seconds");
if(myJumpType.JumpsLimited) {
@@ -1190,14 +1182,12 @@ partial class ChronoJumpWindow
extra_window_showLimitData (false);
if(myJumpType.HasWeight) {
- hasOptions = true;
extra_window_showWeightData(myJumpType, true);
} else
extra_window_showWeightData(myJumpType, false);
if(myJumpType.HasFall || myJumpType.Name == Constants.RunAnalysisName) {
extra_window_showFallData(myJumpType, true);
- hasOptions = true;
} else
extra_window_showFallData(myJumpType, false);
diff --git a/src/gui/multiChronopic.cs b/src/gui/multiChronopic.cs
index 84e7fce..0b10b9e 100644
--- a/src/gui/multiChronopic.cs
+++ b/src/gui/multiChronopic.cs
@@ -68,7 +68,6 @@ public partial class ChronoJumpWindow
currentEventType = myMultiChronopicType;
changeTestImage(EventType.Types.MULTICHRONOPIC.ToString(),
myMultiChronopicType.Name, myMultiChronopicType.ImageFileName);
- bool hasOptions = false;
extra_window_spin_run_analysis_distance.Value = extra_window_multichronopic_distance;
bool showSyncAndDeleteFirst = false;