commit 2dd1ac70989245e145c5208904e0f3c6a9103324
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Apr 22 13:56:25 2014 +0200
better GUI on contacts stats graphs
glade/chronojump.glade | 1029 +++++++++++++++++++++++----------------
images/report_view.png | Bin 0 -> 1014 bytes
images/stock_task-assigned.png | Bin 907 -> 0 bytes
images/svg/icons.svg | 1064 +++++++++++++++++++++++++++++++++++++++-
src/Makefile.am | 2 +-
src/gui/report.cs | 2 +-
src/gui/stats.cs | 31 +-
7 files changed, 1684 insertions(+), 444 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index ffa445a..0fa5923 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -5568,6 +5568,21 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6211,6 +6226,21 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -6988,6 +7018,21 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -7524,6 +7569,21 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -10384,65 +10444,71 @@ Second Chronopic to platforms.</property>
<widget class="GtkAlignment" id="alignment145">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">6</property>
+ <property name="top_padding">6</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">6</property>
<child>
<widget class="GtkVBox" id="vbox37">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkNotebook" id="notebook1">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkTable" id="table8">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">12</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label764">
+ <widget class="GtkHBox"
id="hbox_combo_graph_type">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Type</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_graph_var_x">
+ <widget class="GtkHBox"
id="hbox_stats_variables">
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">var
X</property>
+ <property name="label"
translatable="yes">Variables</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_graph_var_y">
+ <widget class="GtkHBox"
id="hbox_combo_graph_var_x">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">var
Y</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_combo_graph_type">
+ <widget class="GtkHBox"
id="hbox_combo_graph_var_y">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -10450,105 +10516,231 @@ Second Chronopic to platforms.</property>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_combo_graph_var_x">
+ <widget class="GtkCheckButton"
id="checkbutton_transposed">
+ <property name="label"
translatable="yes">Transpose graph</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Transpose</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_combo_graph_var_y">
+ <widget class="GtkHBox" id="hbox40">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
- <placeholder/>
+ <widget class="GtkButton"
id="button_stats_graph_options">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Options</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="on_button_stats_graph_options_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </widget>
</child>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_transposed">
- <property name="label"
translatable="yes">Transpose</property>
+ <widget class="GtkButton" id="button_graph">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
+ <property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Transpose</property>
+ <property name="tooltip"
translatable="yes">Graph this statistic</property>
+ <signal name="clicked"
handler="on_button_graph_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkAlignment" id="alignment24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage"
id="image_stats_win_graph">
+ <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="label79">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Graph</property>
<property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_transposed">
+ <widget class="GtkHBox" id="hbox42">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Transpose graph</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Informe</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_add_to_report">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Add
this statistic and its graph to report window</property>
+ <signal name="clicked"
handler="on_button_add_to_report_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_stats_win_report_add">
+ <property name="width_request">16</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-add</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label50">
+ <widget class="GtkButton"
id="button_open_report_window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">View
report window</property>
+ <signal name="clicked"
handler="on_show_report_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_stats_win_report_open">
+ <property name="width_request">16</property>
+ <property name="height_request">16</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Type</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_graph_options">
+ <property name="can_focus">False</property>
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">5</property>
- <property name="column_spacing">12</property>
+ <property name="column_spacing">8</property>
+ <property name="row_spacing">4</property>
<child>
<widget class="GtkLabel" id="label766">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Width</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Width</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -10574,8 +10766,11 @@ Second Chronopic to platforms.</property>
<widget class="GtkLabel" id="label771">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Height</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Height</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -10607,12 +10802,16 @@ Second Chronopic to platforms.</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip"
translatable="yes">Width of the line</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Line
width</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -10636,15 +10835,18 @@ Second Chronopic to platforms.</property>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"/>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label_graph_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Legend</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Legend</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
<property name="left_attach">3</property>
@@ -10674,8 +10876,11 @@ Second Chronopic to platforms.</property>
<widget class="GtkLabel" id="label765">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Palette</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Palette</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -10703,140 +10908,98 @@ Second Chronopic to platforms.</property>
</child>
</widget>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Aspect</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_graph_margins">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkHBox" id="hbox383">
+ <widget class="GtkHBox" id="hbox43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox384">
+ <widget class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">5</property>
+ <property name="column_spacing">8</property>
+ <property name="row_spacing">4</property>
<child>
<widget class="GtkLabel" id="label777">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Bottom</property>
+ <property name="xalign">0</property>
<property name="label"
translatable="yes">Bottom</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton"
id="spin_graph_margin_b">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">2</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">5 1 20 1 1
0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox385">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
<widget class="GtkLabel" id="label778">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Left</property>
+ <property name="xalign">0</property>
<property name="label"
translatable="yes">Left</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="spin_graph_margin_l">
+ <widget class="GtkLabel" id="label779">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">2</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">4 1 20 1 1
0</property>
- <property name="climb_rate">1</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Top</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Top</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label780">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Right</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Right</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox386">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label779">
+ <widget class="GtkLabel" id="label_stats_x_axis">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Top</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Adjust this and bottom margin if athlete's names are long.</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">X axis
font size</property>
+ <property name="ellipsize">end</property>
+ <property name="max_width_chars">8</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="spin_graph_margin_t">
+ <widget class="GtkSpinButton"
id="spin_graph_margin_b">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -10845,43 +11008,18 @@ Second Chronopic to platforms.</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">4 1 20 1 1
0</property>
+ <property name="adjustment">5 1 20 1 1
0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox387">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label780">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="spin_graph_margin_r">
+ <widget class="GtkSpinButton"
id="spin_graph_margin_l">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -10890,41 +11028,16 @@ Second Chronopic to platforms.</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">2 1 20 1 1
0</property>
+ <property name="adjustment">4 1 20 1 1
0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_stats_x_axis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label66">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Adjust this and bottom margin if athlete's names are long.</property>
- <property name="label" translatable="yes">X axis
font size</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -10937,264 +11050,109 @@ Second Chronopic to platforms.</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">0.80000000000000004
0.5 1 0.10000000000000001 1 0</property>
+ <property name="adjustment">1 0.5 1
0.10000000000000001 1 0</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_graph_margin_default">
- <property name="label"
translatable="yes">Default values</property>
+ <widget class="GtkSpinButton"
id="spin_graph_margin_t">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked"
handler="on_button_graph_margin_default_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">4 1 20 1 1
0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label52">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Margins</property>
- </widget>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox47">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">center</property>
- <child>
- <widget class="GtkButton" id="button_graph">
+ <widget class="GtkSpinButton"
id="spin_graph_margin_r">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Graph this statistic</property>
- <signal name="clicked"
handler="on_button_graph_clicked" swapped="no"/>
- <child>
- <widget class="GtkAlignment" id="alignment24">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox57">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage"
id="image_stats_win_graph">
- <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="label79">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Graph</property>
- <property name="use_underline">True</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property name="adjustment">2 1 20 1 1
0</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
</widget>
- </child>
- </widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox4">
+ <widget class="GtkVBox" id="vbox48">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
- <property name="layout_style">end</property>
<child>
- <widget class="GtkButton"
id="button_add_to_report">
+ <widget class="GtkButton"
id="button_graph_margin_default">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Add
this statistic and its graph to report window</property>
- <signal name="clicked"
handler="on_button_add_to_report_clicked" swapped="no"/>
- <child>
- <widget class="GtkAlignment" id="alignment44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox108">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage"
id="image_stats_win_report">
- <property name="width_request">16</property>
- <property name="height_request">16</property>
- <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>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="on_button_graph_margin_default_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label169">
+ <widget class="GtkImage" id="image39">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add to
report</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="stock">gtk-undo</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_open_report_window">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">View
report window</property>
- <signal name="clicked"
handler="on_show_report_clicked" swapped="no"/>
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage"
id="image_stats_win_report1">
- <property name="width_request">16</property>
- <property name="height_request">16</property>
- <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="label49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Open
report window</property>
- <property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- </child>
- </widget>
- </child>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -11859,7 +11817,7 @@ on current Chronojump version.</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">0 0 300 1 10
0</property>
+ <property name="adjustment">1 0 300 1 10
0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -16888,6 +16846,21 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -17329,6 +17302,21 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18225,6 +18213,36 @@ by you</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>
</widget>
<packing>
<property name="expand">True</property>
@@ -25938,6 +25956,96 @@ 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>
+ <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>
@@ -27764,6 +27872,21 @@ 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>
</widget>
</child>
</widget>
@@ -28264,6 +28387,21 @@ 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>
</widget>
</child>
</widget>
@@ -30069,6 +30207,21 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -30174,6 +30327,21 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -30294,6 +30462,21 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/images/report_view.png b/images/report_view.png
new file mode 100644
index 0000000..83eb039
Binary files /dev/null and b/images/report_view.png differ
diff --git a/images/svg/icons.svg b/images/svg/icons.svg
index a30c2eb..ccea41d 100644
--- a/images/svg/icons.svg
+++ b/images/svg/icons.svg
@@ -4439,6 +4439,778 @@
y1="44.98"
x2="18.379"
y2="3.0816" />
+ <filter
+ id="filter9723"
+ height="2.1400001"
+ width="1.1341"
+ color-interpolation-filters="sRGB"
+ y="-0.56999999"
+ x="-0.067059003">
+ <feGaussianBlur
+ id="feGaussianBlur9725"
+ stdDeviation="0.475" />
+ </filter>
+ <linearGradient
+ id="linearGradient9318"
+ y2="186.19"
+ gradientUnits="userSpaceOnUse"
+ x2="321.20001"
+ gradientTransform="matrix(1.125,0,0,1.0556,-341.19,-167.42)"
+ y1="181.62"
+ x1="305">
+ <stop
+ id="stop9314"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop9316"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9734"
+ y2="185.24001"
+ gradientUnits="userSpaceOnUse"
+ x2="321"
+ gradientTransform="matrix(1.125,0,0,1.0556,-340.06,-167.42)"
+ y1="169"
+ x1="318.06">
+ <stop
+ id="stop9730"
+ style="stop-color:#babdb6"
+ offset="0" />
+ <stop
+ id="stop9732"
+ style="stop-color:#555753"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9308"
+ y2="174.09"
+ gradientUnits="userSpaceOnUse"
+ x2="309.81"
+ gradientTransform="matrix(1.1333,0,0,1,-343.8,-156)"
+ y1="182.12"
+ x1="311.06">
+ <stop
+ id="stop9304"
+ style="stop-color:#fff"
+ offset="0" />
+ <stop
+ id="stop9306"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4814"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop9392"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop9394"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4816"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop9608"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop9610"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop9612"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4285"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop4287"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop4289"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4291"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop4293"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop4295"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop4297"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4299"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop4301"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop4303"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4305"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop4307"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop4309"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop4311"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4313"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop4315"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop4317"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4319"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop4321"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop4323"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop4325"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4327"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop4329"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop4331"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4333"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop4335"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop4337"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop4339"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4341"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop4343"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop4345"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4347"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop4349"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop4351"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop4353"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4355"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop4357"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop4359"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4361"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop4363"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop4365"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop4367"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <filter
+ id="filter9723-4"
+ height="2.1400001"
+ width="1.1341"
+ color-interpolation-filters="sRGB"
+ y="-0.56999999"
+ x="-0.067059003">
+ <feGaussianBlur
+ id="feGaussianBlur9725-3"
+ stdDeviation="0.475" />
+ </filter>
+ <linearGradient
+ id="linearGradient9318-0"
+ y2="186.19"
+ gradientUnits="userSpaceOnUse"
+ x2="321.20001"
+ gradientTransform="matrix(1.125,0,0,1.0556,-341.19,-167.42)"
+ y1="181.62"
+ x1="305">
+ <stop
+ id="stop9314-5"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop9316-6"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9734-9"
+ y2="185.24001"
+ gradientUnits="userSpaceOnUse"
+ x2="321"
+ gradientTransform="matrix(1.125,0,0,1.0556,-340.06,-167.42)"
+ y1="169"
+ x1="318.06">
+ <stop
+ id="stop9730-0"
+ style="stop-color:#babdb6"
+ offset="0" />
+ <stop
+ id="stop9732-7"
+ style="stop-color:#555753"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9308-1"
+ y2="174.09"
+ gradientUnits="userSpaceOnUse"
+ x2="309.81"
+ gradientTransform="matrix(1.1333,0,0,1,-343.8,-156)"
+ y1="182.12"
+ x1="311.06">
+ <stop
+ id="stop9304-5"
+ style="stop-color:#fff"
+ offset="0" />
+ <stop
+ id="stop9306-6"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient4601-6"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient4814-0"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop9392-6"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop9394-2"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient4603-3"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient4816-2"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop9608-8"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop9610-7"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop9612-6"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient5580"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient5582"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop5584"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop5586"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient5588"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient5590"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop5592"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop5594"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop5596"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient5598"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient5600"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop5602"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop5604"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient5606"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient5608"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop5610"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop5612"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop5614"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient5616"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient5618"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop5620"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop5622"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient5624"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient5626"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop5628"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop5630"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop5632"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient5634"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient5636"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop5638"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop5640"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient5642"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient5644"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop5646"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop5648"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop5650"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient5652"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient5654"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop5656"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop5658"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient5660"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient5662"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop5664"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop5666"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop5668"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814-0"
+ id="linearGradient5670"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ id="linearGradient5672"
+ y2="171.16"
+ gradientUnits="userSpaceOnUse"
+ x2="308.42999"
+ y1="169.16"
+ x1="308.42999">
+ <stop
+ id="stop5674"
+ style="stop-color:#d3d7cf"
+ offset="0" />
+ <stop
+ id="stop5676"
+ style="stop-color:#eeeeec"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816-2"
+ id="linearGradient5678"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
+ <linearGradient
+ id="linearGradient5680"
+ y2="167.34"
+ gradientUnits="userSpaceOnUse"
+ x2="309.56"
+ y1="171.28"
+ x1="309.56">
+ <stop
+ id="stop5682"
+ style="stop-color:#555753"
+ offset="0" />
+ <stop
+ id="stop5684"
+ style="stop-color:#d3d7cf"
+ offset=".66795" />
+ <stop
+ id="stop5686"
+ style="stop-color:#888a85"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4814"
+ id="linearGradient6022"
+ gradientUnits="userSpaceOnUse"
+ x1="308.42999"
+ y1="169.16"
+ x2="308.42999"
+ y2="171.16" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4816"
+ id="linearGradient6024"
+ gradientUnits="userSpaceOnUse"
+ x1="309.56"
+ y1="171.28"
+ x2="309.56"
+ y2="167.34" />
</defs>
<sodipodi:namedview
id="base"
@@ -4447,9 +5219,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1.9045085"
- inkscape:cx="122.41948"
- inkscape:cy="81.852818"
+ inkscape:zoom="1.6388146"
+ inkscape:cx="145.14997"
+ inkscape:cy="173.29598"
inkscape:document-units="px"
inkscape:current-layer="capa1"
showgrid="false"
@@ -7145,5 +7917,291 @@
x="-75.816284"
y="1284.4675"
style="font-size:2px">auto-by-series.png</tspan></text>
+ <g
+ id="g6026"
+
inkscape:export-filename="/home/xavier/informatica/progs_meus/chronojump/chronojump/images/report_view.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1183.5249"
+ x="106.80107"
+ height="24"
+ width="24"
+ id="rect6004"
+ style="fill:#ffffff;fill-opacity:0;stroke:none" />
+ <g
+ transform="translate(107.31116,1175.3235)"
+ id="layer1-3">
+ <path
+ transform="matrix(1.1575,0,0,0.86742,-350.23,-131.9)"
+ d="m 304.98,183.69 h 15.041 l 0.98,4.31 h -17 l 0.97963,-4.3057 z"
+ style="filter:url(#filter9723);enable-background:new"
+ id="rect9705"
+ inkscape:connector-curvature="0" />
+ <rect
+ x="2.5"
+ y="11.5"
+ width="18"
+ height="19"
+ ry="0.79167002"
+ rx="0.84375"
+ style="fill:url(#linearGradient9318);stroke:url(#linearGradient9734);enable-background:new"
+ id="rect10371" />
+ <rect
+ x="3"
+ y="13"
+ width="17"
+ height="15"
+ ry="0"
+ rx="0"
+ style="fill:url(#linearGradient9308);enable-background:new"
+ id="rect8528" />
+ <g
+ transform="translate(-351,-158)"
+ style="enable-background:new"
+ id="g3651">
+ <rect
+ x="356"
+ y="176"
+ width="1"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9632" />
+ <rect
+ x="359"
+ y="176"
+ width="10"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9634" />
+ <rect
+ x="356"
+ y="178"
+ width="1"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9640" />
+ <rect
+ x="356"
+ y="180"
+ width="1"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9646" />
+ <rect
+ x="359"
+ y="180"
+ width="5.9998002"
+ height="1.0001"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9650" />
+ <rect
+ x="356"
+ y="182"
+ width="1"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9656" />
+ <rect
+ x="359"
+ y="182"
+ width="10"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9658" />
+ <rect
+ x="356"
+ y="184"
+ width="1"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect9660" />
+ <rect
+ x="359"
+ y="178"
+ width="9"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect3587" />
+ <rect
+ x="356"
+ y="174"
+ width="1"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect3603" />
+ <rect
+ x="359"
+ y="174"
+ width="10"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect3605" />
+ <rect
+ x="359"
+ y="184"
+ width="10"
+ height="1"
+ ry="0"
+ rx="0"
+ style="opacity:0.47999998;fill:#888a85;enable-background:new"
+ id="rect3609" />
+ </g>
+ <rect
+ x="2"
+ y="30"
+ width="19"
+ height="1"
+ ry="0"
+ rx="0"
+ style="fill:#2e3436;enable-background:new"
+ id="rect9300" />
+ <rect
+ x="3.5"
+ y="12.5"
+ width="16"
+ height="17"
+ ry="0"
+ rx="0"
+ style="opacity:0.5;fill:none;stroke:#ffffff;enable-background:new"
+ id="rect9310" />
+ <path
+ d="M 5.5,12 C 4.672,12 4,12.67199 4,13.5 4,14.328 4.67201,15 5.5,15 c 0.38234,0 0.73499,-0.13923
1,-0.375 0.0104,0.009 0.0206,0.0223 0.0312,0.0312 0.11343,0.0951 0.23673,0.16023 0.375,0.21875 0.0624,0.0271
0.12108,0.0439 0.1875,0.0625 0.0317,0.009 0.0612,0.0246 0.0937,0.0312 0.0106,0.002 0.0206,-0.002 0.0312,0
0.0886,0.0163 0.188,0.0312 0.28125,0.0312 0.38234,0 0.73499,-0.13923 1,-0.375 0.1325,0.11789 0.29967,0.21697
0.46875,0.28125 0.16908,0.0643 0.34008,0.0937 0.53125,0.0937 0.38234,0 0.73499,-0.13923 1,-0.375
0.1325,0.11789 0.29967,0.21697 0.46875,0.28125 0.16908,0.0643 0.34008,0.0937 0.53125,0.0937 0.38234,0
0.73499,-0.13923 1,-0.375 0.1325,0.11789 0.29967,0.21697 0.46875,0.28125 0.16908,0.0643 0.34008,0.0937
0.53125,0.0937 0.38234,0 0.73499,-0.13923 1,-0.375 0.1325,0.11789 0.29967,0.21697 0.46875,0.28125
0.16908,0.0643 0.34008,0.0937 0.53125,0.0937 0.1035,0 0.21488,-0.0113 0.3125,-0.0312 0.0345,-0.007
0.0601,-0.0218 0.0937,-0.0312 0.0539,-0.0148 0.10491,-0.04
2 0.15625,-0.0625 0.008,-0.003 0.0231,0.004 0.0312,0 0.13827,-0.0585 0.26157,-0.12362 0.375,-0.21875
0.0113,-0.009 0.0203,-0.0215 0.0312,-0.0312 0.26501,0.23577 0.61766,0.375 1,0.375 0.828,0 1.5,-0.67201
1.5,-1.5 0,-0.828 -0.672,-1.5 -1.5,-1.5 -0.38234,0 -0.73499,0.13923 -1,0.375 -0.011,-0.01 -0.02,-0.0218
-0.0312,-0.0312 -0.11343,-0.0951 -0.23673,-0.16023 -0.375,-0.21875 -0.0598,-0.0253 -0.12403,-0.045
-0.1875,-0.0625 -0.132,-0.037 -0.263,-0.063 -0.406,-0.063 -0.0956,0 -0.19028,0.0145 -0.28125,0.0312
-0.091,0.0167 -0.16546,0.0304 -0.25,0.0625 -0.16908,0.0643 -0.33625,0.16336 -0.46875,0.28125
-0.26501,-0.23577 -0.61766,-0.375 -1,-0.375 -0.0956,0 -0.19028,0.0145 -0.28125,0.0312 -0.091,0.0167
-0.16546,0.0304 -0.25,0.0625 -0.16908,0.0643 -0.33625,0.16336 -0.46875,0.28125 -0.26501,-0.23577
-0.61766,-0.375 -1,-0.375 -0.0956,0 -0.19028,0.0145 -0.28125,0.0312 -0.091,0.0167 -0.16546,0.0304
-0.25,0.0625 -0.16908,0.0643 -0.33625,0.16336 -0.46875,0.28125 -0.26501,-0.23577 -0.61766,-0.3
75 -1,-0.375 -0.0956,0 -0.19028,0.0145 -0.28125,0.0312 -0.091,0.0167 -0.16546,0.0304 -0.25,0.0625 C
8.79967,12.1572 8.6325,12.25626 8.5,12.37415 c -0.26501,-0.23577 -0.61766,-0.375 -1,-0.375 -0.138,0
-0.27931,0.0276 -0.40625,0.0625 -0.0664,0.0186 -0.12514,0.0354 -0.1875,0.0625 -0.13827,0.0585
-0.26157,0.12362 -0.375,0.21875 -0.0107,0.009 -0.0209,0.022 -0.0312,0.0312 -0.26501,-0.23577 -0.61766,-0.375
-1,-0.375 z"
+ style="opacity:0.1;enable-background:new"
+ id="path9666"
+ inkscape:connector-curvature="0" />
+ <g
+ transform="translate(-303,-158)"
+ style="enable-background:new"
+ id="g9344">
+ <rect
+ x="307.5"
+ y="167.5"
+ width="2"
+ height="4"
+ ry="1"
+ rx="1"
+ style="fill:url(#linearGradient6022);stroke:url(#linearGradient6024);stroke-linejoin:round"
+ id="rect9320" />
+ <rect
+ x="307.5"
+ y="167.69"
+ width="1.3437999"
+ height="1.3437999"
+ ry="1.3437999"
+ rx="1.5926"
+ style="fill:#ffffff"
+ id="rect9332" />
+ </g>
+ <use
+ x="0"
+ y="0"
+ width="400"
+ height="300"
+ transform="translate(2,0)"
+ xlink:href="#g9344"
+ style="enable-background:new"
+ id="use9348" />
+ <use
+ x="0"
+ y="0"
+ width="400"
+ height="300"
+ transform="translate(4,0)"
+ xlink:href="#g9344"
+ style="enable-background:new"
+ id="use9354" />
+ <use
+ x="0"
+ y="0"
+ width="400"
+ height="300"
+ transform="translate(6,0)"
+ xlink:href="#g9344"
+ style="enable-background:new"
+ id="use9356" />
+ <use
+ x="0"
+ y="0"
+ width="400"
+ height="300"
+ transform="translate(8,0)"
+ xlink:href="#g9344"
+ style="enable-background:new"
+ id="use9358" />
+ <use
+ x="0"
+ y="0"
+ width="400"
+ height="300"
+ transform="translate(10,0)"
+ xlink:href="#g9344"
+ style="enable-background:new"
+ id="use9360" />
+ <use
+ x="0"
+ y="0"
+ width="400"
+ height="300"
+ transform="translate(12,0)"
+ xlink:href="#g9344"
+ style="enable-background:new"
+ id="use3585" />
+ </g>
+ </g>
+ <text
+ xml:space="preserve"
+
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="110.37892"
+ y="1177.597"
+ id="text3938-3-00-9-34-7-1"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ x="110.37892"
+ y="1177.597"
+ style="font-size:2px"
+ id="tspan4626">report_view.png</tspan></text>
+ <text
+ xml:space="preserve"
+
style="font-size:31.37398529px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="94.174011"
+ y="1285.1781"
+ id="text3938-3-00-9-34-7-1-2-8"
+ sodipodi:linespacing="125%"
+ transform="scale(1.0993319,0.9096434)"><tspan
+ sodipodi:role="line"
+ x="94.174011"
+ y="1285.1781"
+ style="font-size:6.27479696px"
+ id="tspan4626-0-2">32x32 px</tspan></text>
+ <rect
+
style="fill:none;stroke:#2c2b32;stroke-width:0.39075357;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect4672"
+ width="41.493019"
+ height="57.184448"
+ x="99.074821"
+ y="1159.3739" />
</g>
</svg>
diff --git a/src/Makefile.am b/src/Makefile.am
index d0dcc6e..4e515a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -250,7 +250,7 @@ RESOURCES = \
../images/chronopic_128.png,chronopic_128.png \
../images/gpm-statistics.png,gpm-statistics.png \
../images/spreadsheet.png,spreadsheet.png \
- ../images/stock_task-assigned.png,stock_task-assigned.png \
+ ../images/report_view.png,report_view.png \
../images/preferences-system.png,preferences-system.png \
../images/stock_delete.png,stock_delete.png \
../images/chronojump_icon.png,chronojump_icon.png \
diff --git a/src/gui/report.cs b/src/gui/report.cs
index 3712c0d..2afb568 100644
--- a/src/gui/report.cs
+++ b/src/gui/report.cs
@@ -123,7 +123,7 @@ public class ReportWindow {
Pixbuf pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "gpm-statistics.png");
image_report_win_graph.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_task-assigned.png");
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "report_view.png");
image_report_win_report.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
image_report_delete.Pixbuf = pixbuf;
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index 7fc9f38..909a6e6 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2011 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2014 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -81,13 +81,13 @@ 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_report;
- [Widget] Gtk.Image image_stats_win_report1;
+ [Widget] Gtk.Image image_stats_win_report_open;
[Widget] Gtk.Image image_results;
+
+ [Widget] Gtk.Box hbox_graph_options;
[Widget] Gtk.Box hbox_combo_graph_type;
- [Widget] Gtk.Label label_graph_var_x;
- [Widget] Gtk.Label label_graph_var_y;
+ [Widget] Gtk.Box hbox_stats_variables;
[Widget] Gtk.Box hbox_combo_graph_var_x;
[Widget] Gtk.Box hbox_combo_graph_var_y;
[Widget] Gtk.Box hbox_combo_graph_palette;
@@ -95,7 +95,6 @@ public partial class ChronoJumpWindow {
[Widget] Gtk.ComboBox combo_graph_var_x;
[Widget] Gtk.ComboBox combo_graph_var_y;
[Widget] Gtk.ComboBox combo_graph_palette;
- [Widget] Gtk.Label label_transposed;
[Widget] Gtk.CheckButton checkbutton_transposed;
[Widget] Gtk.Label label_line;
[Widget] Gtk.SpinButton spin_line;
@@ -114,7 +113,7 @@ public partial class ChronoJumpWindow {
[Widget] Gtk.SpinButton spin_graph_margin_r; //right
[Widget] Gtk.SpinButton spin_graph_x_cex_axis; //font size of x axis
- [Widget] Gtk.HBox hbox_stats_x_axis;
+ [Widget] Gtk.Label label_stats_x_axis;
//bool statsAutomatic = true;
bool statsAutomatic = false;
@@ -293,9 +292,8 @@ public partial class ChronoJumpWindow {
image_stats_win_graph.Pixbuf = pixbuf;
image_stats_win_graph1.Pixbuf = pixbuf;
image_stats_win_graph2.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_task-assigned.png");
- image_stats_win_report.Pixbuf = pixbuf;
- image_stats_win_report1.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");
image_results.Pixbuf = pixbuf;
}
@@ -449,7 +447,6 @@ public partial class ChronoJumpWindow {
}
private void showTransposed(bool show) {
- label_transposed.Visible = show;
checkbutton_transposed.Visible = show;
checkbutton_transposed.Active = true;
}
@@ -460,14 +457,12 @@ public partial class ChronoJumpWindow {
}
private void showGraphXYStuff(bool show) {
- label_graph_var_x.Visible = show;
- label_graph_var_y.Visible = show;
- hbox_combo_graph_var_x.Visible = show;
- hbox_combo_graph_var_y.Visible = show;
+ hbox_stats_variables.Visible = show;
}
private void showXAxisOptions(bool show) {
- hbox_stats_x_axis.Visible = show;
+ label_stats_x_axis.Visible = show;
+ spin_graph_x_cex_axis.Visible = show;
}
private void on_combo_graph_type_changed(object o, EventArgs args) {
@@ -979,6 +974,10 @@ public partial class ChronoJumpWindow {
* --------------------------------------------------------
*/
+ private void on_button_stats_graph_options_clicked (object o, EventArgs args) {
+ hbox_graph_options.Visible = ! hbox_graph_options.Visible;
+ }
+
private void on_button_stats_clicked (object o, EventArgs args) {
fillTreeView_stats(false);
}