commit cdba03f662c12d770494ecf186692b456ef25dca
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Feb 5 14:47:08 2016 +0100
sthetic changes on encoder analyze save buttons
glade/chronojump.glade | 155 +++++++++++++++++++++++++++++++++++++++--------
src/gui/chronojump.cs | 10 +++
src/gui/encoder.cs | 8 +-
3 files changed, 142 insertions(+), 31 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 8fd94cb..5b9afcf 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7955,6 +7955,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9444,6 +9447,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10574,6 +10580,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -17995,6 +18004,12 @@ on current Chronojump version.</property>
<property name="column_spacing">8</property>
<property name="row_spacing">4</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel" id="label143">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -18689,17 +18704,10 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel"
id="label_encoder_analyze_diff">
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Difference</property>
- <property
name="xalign">0.95999997854232788</property>
- <property name="label"
translatable="yes">Diff</property>
+ <property name="xalign">1</property>
+ <property name="label"
translatable="yes">Difference</property>
</widget>
<packing>
<property name="top_attach">3</property>
@@ -18709,14 +18717,10 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel"
id="label_encoder_analyze_average">
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Average</property>
- <property
name="xalign">0.95999997854232788</property>
- <property name="label"
translatable="yes">AVG</property>
+ <property name="xalign">1</property>
+ <property name="label"
translatable="yes">Average</property>
</widget>
<packing>
<property name="top_attach">4</property>
@@ -18731,9 +18735,8 @@ on current Chronojump version.</property>
<child>
<widget class="GtkLabel"
id="label_encoder_analyze_max">
<property name="can_focus">False</property>
- <property name="tooltip"
translatable="yes">Maximum</property>
- <property
name="xalign">0.95999997854232788</property>
- <property name="label"
translatable="yes">Max</property>
+ <property name="xalign">1</property>
+ <property name="label"
translatable="yes">Maximum</property>
</widget>
<packing>
<property name="top_attach">5</property>
@@ -18806,11 +18809,35 @@ on current Chronojump version.</property>
<property name="tooltip" translatable="yes">Save
image</property>
<signal name="clicked"
handler="on_button_encoder_analyze_image_save_clicked" swapped="no"/>
<child>
+ <widget class="GtkVBox" id="vbox63">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
<widget class="GtkImage"
id="image_encoder_analyze_image_save">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_analyze_image_save_1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -18822,8 +18849,6 @@ on current Chronojump version.</property>
</child>
<child>
<widget class="GtkButton"
id="button_encoder_analyze_1RM_save">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
@@ -18833,11 +18858,12 @@ on current Chronojump version.</property>
<widget class="GtkVBox" id="vbox90">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label82">
+ <widget class="GtkImage"
id="image_encoder_analyze_1RM_save">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">1RM</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -18846,7 +18872,7 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_image_save2">
+ <widget class="GtkImage"
id="image_encoder_analyze_1RM_save_1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
@@ -18929,11 +18955,35 @@ on current Chronojump version.</property>
<property name="tooltip" translatable="yes">Save
table</property>
<signal name="clicked"
handler="on_button_encoder_analyze_table_save_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_image_save1">
+ <widget class="GtkVBox" id="vbox64">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_analyze_table_save">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_encoder_analyze_table_save_1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -23202,6 +23252,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24231,6 +24284,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -25752,6 +25808,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>
@@ -26330,6 +26389,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -38406,6 +38468,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>
@@ -40485,6 +40565,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>
@@ -41756,9 +41848,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>
@@ -42787,6 +42876,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>
@@ -46588,6 +46680,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>
@@ -47281,6 +47376,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -47989,6 +48087,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/chronojump.cs b/src/gui/chronojump.cs
index 8b68221..102a879 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -341,8 +341,12 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_capture_zoom;
//[Widget] Gtk.Image image_encoder_analyze_zoom;
[Widget] Gtk.Image image_encoder_analyze_stats;
+ [Widget] Gtk.Image image_encoder_analyze_image_save;
+ [Widget] Gtk.Image image_encoder_analyze_1RM_save;
+ [Widget] Gtk.Image image_encoder_analyze_table_save;
[Widget] Gtk.Image image_encoder_signal_delete;
+
Random rand;
//persons
@@ -776,8 +780,12 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "gpm-statistics.png");
image_encoder_analyze_stats.Pixbuf = pixbuf;
+ image_encoder_analyze_image_save.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
image_encoder_signal_delete.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "spreadsheet.png");
+ image_encoder_analyze_table_save.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeCurrentSignalIcon);
image_encoder_analyze_current_signal.Pixbuf = pixbuf;
@@ -790,6 +798,8 @@ public partial class ChronoJumpWindow
image_encoder_analyze_cross.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyze1RMIcon);
image_encoder_analyze_1RM.Pixbuf = pixbuf;
+ image_encoder_analyze_1RM_save.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeSideIcon);
image_encoder_analyze_side.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeSingleIcon);
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index d193573..97bfe94 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4127,7 +4127,7 @@ public partial class ChronoJumpWindow
treeview_encoder_analyze_curves.Sensitive = false;
button_encoder_analyze_image_save.Sensitive = false;
button_encoder_analyze_table_save.Sensitive = false;
- button_encoder_analyze_1RM_save.Sensitive = false;
+ button_encoder_analyze_1RM_save.Visible = false;
//put some data just in case user doesn't click on compare button
encoderCompareInitialize();
@@ -4935,7 +4935,7 @@ public partial class ChronoJumpWindow
treeview_encoder_analyze_curves.Sensitive = false;
button_encoder_analyze_image_save.Sensitive = false;
button_encoder_analyze_table_save.Sensitive = false;
- button_encoder_analyze_1RM_save.Sensitive = false;
+ button_encoder_analyze_1RM_save.Visible = false;
LogB.ThreadStart();
encoderThread.Start();
@@ -5778,7 +5778,7 @@ public partial class ChronoJumpWindow
treeview_encoder_analyze_curves.Sensitive = false;
button_encoder_analyze_image_save.Sensitive = false;
button_encoder_analyze_table_save.Sensitive = false;
- button_encoder_analyze_1RM_save.Sensitive = false;
+ button_encoder_analyze_1RM_save.Visible = false;
encoderShowCaptureDoingButtons(false);
@@ -5845,7 +5845,7 @@ public partial class ChronoJumpWindow
string my1RMName =
Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_analyze_1RM),
encoderAnalyze1RMTranslation);
- button_encoder_analyze_1RM_save.Sensitive =
+ button_encoder_analyze_1RM_save.Visible =
(radiobutton_encoder_analyze_1RM.Active &&
(my1RMName == "1RM Bench Press" || my1RMName == "1RM Any exercise") );
// || my1RMName == "1RM Indirect") );