commit 38292d1030bbd809f365a64ba767d32cf1f1edb3
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Aug 4 21:26:03 2021 +0200
More tweaks to contacts show graph/table buttons
glade/app1.glade | 185 +++++++++++++++++++++++++--------------------
src/gui/app1/chronojump.cs | 10 ++-
src/gui/eventExecute.cs | 5 +-
3 files changed, 114 insertions(+), 86 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index da0ed9de4..4f4c72e8a 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">30</property>
+ <property name="spacing">24</property>
<child>
<widget class="GtkHBox"
id="hbox_contacts_graph_test">
<property name="visible">True</property>
@@ -7763,42 +7763,20 @@ EncoderInertialCapture</property>
<widget class="GtkHBox" id="hbox554">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">24</property>
<child>
<widget class="GtkHBox" id="hbox555">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">24</property>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Show</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">12</property>
<child>
<widget class="GtkCheckButton"
id="check_contacts_capture_graph">
- <property name="label"
translatable="yes">Graph</property>
- <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_contacts_capture_show_modes_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton"
id="check_contacts_capture_table">
- <property name="label"
translatable="yes">Table</property>
+ <property name="label" translatable="yes">Show
graph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -7806,76 +7784,31 @@ EncoderInertialCapture</property>
<signal name="clicked"
handler="on_check_contacts_capture_show_modes_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</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_contacts_capture_show_need_one">
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkArrow" id="arrow46">
- <property name="visible">True</property>
+ <widget class="GtkHBox"
id="hbox_contacts_simple_graph_controls">
<property name="can_focus">False</property>
- <property name="arrow_type">left</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkLabel"
id="label_contacts_capture_show_need_one">
+ <widget class="GtkLabel" id="label119">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Please, select at least one of the options</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label">(</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>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <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="label654">
+ <widget class="GtkAlignment" id="alignment60">
<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>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="right_padding">12</property>
<child>
<widget class="GtkHBox"
id="hbox_contacts_graph_last_limit">
<property name="visible">True</property>
@@ -7914,6 +7847,8 @@ EncoderInertialCapture</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7979,24 +7914,114 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
+ <widget class="GtkAlignment"
id="alignment_check_run_simple_show_time">
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
<widget class="GtkCheckButton"
id="check_run_simple_show_time">
<property name="label" translatable="yes">Show
time</property>
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="on_check_run_simple_show_time_toggled" swapped="no"/>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label120">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">)</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">4</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="check_contacts_capture_table">
+ <property name="label" translatable="yes">Show
table</property>
+ <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_contacts_capture_show_modes_clicked" swapped="no"/>
+ </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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_contacts_capture_show_need_one">
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkArrow" id="arrow46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">left</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_contacts_capture_show_need_one">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Please, select at least one of the options</property>
+ </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>
+ <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>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index a9b9bfa21..a9136a4fd 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3530,7 +3530,7 @@ public partial class ChronoJumpWindow
event_graph_label_graph_test.Visible = false;
hbox_contacts_simple_graph_controls.Visible =
check_contacts_capture_graph.Active;
- check_run_simple_show_time.Visible = false;
+ alignment_check_run_simple_show_time.Visible = false;
button_jumps_simple_capture_save_image.Visible = true;
check_vbox_contacts_graph_legend.Visible = true;
@@ -3591,7 +3591,7 @@ public partial class ChronoJumpWindow
event_graph_label_graph_test.Visible = false;
hbox_contacts_simple_graph_controls.Visible =
check_contacts_capture_graph.Active;
- check_run_simple_show_time.Visible = true;
+ alignment_check_run_simple_show_time.Visible = true;
button_runs_simple_capture_save_image.Visible = true;
check_vbox_contacts_graph_legend.Visible = true;
@@ -3945,12 +3945,14 @@ public partial class ChronoJumpWindow
vbox_contacts_capture_graph.Visible = check_contacts_capture_graph.Active;
notebook_results.Visible = check_contacts_capture_table.Active;
- if ( check_contacts_capture_graph.Active || check_contacts_capture_table.Active)
+ if (check_contacts_capture_graph.Active || check_contacts_capture_table.Active)
hbox_contacts_capture_show_need_one.Visible = false;
else
hbox_contacts_capture_show_need_one.Visible = true;
- hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
+ if(current_mode == Constants.Modes.JUMPSSIMPLE || current_mode == Constants.Modes.RUNSSIMPLE)
+ hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
+
/*
update the preferences variable
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index eef3de8f7..14dd863ec 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -54,6 +54,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.RadioButton radio_contacts_graph_allPersons;
[Widget] Gtk.Image image_radio_contacts_graph_currentPerson;
[Widget] Gtk.Image image_radio_contacts_graph_allPersons;
+ [Widget] Gtk.Alignment alignment_check_run_simple_show_time;
[Widget] Gtk.CheckButton check_run_simple_show_time;
[Widget] Gtk.ProgressBar event_execute_progressbar_event;
@@ -323,7 +324,7 @@ public partial class ChronoJumpWindow
{
event_graph_label_graph_test.Visible = false;
hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
- check_run_simple_show_time.Visible = false;
+ alignment_check_run_simple_show_time.Visible = false;
check_vbox_contacts_graph_legend.Visible = true;
//vbox_contacts_graph_legend.Visible = false;
@@ -362,7 +363,7 @@ public partial class ChronoJumpWindow
{
event_graph_label_graph_test.Visible = false;
hbox_contacts_simple_graph_controls.Visible = check_contacts_capture_graph.Active;
- check_run_simple_show_time.Visible = true;
+ alignment_check_run_simple_show_time.Visible = true;
check_vbox_contacts_graph_legend.Visible = true;
//vbox_contacts_graph_legend.Visible = false;