commit 8064a6d9b711338c871dd6d1f33b597c8e67415c
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Aug 4 00:31:27 2021 +0200
Graph options at same line than Show graph
glade/app1.glade | 161 ++++++++++++++++++++++-----------------------
src/gui/app1/chronojump.cs | 6 +-
src/gui/eventExecute.cs | 4 +-
3 files changed, 85 insertions(+), 86 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 5bc8a2da2..208f00bad 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7703,7 +7703,7 @@ EncoderInertialCapture</property>
<widget class="GtkHBox" id="hbox553">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">40</property>
+ <property name="spacing">30</property>
<child>
<widget class="GtkHBox"
id="hbox_contacts_graph_test">
<property name="visible">True</property>
@@ -7860,50 +7860,15 @@ 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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHPaned" id="hpaned1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkVBox"
id="vbox_contacts_capture_graph">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkAlignment"
id="event_execute_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkVBox" id="vbox26">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkVBox" id="vbox30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox22">
- <property name="visible">True</property>
+ <widget class="GtkHBox"
id="hbox_contacts_simple_graph_controls">
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkLabel"
id="event_graph_label_graph_test">
+ <widget class="GtkLabel" id="label654">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Graph
options:</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -7912,11 +7877,6 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_contacts_simple_graph_controls">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
<widget class="GtkHBox"
id="hbox_contacts_graph_last_limit">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -7955,9 +7915,9 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -8015,7 +7975,7 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -8029,62 +7989,55 @@ EncoderInertialCapture</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_inspect_last_test_run_intervallic">
- <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">Inspect</property>
- <signal name="clicked"
handler="on_button_inspect_last_test_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="image_test_inspect1">
- <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="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="check_vbox_contacts_graph_legend">
+ <widget class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_vbox_contacts_graph_legend_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_info_sessions_info">
+ <widget class="GtkVBox"
id="vbox_contacts_capture_graph">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkAlignment"
id="event_execute_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkHBox" id="hbox15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="event_graph_label_graph_test">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-info</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -8342,6 +8295,50 @@ EncoderInertialCapture</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkCheckButton"
id="check_vbox_contacts_graph_legend">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_vbox_contacts_graph_legend_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_info_sessions_info">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_inspect_last_test_run_intervallic">
+ <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">Inspect</property>
+ <signal name="clicked"
handler="on_button_inspect_last_test_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage"
id="image_test_inspect1">
+ <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">5</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 0911d8743..58cc6f2ce 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3539,7 +3539,7 @@ public partial class ChronoJumpWindow
on_extra_window_jumps_test_changed(new object(), new EventArgs());
event_graph_label_graph_test.Visible = false;
- hbox_contacts_simple_graph_controls.Visible = true;
+ hbox_contacts_simple_graph_controls.Visible =
check_contacts_capture_graph.Active;
check_run_simple_show_time.Visible = false;
button_jumps_simple_capture_save_image.Visible = true;
@@ -3600,7 +3600,7 @@ public partial class ChronoJumpWindow
on_extra_window_runs_test_changed(new object(), new EventArgs());
event_graph_label_graph_test.Visible = false;
- hbox_contacts_simple_graph_controls.Visible = true;
+ hbox_contacts_simple_graph_controls.Visible =
check_contacts_capture_graph.Active;
check_run_simple_show_time.Visible = true;
button_runs_simple_capture_save_image.Visible = true;
@@ -3960,6 +3960,8 @@ public partial class ChronoJumpWindow
else
hbox_contacts_capture_show_need_one.Visible = true;
+ hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
+
/*
update the preferences variable
note as can be changed while capturing, it will be saved to SQL on exit
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index aa8901788..b72141795 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -322,7 +322,7 @@ public partial class ChronoJumpWindow
private void showJumpSimpleLabels()
{
event_graph_label_graph_test.Visible = false;
- hbox_contacts_simple_graph_controls.Visible = true;
+ hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
check_run_simple_show_time.Visible = false;
check_vbox_contacts_graph_legend.Visible = true;
@@ -361,7 +361,7 @@ public partial class ChronoJumpWindow
private void showRunSimpleLabels()
{
event_graph_label_graph_test.Visible = false;
- hbox_contacts_simple_graph_controls.Visible = true;
+ hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
check_run_simple_show_time.Visible = true;
check_vbox_contacts_graph_legend.Visible = true;