[chronojump] Better vox_persons bottom
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Better vox_persons bottom
- Date: Tue, 28 Nov 2017 13:18:46 +0000 (UTC)
commit 81aaf63342f2684176eb418cb0041c6ec827f967
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Nov 28 14:15:43 2017 +0100
Better vox_persons bottom
glade/app1.glade | 128 ++++++++++++++++++------
images/md/ic_weekend_blue_inactive_24dp_1x.png | Bin 0 -> 353 bytes
src/Makefile.am | 1 +
src/gui/chronojump.cs | 42 ++++++--
src/gui/encoder.cs | 7 ++
src/gui/networks.cs | 2 +-
6 files changed, 137 insertions(+), 43 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index f779d1b..b1f76d7 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1503,6 +1503,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2671,16 +2674,16 @@ EncoderInertialCapture</property>
<widget class="GtkVBox" id="vbox_persons_bottom">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox_persons_bottom">
+ <widget class="GtkHBox" id="hbox239">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox75">
+ <widget class="GtkVBox" id="vbox118">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkHBox" id="hbox91">
<property name="visible">True</property>
@@ -2762,10 +2765,55 @@ EncoderInertialCapture</property>
</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_rest_time">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkButton" id="button_rest_show">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Manage rest time</property>
+ <signal name="clicked"
handler="on_button_rest_show_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image_rest">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label_rest">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</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">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -2774,7 +2822,7 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox78">
+ <widget class="GtkVBox" id="vbox117">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2787,10 +2835,11 @@ EncoderInertialCapture</property>
<property name="tooltip"
translatable="yes">Select previous person
<Control>Up</property>
<property name="relief">half</property>
+ <property name="yalign">1</property>
<signal name="clicked"
handler="on_treeview_persons_up" swapped="no"/>
<accelerator key="Up" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkArrow" id="arrow_up">
+ <widget class="GtkArrow" id="arrow_up1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="arrow_type">up</property>
@@ -2816,7 +2865,7 @@ EncoderInertialCapture</property>
<signal name="clicked"
handler="on_treeview_persons_down" swapped="no"/>
<accelerator key="Down" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkArrow" id="arrow_down">
+ <widget class="GtkArrow" id="arrow_down1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="arrow_type">down</property>
@@ -2838,42 +2887,48 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_rest_time">
+ <widget class="GtkAspectFrame" id="aspectframe2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <property name="xalign">0</property>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_rest">
+ <widget class="GtkAlignment" id="alignment34">
+ <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">2</property>
+ <property name="right_padding">2</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_rest_time_set">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkCheckButton"
id="checkbutton_rest">
+ <property name="label"
translatable="yes">Highlight rest</property>
<property name="visible">True</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="relief">none</property>
<property name="active">True</property>
- <property name="draw_indicator">False</property>
+ <property name="draw_indicator">True</property>
<signal name="clicked"
handler="on_checkbutton_rest_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image_rest">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
</widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_rest_time_values">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_rest_time_values">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip"
translatable="yes">Highlight longer resting times than this value</property>
@@ -2908,7 +2963,7 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label201">
+ <widget class="GtkLabel" id="label253">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">m</property>
@@ -2956,7 +3011,7 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label253">
+ <widget class="GtkLabel" id="label260">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">s</property>
@@ -2974,12 +3029,16 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -22158,6 +22217,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/images/md/ic_weekend_blue_inactive_24dp_1x.png b/images/md/ic_weekend_blue_inactive_24dp_1x.png
new file mode 100644
index 0000000..bf76abe
Binary files /dev/null and b/images/md/ic_weekend_blue_inactive_24dp_1x.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index b1aacd9..bfd8fdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -407,6 +407,7 @@ RESOURCES = \
../images/md/ic_person_outline_blue_24dp_1x.png,image_person_outline.png \
../images/md/ic_people_outline_blue_24dp_1x.png,image_group_outline.png \
../images/md/ic_weekend_blue_24dp_1x.png,image_rest.png \
+ ../images/md/ic_weekend_blue_inactive_24dp_1x.png,image_rest_inactive.png \
../images/md/ic_looks_zero_blue_24dp_1x.png,zero.png \
../images/md/ic_looks_one_blue_24dp_1x.png,one.png \
../images/md/ic_add_circle_blue_24dp_1x.png,image_add_test.png \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 1d6b5fd..bb4e37b 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -212,8 +212,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_persons_up;
[Widget] Gtk.Button button_persons_down;
[Widget] Gtk.CheckButton checkbutton_rest;
+ [Widget] Gtk.Label label_rest;
[Widget] Gtk.HBox hbox_rest_time;
[Widget] Gtk.HBox hbox_rest_time_values;
+ [Widget] Gtk.VBox vbox_rest_time_set;
[Widget] Gtk.SpinButton spinbutton_rest_minutes;
[Widget] Gtk.SpinButton spinbutton_rest_seconds;
[Widget] Gtk.Button button_edit_current_person;
@@ -310,7 +312,7 @@ public partial class ChronoJumpWindow
//widgets for enable or disable
[Widget] Gtk.Frame frame_persons;
[Widget] Gtk.Frame frame_persons_top;
- [Widget] Gtk.HBox hbox_persons_bottom;
+ [Widget] Gtk.VBox vbox_persons_bottom;
[Widget] Gtk.Button button_recuperate_person;
[Widget] Gtk.Button button_recuperate_persons_from_session;
[Widget] Gtk.Button button_person_add_single;
@@ -673,6 +675,7 @@ public partial class ChronoJumpWindow
LogB.Information("Build version:" + buildVersion);
initializeRestTimeLabels();
+ label_rest.Text = get_configured_rest_time_as_string();
restTime = new RestTime();
updatingRestTimes = true;
GLib.Timeout.Add(1000, new GLib.TimeoutHandler(updateRestTimes)); //each s, better than 5s
for don't have problems sorting data on treeview
@@ -950,7 +953,7 @@ public partial class ChronoJumpWindow
*/
private void createTreeView_persons (Gtk.TreeView tv) {
- myTreeViewPersons = new TreeViewPersons(tv, get_rest_time_in_seconds());
+ myTreeViewPersons = new TreeViewPersons(tv, get_configured_rest_time_in_seconds());
tv.Selection.Changed += onTreeviewPersonsSelectionEntry;
}
@@ -1007,7 +1010,7 @@ public partial class ChronoJumpWindow
private void treeview_persons_storeReset()
{
myTreeViewPersons.RemoveColumns();
- myTreeViewPersons = new TreeViewPersons(treeview_persons, get_rest_time_in_seconds());
+ myTreeViewPersons = new TreeViewPersons(treeview_persons,
get_configured_rest_time_in_seconds());
}
//private void on_treeview_persons_cursor_changed (object o, EventArgs args) {
@@ -4176,27 +4179,48 @@ public partial class ChronoJumpWindow
return true;
}
+ private void on_button_rest_show_clicked(object o, EventArgs args)
+ {
+ vbox_rest_time_set.Visible = ! vbox_rest_time_set.Visible;
+ }
+
private void on_checkbutton_rest_clicked(object o, EventArgs args)
{
+ Pixbuf pixbuf;
if(checkbutton_rest.Active) {
hbox_rest_time_values.Sensitive = true;
- myTreeViewPersons.RestSecondsMark = get_rest_time_in_seconds();
+ myTreeViewPersons.RestSecondsMark = get_configured_rest_time_in_seconds();
+ label_rest.Text = get_configured_rest_time_as_string();
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_rest.png");
+ image_rest.Pixbuf = pixbuf;
} else {
hbox_rest_time_values.Sensitive = false;
myTreeViewPersons.RestSecondsMark = 0;
+ label_rest.Text = "";
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_rest_inactive.png");
+ image_rest.Pixbuf = pixbuf;
}
}
private void on_spinbutton_rest_time_value_changed(object o, EventArgs args)
{
- myTreeViewPersons.RestSecondsMark = get_rest_time_in_seconds();
+ myTreeViewPersons.RestSecondsMark = get_configured_rest_time_in_seconds();
+ if(checkbutton_rest.Active)
+ label_rest.Text = get_configured_rest_time_as_string();
}
- private int get_rest_time_in_seconds()
+ private int get_configured_rest_time_in_seconds()
{
return 60 * Convert.ToInt32(spinbutton_rest_minutes.Value) +
Convert.ToInt32(spinbutton_rest_seconds.Value);
}
+ private string get_configured_rest_time_as_string()
+ {
+ return Convert.ToInt32(spinbutton_rest_minutes.Value).ToString() + "m " +
Convert.ToInt32(spinbutton_rest_seconds.Value).ToString() + "s";
+ }
+
/* ---------------------------------------------------------
* ---------------- JUMPS RJ EXECUTION ------------------
@@ -7060,7 +7084,7 @@ LogB.Debug("X");
frame_persons_top.Sensitive = false;
//treeview_persons is shown (person can be changed)
hbox_rest_time.Sensitive = false;
- hbox_persons_bottom.Sensitive = false;
+ vbox_persons_bottom.Sensitive = false;
} else
frame_persons.Sensitive = false;
@@ -7113,8 +7137,8 @@ LogB.Debug("X");
frame_persons_top.Sensitive = true;
if(! hbox_rest_time.Sensitive)
hbox_rest_time.Sensitive = true;
- if(! hbox_persons_bottom.Sensitive)
- hbox_persons_bottom.Sensitive = true;
+ if(! vbox_persons_bottom.Sensitive)
+ vbox_persons_bottom.Sensitive = true;
button_execute_test.Sensitive = true;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 17fedbd..73a3cda 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -446,19 +446,26 @@ public partial class ChronoJumpWindow
playVideoEncoderInitialSetup();
+ LogB.Information("after play 0");
capturingCsharp = encoderCaptureProcess.STOPPED;
+ LogB.Information("after play 1");
button_encoder_inertial_recalibrate.Visible = false;
+ LogB.Information("after play 2");
encoderInertialCalibratedFirstTime = false; //allow show the recalibrate button
+ LogB.Information("after play 3");
//done here because in Glade we cannot use the TextBuffer.Changed
textview_encoder_signal_comment.Buffer.Changed += new
EventHandler(on_textview_encoder_signal_comment_key_press_event);
+ LogB.Information("after play 4");
//configInit();
//triggers
triggerList = new TriggerList();
+ LogB.Information("after play 5");
showTriggerTab(false);
+ LogB.Information("after play 6");
}
void on_button_encoder_select_clicked (object o, EventArgs args)
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index f5fe714..9001057 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -119,7 +119,7 @@ public partial class ChronoJumpWindow
//TODO: don't allow edit person on person treeview
//dont't show persons_bottom hbox where users can be edited, deleted if persons at
lateral is selected on preferences
- hbox_persons_bottom.Visible = false;
+ vbox_persons_bottom.Visible = false;
//don't allow to change encoderConfiguration
label_encoder_exercise_encoder.Visible = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
