commit 42b3a6228fa00defa4822fba612515d8a1300f94
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Nov 15 16:38:25 2016 +0100
restTime works also in minutes:seconds
glade/app1.glade | 227 ++++++++++++++++++++++++++++++++++++-------------
src/gui/chronojump.cs | 28 ++++--
src/restTime.cs | 11 ++-
src/treeViewPerson.cs | 6 +-
4 files changed, 195 insertions(+), 77 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 68fd4b8..08828b6 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1564,12 +1564,12 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_carles">
- <property name="label">Button
-Carles</property>
+ <widget class="GtkButton" id="button_crash">
+ <property name="label">CRASH_ME
+(debug purposes)</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="on_button_carles_clicked" swapped="no"/>
+ <signal name="clicked" handler="on_debug_crash_activate" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -1578,12 +1578,12 @@ Carles</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_crash">
- <property name="label">CRASH_ME
-(debug purposes)</property>
+ <widget class="GtkButton" id="button_carles">
+ <property name="label">Button
+Carles</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="on_debug_crash_activate" swapped="no"/>
+ <signal name="clicked" handler="on_button_carles_clicked" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -2334,6 +2334,7 @@ Carles</property>
<widget class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkVBox" id="vbox53">
<property name="visible">True</property>
@@ -2342,13 +2343,9 @@ Carles</property>
<widget class="GtkHBox" id="hbox35">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">7</property>
- <child>
- <widget class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox36">
+ <widget class="GtkVBox" id="vbox80">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -2403,13 +2400,10 @@ Carles</property>
<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>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2417,29 +2411,79 @@ Carles</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox118">
+ <widget class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">2</property>
+ <property name="bottom_padding">2</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">4</property>
+ <child>
+ <widget class="GtkHBox" id="hbox_rest_time">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip"
translatable="yes">Highlight longer resting times than this value</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkHBox" id="hbox125">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip">Highlight longer
resting times than this value</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_rest">
- <property name="label"
translatable="yes">Rest</property>
+ <widget class="GtkSpinButton"
id="spinbutton_rest_minutes">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked"
handler="on_checkbutton_rest_clicked" swapped="no"/>
+ <property name="max_length">2</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</property>
+ <property
name="invisible_char_set">True</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 0 60 1 10
0</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <signal name="value_changed"
handler="on_spinbutton_rest_time_value_changed" swapped="no"/>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton"
id="spinbutton_rest">
+ <widget class="GtkLabel" id="label201">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">m</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox129">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkSpinButton"
id="spinbutton_rest_seconds">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">2</property>
@@ -2450,17 +2494,22 @@ Carles</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 60 1 10
0</property>
+ <property name="adjustment">0 0 60 1 10
0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- <signal name="value_changed"
handler="on_spinbutton_rest_value_changed" swapped="no"/>
+ <signal name="value_changed"
handler="on_spinbutton_rest_time_value_changed" swapped="no"/>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label253">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">s</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -2468,25 +2517,44 @@ Carles</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_current_person">
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="checkbutton_rest">
+ <property name="label"
translatable="yes">Rest</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- <property name="ellipsize">end</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip"
translatable="yes">Highlight longer resting times than this value</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="clicked"
handler="on_checkbutton_rest_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </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">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -2497,12 +2565,17 @@ Carles</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <widget class="GtkVBox" id="vbox79">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkButton"
id="button_edit_current_person">
+ <widget class="GtkHBox" id="hbox16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkButton"
id="button_edit_current_person">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2519,15 +2592,15 @@ Carles</property>
<property name="icon-size">2</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_show_all_person_events">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_show_all_person_events">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2542,15 +2615,15 @@ Carles</property>
<property name="icon-size">2</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_delete_current_person">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_delete_current_person">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -2565,11 +2638,32 @@ Carles</property>
<property name="icon-size">2</property>
</widget>
</child>
+ </widget>
+ <packing>
+ <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="position">2</property>
+ <property name="position">-1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_current_person">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="ellipsize">end</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -18420,6 +18514,21 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index b9588a2..339d661 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -188,7 +188,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_persons_up;
[Widget] Gtk.Button button_persons_down;
[Widget] Gtk.CheckButton checkbutton_rest;
- [Widget] Gtk.SpinButton spinbutton_rest;
+ [Widget] Gtk.HBox hbox_rest_time;
+ [Widget] Gtk.SpinButton spinbutton_rest_minutes;
+ [Widget] Gtk.SpinButton spinbutton_rest_seconds;
[Widget] Gtk.Button button_edit_current_person;
[Widget] Gtk.Button button_show_all_person_events;
[Widget] Gtk.Button button_delete_current_person;
@@ -1101,7 +1103,7 @@ public partial class ChronoJumpWindow
*/
private void createTreeView_persons (Gtk.TreeView tv) {
- myTreeViewPersons = new TreeViewPersons(tv, Convert.ToInt32(spinbutton_rest.Value));
+ myTreeViewPersons = new TreeViewPersons(tv, get_rest_time_in_seconds());
tv.Selection.Changed += onTreeviewPersonsSelectionEntry;
}
@@ -1153,9 +1155,10 @@ public partial class ChronoJumpWindow
label_encoder_person_name.UseMarkup = true;
}
- private void treeview_persons_storeReset() {
+ private void treeview_persons_storeReset()
+ {
myTreeViewPersons.RemoveColumns();
- myTreeViewPersons = new TreeViewPersons(treeview_persons,
Convert.ToInt32(spinbutton_rest.Value));
+ myTreeViewPersons = new TreeViewPersons(treeview_persons, get_rest_time_in_seconds());
}
//private void on_treeview_persons_cursor_changed (object o, EventArgs args) {
@@ -4095,17 +4098,22 @@ public partial class ChronoJumpWindow
private void on_checkbutton_rest_clicked(object o, EventArgs args)
{
if(checkbutton_rest.Active) {
- spinbutton_rest.Sensitive = true;
- myTreeViewPersons.RestMinutesMark = Convert.ToInt32(spinbutton_rest.Value);
+ hbox_rest_time.Sensitive = true;
+ myTreeViewPersons.RestSecondsMark = get_rest_time_in_seconds();
} else {
- spinbutton_rest.Sensitive = false;
- myTreeViewPersons.RestMinutesMark = 0;
+ hbox_rest_time.Sensitive = false;
+ myTreeViewPersons.RestSecondsMark = 0;
}
}
- private void on_spinbutton_rest_value_changed(object o, EventArgs args)
+ private void on_spinbutton_rest_time_value_changed(object o, EventArgs args)
+ {
+ myTreeViewPersons.RestSecondsMark = get_rest_time_in_seconds();
+ }
+
+ private int get_rest_time_in_seconds()
{
- myTreeViewPersons.RestMinutesMark = Convert.ToInt32(spinbutton_rest.Value);
+ return 60 * Convert.ToInt32(spinbutton_rest_minutes.Value) +
Convert.ToInt32(spinbutton_rest_seconds.Value);
}
diff --git a/src/restTime.cs b/src/restTime.cs
index 919f373..76dd07e 100644
--- a/src/restTime.cs
+++ b/src/restTime.cs
@@ -66,20 +66,21 @@ public class LastTestTime
}
}
- public static int GetMinutes(string restedTime)
+ public static int GetSeconds(string restedTime)
{
if(restedTime == null || restedTime == "")
return 0;
if(restedTime == maxTimeString)
- return 60;
+ return 3600;
- int minutes = 0;
+ int seconds = 0;
try {
- minutes = Convert.ToInt32(restedTime.Substring(0,2));
+ //comes 02'10" Substring(0,2) will read minutes Substring(3,2) will read
seconds
+ seconds = ( 60 * Convert.ToInt32(restedTime.Substring(0,2)) ) +
Convert.ToInt32(restedTime.Substring(3,2));
} catch {
return 0;
}
- return minutes;
+ return seconds;
}
public int PersonID
diff --git a/src/treeViewPerson.cs b/src/treeViewPerson.cs
index c86e44f..e777265 100644
--- a/src/treeViewPerson.cs
+++ b/src/treeViewPerson.cs
@@ -32,17 +32,17 @@ public class TreeViewPersons
//if 0 don't use it
//if > 0 then show in red when >= to this value
- public int RestMinutesMark;
+ public int RestSecondsMark;
public TreeViewPersons ()
{
}
- public TreeViewPersons (Gtk.TreeView treeview, int restMinutes)
+ public TreeViewPersons (Gtk.TreeView treeview, int restSeconds)
{
this.treeview = treeview;
- RestMinutesMark = restMinutes;
+ RestSecondsMark = restSeconds;
store = getStore(3);
string [] columnsString = { "ID", Catalog.GetString("person"), Catalog.GetString("Rest")};