[chronojump] hpaned for contacts to view graph and table at the same time
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] hpaned for contacts to view graph and table at the same time
- Date: Mon, 2 Aug 2021 11:49:53 +0000 (UTC)
commit 4762d250448b064cc0c346460b061d168215aa30
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Aug 2 13:49:18 2021 +0200
hpaned for contacts to view graph and table at the same time
glade/app1.glade | 33 ++++++---------------------------
src/gui/app1/chronojump.cs | 13 -------------
2 files changed, 6 insertions(+), 40 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8fb865476..c9eb9d488 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7681,11 +7681,9 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook"
id="notebook_capture_graph_table">
+ <widget class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tab_pos">bottom</property>
- <property name="show_border">False</property>
<child>
<widget class="GtkVBox"
id="vbox_execute_and_results">
<property name="visible">True</property>
@@ -7750,7 +7748,7 @@ EncoderInertialCapture</property>
<widget class="GtkSpinButton"
id="spin_contacts_graph_last_limit">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">•</property>
<property name="width_chars">2</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
@@ -7811,7 +7809,6 @@ EncoderInertialCapture</property>
<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">False</property>
<property
name="group">radio_contacts_graph_currentTest</property>
<signal name="toggled"
handler="on_radio_contacts_graph_test_toggled" swapped="no"/>
@@ -9738,16 +9735,9 @@ EncoderInertialCapture</property>
</packing>
</child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show
graph</property>
- </widget>
<packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
<child>
@@ -11852,19 +11842,8 @@ EncoderInertialCapture</property>
</child>
</widget>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show
table</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
+ <property name="resize">True</property>
+ <property name="shrink">False</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 7a1e855ff..ac50b4f16 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -64,7 +64,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_capture_analyze; //not encoder
[Widget] Gtk.Notebook notebook_contacts_execute_or; // execute (page 0), instructions (page 1),
forceSensorAdjust (page 2)
[Widget] Gtk.Notebook notebook_analyze; //not encoder
- [Widget] Gtk.Notebook notebook_capture_graph_table;
[Widget] Gtk.HBox hbox_message_permissions_at_boot;
[Widget] Gtk.Label label_message_permissions_at_boot;
[Widget] Gtk.HBox hbox_message_camera_at_boot;
@@ -3429,10 +3428,6 @@ public partial class ChronoJumpWindow
hbox_other.Visible = false;
sensitiveLastTestButtons(false);
- //all modes except force sensor show the tabs at bottom
- notebook_capture_graph_table.CurrentPage = 0; //"Show graph"
- notebook_capture_graph_table.ShowTabs = true;
-
//cancel force capture process if mode is changed
if(capturingForce == arduinoCaptureStatus.STARTING || capturingForce ==
arduinoCaptureStatus.CAPTURING)
{
@@ -3754,10 +3749,6 @@ public partial class ChronoJumpWindow
check_vbox_contacts_graph_legend.Visible = false;
vbox_contacts_graph_legend.Visible = false;
- //on force sensor only show table
- notebook_capture_graph_table.CurrentPage = 1; //"Show table"
- notebook_capture_graph_table.ShowTabs = false;
-
setLabelContactsExerciseSelected(m);
//better use the followin so we will have the Elastic/not elastic display on mode
change
on_combo_force_sensor_exercise_changed (new object(), new EventArgs ());
@@ -3800,10 +3791,6 @@ public partial class ChronoJumpWindow
check_vbox_contacts_graph_legend.Visible = false;
vbox_contacts_graph_legend.Visible = false;
- //on run encoder only show table
- notebook_capture_graph_table.CurrentPage = 1; //"Show table"
- notebook_capture_graph_table.ShowTabs = false;
-
combo_race_analyzer_device.Active = 0;
forceSensorImageTestChange();
setLabelContactsExerciseSelected(m);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]