commit 2eefb4b2c19b4716ece2183ee5f78fb30c7cccd6
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Feb 1 18:20:30 2018 +0100
Better integration of rest time on main GUI
glade/app1.glade | 131 +++++++++++++++++++++----------------------------
src/gui/chronojump.cs | 1 +
2 files changed, 57 insertions(+), 75 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 85bf04e..f92ff5f 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -2749,75 +2749,19 @@ 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="hbox239">
+ <widget class="GtkHBox" id="hbox245">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">3</property>
<child>
- <widget class="GtkVBox" id="vbox118">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkImage"
id="image_current_person">
+ <widget class="GtkImage" id="image_current_person">
<property name="width_request">150</property>
<property name="height_request">150</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="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>
@@ -2944,24 +2888,58 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkAspectFrame" id="aspectframe2">
+ <widget class="GtkHBox" id="hbox_rest_time">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <property name="xalign">0</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkAlignment" id="alignment34">
+ <widget class="GtkVBox" id="vbox61">
<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">
+ <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="spacing">6</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>
+ </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>
+ <child>
+ <widget class="GtkVBox" id="vbox_rest_time_set">
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkCheckButton"
id="checkbutton_rest">
<property name="visible">True</property>
@@ -2983,8 +2961,8 @@ EncoderInertialCapture</property>
</child>
</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>
@@ -3097,9 +3075,12 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
<packing>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index d9796db..2d9531f 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -4251,6 +4251,7 @@ public partial class ChronoJumpWindow
private void on_button_rest_show_clicked(object o, EventArgs args)
{
+ label_rest.Visible = vbox_rest_time_set.Visible;
vbox_rest_time_set.Visible = ! vbox_rest_time_set.Visible;
}