commit 995400ccdd0bac47b214581d05c5d6d20e27943c
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jun 17 12:20:59 2014 +0200
More minor GUI changes
glade/chronojump.glade | 127 +++++++++++++++++++++++++++++++++++++++++++++---
src/gui/stats.cs | 2 +
2 files changed, 122 insertions(+), 7 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 8f3c2cf..4e94055 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3082,6 +3082,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-connect</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -6200,6 +6201,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6825,6 +6829,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7584,6 +7591,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8102,6 +8112,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -8464,6 +8477,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-execute</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -8475,7 +8489,7 @@ Second Chronopic to platforms.</property>
<widget class="GtkLabel" id="label_execute_test">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Execute test</property>
+ <property name="label" translatable="yes">Capture</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -10117,6 +10131,7 @@ Second Chronopic to platforms.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -11765,7 +11780,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label_statistics">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Statistics</property>
+ <property name="label" translatable="yes">Analyze</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -11907,6 +11922,7 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-connect</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -12065,7 +12081,7 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-media-play</property>
- <property name="icon-size">1</property>
+ <property name="icon-size">2</property>
</widget>
</child>
</widget>
@@ -12080,6 +12096,7 @@ on current Chronojump version.</property>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -13035,10 +13052,35 @@ on current Chronojump version.</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label73">
+ <widget class="GtkHBox" id="hbox131">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Capture</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ <property name="icon-size">2</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label73">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Capture</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="tab_fill">False</property>
@@ -14207,10 +14249,36 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label74">
+ <widget class="GtkHBox" id="hbox27">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Analyze</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_stats_win_graph3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="label74">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Analyze</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -17293,6 +17361,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -17716,6 +17787,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18576,6 +18650,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -26159,6 +26239,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>
@@ -27971,6 +28069,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>
@@ -28453,6 +28554,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>
@@ -30450,6 +30554,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -30537,6 +30644,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -30639,6 +30749,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index 04265d7..8679105 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -81,6 +81,7 @@ public partial class ChronoJumpWindow {
[Widget] Gtk.Image image_stats_win_graph;
[Widget] Gtk.Image image_stats_win_graph1;
[Widget] Gtk.Image image_stats_win_graph2;
+ [Widget] Gtk.Image image_stats_win_graph3;
[Widget] Gtk.Image image_stats_win_report_open;
[Widget] Gtk.Image image_results;
@@ -292,6 +293,7 @@ public partial class ChronoJumpWindow {
image_stats_win_graph.Pixbuf = pixbuf;
image_stats_win_graph1.Pixbuf = pixbuf;
image_stats_win_graph2.Pixbuf = pixbuf;
+ image_stats_win_graph3.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "report_view.png");
image_stats_win_report_open.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "spreadsheet.png");