commit 5a85a066a218f5d6a85bef647d92ab2c7332c661
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Feb 27 12:28:32 2016 +0100
tab on show graph / table on all tests (like on encoder analyze)
glade/chronojump.glade | 182 ++++++++++++++++++------------------------------
src/gui/chronojump.cs | 13 ----
2 files changed, 69 insertions(+), 126 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 8e07236..46ead56 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6610,113 +6610,6 @@ after time</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox88">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkRadioButton"
id="radio_capture_graph">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_radio_capture_graph_toggled" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox105">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_jumps_small1">
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_110">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show
graph</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</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="GtkRadioButton"
id="radio_capture_table">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="relief">none</property>
- <property name="draw_indicator">False</property>
- <property
name="group">radio_capture_graph</property>
- <signal name="toggled"
handler="on_radio_capture_table_toggled" swapped="no"/>
- <child>
- <widget class="GtkHBox" id="hbox184">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_mode_jumps_reactive_small1">
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </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_101">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Show
table</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</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">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -6739,7 +6632,7 @@ after time</property>
<widget class="GtkNotebook"
id="notebook_capture_graph_table">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="show_tabs">False</property>
+ <property name="tab_pos">bottom</property>
<property name="show_border">False</property>
<child>
<widget class="GtkVBox"
id="vbox_execute_and_results">
@@ -7973,6 +7866,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9480,6 +9376,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10628,6 +10527,9 @@ after time</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -10970,7 +10872,7 @@ after time</property>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Graph</property>
+ <property name="label">Show graph</property>
</widget>
<packing>
<property name="tab_fill">False</property>
@@ -12801,7 +12703,7 @@ after time</property>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Table</property>
+ <property name="label">Show table</property>
</widget>
<packing>
<property name="position">1</property>
@@ -18853,6 +18755,9 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23419,6 +23324,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24466,6 +24374,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -26005,6 +25916,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -26601,6 +26515,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -38827,6 +38744,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40978,6 +40913,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -42356,9 +42303,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -43405,6 +43349,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -47224,6 +47171,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -47935,6 +47885,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48661,6 +48614,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index e0da825..b124363 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -56,9 +56,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_sup_contacts;
[Widget] Gtk.Notebook notebook_capture_graph_table;
- [Widget] Gtk.RadioButton radio_capture_graph;
- [Widget] Gtk.RadioButton radio_capture_table;
-
[Widget] Gtk.Label label_version;
[Widget] Gtk.Image image_logo;
[Widget] Gtk.Image image_selector_start_jumps;
@@ -987,16 +984,6 @@ public partial class ChronoJumpWindow
}
- public void on_radio_capture_graph_toggled (object obj, EventArgs args) {
- if(radio_capture_graph.Active)
- notebook_capture_graph_table.CurrentPage = 0;
- }
- public void on_radio_capture_table_toggled (object obj, EventArgs args) {
- if(radio_capture_table.Active)
- notebook_capture_graph_table.CurrentPage = 1;
- }
-
-
/* ---------------------------------------------------------
* ---------------- TREEVIEW (generic) --------------------
* --------------------------------------------------------