commit 25828bc385480d19c1acfe30dedb6934b21205e4
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jan 8 15:43:44 2019 +0100
jumps profile help and recomendations on a notebook
glade/app1.glade | 274 +++++++++++++++++++++++++-------------------------
src/gui/chronojump.cs | 12 ---
2 files changed, 138 insertions(+), 148 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8ecefabc..59d4ac2c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1808,6 +1808,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>
@@ -13269,6 +13272,7 @@ EncoderInertialCapture</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
+ <property name="show_border">False</property>
<child>
<widget class="GtkNotebook" id="notebook_stats_sup">
<property name="visible">True</property>
@@ -14884,13 +14888,22 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkAlignment" id="alignment26">
+ <widget class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">12</property>
- <property name="left_padding">50</property>
+ <property name="can_focus">True</property>
+ <property name="tab_pos">bottom</property>
<child>
- <widget class="GtkHBox"
id="hbox_jumps_profile_jumps_done">
+ <widget class="GtkVBox" id="vbox50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">12</property>
+ <property name="left_padding">50</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_jumps_profile_jumps_done">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
@@ -15141,34 +15154,34 @@ on current Chronojump version.</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="GtkHBox" id="hbox191">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkDrawingArea"
id="drawingarea_jumps_profile">
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox191">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkDrawingArea"
id="drawingarea_jumps_profile">
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="expose_event"
handler="on_drawingarea_jumps_profile_expose_event" swapped="no"/>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox115">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox115">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -15217,67 +15230,41 @@ on current Chronojump version.</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
+ </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>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton"
id="button_jumps_profile_help">
- <property name="label" translatable="yes">Help
on indexes</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_jumps_profile_help_clicked" swapped="no"/>
- </widget>
- <packing>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
<child>
- <widget class="GtkButton"
id="button_jumps_profile_training">
- <property name="label"
translatable="yes">General recommendations on improving indexes</property>
+ <widget class="GtkLabel" id="label53">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_jumps_profile_training_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show
graph</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_help">
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkViewport" id="viewport2">
+ <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_help">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">never</property>
+ <child>
+ <widget class="GtkViewport" id="viewport2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
@@ -15287,6 +15274,11 @@ on current Chronojump version.</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">20</property>
+ <child>
<widget class="GtkTable"
id="table_jumps_profile_help">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -15450,9 +15442,11 @@ on current Chronojump version.</property>
</packing>
</child>
</widget>
+ </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>
@@ -15470,8 +15464,8 @@ on current Chronojump version.</property>
<property name="justify">center</property>
</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>
@@ -15483,47 +15477,63 @@ on current Chronojump version.</property>
<property name="label" translatable="yes">Drop
jump goal in this profile is maximum height.</property>
</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">1</property>
</packing>
</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">1</property>
</packing>
</child>
</widget>
</child>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_training">
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkViewport" id="viewport1">
+ <widget class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Help
on indexes</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow_jumps_profile_training">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">never</property>
+ <child>
+ <widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
+ <widget class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">20</property>
+ <child>
<widget class="GtkTable"
id="table_jumps_profile_training">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">6</property>
<property name="n_columns">8</property>
- <property name="column_spacing">8</property>
- <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">12</property>
<child>
<widget class="GtkLabel" id="label170">
<property name="visible">True</property>
@@ -16308,13 +16318,32 @@ Concentric</property>
</child>
</widget>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label55">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">General recommendations on improving indexes</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -19192,42 +19221,6 @@ Concentric</property>
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel"
id="label_force_sensor_ai_rfd_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19533,6 +19526,9 @@ Concentric</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkCheckButton"
id="checkbutton_force_sensor_ai_b">
<property name="width_request">30</property>
<property name="visible">True</property>
@@ -19636,6 +19632,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27908,6 +27907,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index f6478e7c..a6b3d2b4 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -237,8 +237,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_jumps_rj_result_help_stiffness;
[Widget] Gtk.DrawingArea drawingarea_jumps_profile;
- [Widget] Gtk.ScrolledWindow scrolledwindow_jumps_profile_help;
- [Widget] Gtk.ScrolledWindow scrolledwindow_jumps_profile_training;
[Widget] Gtk.Image image_tab_jumps_profile;
[Widget] Gtk.Image image_jumps_profile_save;
@@ -7486,16 +7484,6 @@ LogB.Debug("mc finished 5");
notebook_analyze.CurrentPage = 2;
}
- private void on_button_jumps_profile_help_clicked (object o, EventArgs args) {
- scrolledwindow_jumps_profile_training.Visible = false;
- scrolledwindow_jumps_profile_help.Visible = ! scrolledwindow_jumps_profile_help.Visible;
- }
-
- private void on_button_jumps_profile_training_clicked (object o, EventArgs args) {
- scrolledwindow_jumps_profile_help.Visible = false;
- scrolledwindow_jumps_profile_training.Visible = !
scrolledwindow_jumps_profile_training.Visible;
- }
-
/* ---------------------------------------------------------
* ---------------- SENSITIVE GUI METHODS-------------------
* --------------------------------------------------------