[chronojump] gui: load and import moved to app1
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] gui: load and import moved to app1
- Date: Wed, 1 Apr 2020 07:42:07 +0000 (UTC)
commit deb7a9e889b6886a2ec8ce05b7f505f18a112fc4
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Apr 1 09:41:35 2020 +0200
gui: load and import moved to app1
glade/app1.glade | 1754 +++++++++++++++++++++++++++++++------
po/POTFILES.in | 1 -
src/Makefile.am | 1 -
src/gui/app1/chronojump.cs | 95 +-
src/gui/app1/chronojumpPersons.cs | 7 -
src/gui/app1/encoder.cs | 6 +-
src/gui/app1/icons.cs | 7 +-
src/gui/app1/menu.cs | 80 +-
src/gui/app1/menu_tiny.cs | 18 +-
src/gui/chronojumpImporter.cs | 48 +-
src/gui/guiTests.cs | 4 +-
src/gui/networks.cs | 4 +-
src/gui/sendLog.cs | 2 +-
src/gui/session/load.cs | 542 ++++++------
src/gui/webcam.cs | 11 +-
15 files changed, 1859 insertions(+), 721 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index c9587a8d..756739a0 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -128,7 +128,6 @@
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<property name="always_show_image">True</property>
- <signal name="activate" handler="on_export_session_activate" swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image_export_csv">
<property name="visible">True</property>
@@ -144,7 +143,6 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">Export session to _XML</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_export_session_activate" swapped="no"/>
</widget>
</child>
<child>
@@ -764,7 +762,7 @@
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkVBox" id="vbox65">
+ <widget class="GtkVBox" id="vbox_menu_session1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -915,66 +913,34 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_menu_session_edit1">
+ <widget class="GtkButton" id="button_menu_session_more1">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
session</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_edit_session_activate" swapped="no"/>
+ <signal name="clicked"
handler="on_button_menu_session_more_clicked" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_edit1">
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_more1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage" id="image_session_edit1">
+ <widget class="GtkImage" id="image_session_more1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_overview1">
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Overview of
this session</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_menu_session_overview_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_overview1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_session_overview1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1437,7 +1403,7 @@
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkVBox" id="vbox180">
+ <widget class="GtkVBox" id="vbox_menu_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1647,18 +1613,16 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_session_edit">
+ <widget class="GtkButton"
id="button_menu_session_more">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
session</property>
<property name="relief">half</property>
- <signal name="clicked"
handler="on_edit_session_activate" swapped="no"/>
+ <signal name="clicked"
handler="on_button_menu_session_more_clicked" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_edit">
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_more">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1667,10 +1631,10 @@
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_session_edit2">
+ <widget class="GtkImage" id="image_session_more">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -1679,10 +1643,10 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_session_edit">
+ <widget class="GtkLabel" id="label_session_more">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Edit</property>
+ <property name="label"
translatable="yes">More</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1701,114 +1665,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_overview">
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Overview of this session</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_menu_session_overview_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_overview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox363">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_session_overview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</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_session_overview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Overview</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_advanced">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Import / Export</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_menu_session_advanced_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_session_overview2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox368">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_session_overview2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</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_session_overview1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Advanced</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1938,123 +1794,6 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_menu_encoder">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkCheckButton"
id="check_menu_encoder">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Encoder</property>
- <property name="draw_indicator">False</property>
- <child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_encoder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox93">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Encoder</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox159">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkArrow"
id="arrow_menu_show_encoder_up">
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkArrow"
id="arrow_menu_show_encoder_down">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">down</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">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment"
id="alignment_menu_encoder_options">
- <property name="can_focus">False</property>
- <property name="top_padding">5</property>
- <property name="left_padding">16</property>
- <child>
- <widget class="GtkVBox" id="vbox56">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkButton"
id="button_menu_encoder_export_set">
- <property name="label" translatable="yes">Export
current set</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Export set to CSV (Spreadsheet)</property>
- <signal name="clicked"
handler="on_button_encoder_export_all_curves_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</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="position">3</property>
- </packing>
- </child>
- <child>
<widget class="GtkVBox" id="vbox187">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2315,7 +2054,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -2366,7 +2105,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -2904,7 +2643,7 @@
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">0 0 299 1 10
0</property>
+ <property name="adjustment">7 0 299 1 10
0</property>
<property name="numeric">True</property>
</widget>
<packing>
@@ -25008,6 +24747,18 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -34897,6 +34648,18 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -35374,6 +35137,1437 @@ then click this button.</property>
<property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="GtkAlignment" id="alignment_session">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">4</property>
+ <child>
+ <widget class="GtkNotebook" id="app1s_notebook">
+ <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="GtkVBox" id="vbox84">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox374">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox174">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
+ <widget class="GtkFrame" id="frame11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkVBox" id="vbox191">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">25</property>
+ <property name="spacing">100</property>
+ <child>
+ <widget class="GtkVBox" id="vbox192">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">150</property>
+ <child>
+ <widget class="GtkButton"
id="button_session_overview">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Overview of this session</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_menu_session_overview_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_overview3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox396">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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_session_overview2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Overview</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </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="GtkButton"
id="button_session_edit">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Edit
session</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_edit_session_activate" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_edit2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox395">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_edit2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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_session_edit1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Edit</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </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">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox390">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox"
id="vbox_session_overview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label459">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Available on modes:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox403">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label463">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">-</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="label460">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">encoder</property>
+ </widget>
+ <packing>
+ <property name="expand">False</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>
+ <child>
+ <widget class="GtkHBox" id="hbox405">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label464">
+ <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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label461">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">force
sensor</property>
+ </widget>
+ <packing>
+ <property name="expand">False</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">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox406">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">-</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="label462">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">race
analyzer</property>
+ </widget>
+ <packing>
+ <property name="expand">False</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">3</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox196">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">150</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_import">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Import / Export</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_import_chronojump_session" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox397">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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_session_overview3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Import</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </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="GtkButton"
id="button_session_export">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip"
translatable="yes">Import / Export</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_export_session_accepted" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox399">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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_session_overview4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Export</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </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">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label465">
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Jumps
and races with photocells</property>
+ </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">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_session_more">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label458">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Session</property>
+ <property name="use_markup">True</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="label466">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">/</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label467">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">More</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="type">label_item</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="GtkHButtonBox" id="hbuttonbox13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_close0">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property
name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_close0_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label457">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">mode</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="session_import_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox175">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
+ <widget class="GtkLabel" id="label24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Where do
you want to import?</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">10</property>
+ <property name="left_padding">20</property>
+ <child>
+ <widget class="GtkVBox" id="vbox176">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkRadioButton"
id="app1s_radio_import_new_session">
+ <property name="label" translatable="yes">Import
into a new session</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">True</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="app1s_radio_import_current_session">
+ <property name="label" translatable="yes">Import
into the current session</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">app1s_radio_import_new_session</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">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</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="GtkVBox" id="vbox177">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_cancel1">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property
name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_cancel1_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</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="GtkVBox" id="vbox178">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_select_file_import_same_database">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Import from already opened database</property>
+ <signal name="clicked"
handler="app1s_on_button_select_file_import_same_database_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Use
same database</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_select_file_import">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="app1s_on_button_select_file_import_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox384">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_open_database">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="app1s_label_open_database_file">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Open
database file</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</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="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label442">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">main options</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox179">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="app1s_label_select">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="app1s_file_path_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox386">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkVBox" id="vbox182">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_jump_run">
+ <property name="label" translatable="yes">Show
data of jump and race tests</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="app1s_on_checkbutton_show_data_jump_run_toggled" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_other_tests">
+ <property name="label" translatable="yes">Show
data of other tests</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="app1s_on_checkbutton_show_data_other_tests_toggled" swapped="no"/>
+ </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>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox183">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label443">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Search
filter</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry"
id="app1s_entry_search_filter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">●</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <signal name="changed"
handler="app1s_on_entry_search_filter_changed" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow12">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkTreeView"
id="app1s_treeview_session_load">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="enable_search">False</property>
+ <signal name="row_activated"
handler="app1s_on_row_double_clicked" swapped="no"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox"
id="app1s_hbuttonbox_page2_load">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="app1s_button_cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_cancel2_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="app1s_button_accept">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_accept_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">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox"
id="app1s_hbuttonbox_page2_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton" id="app1s_button_back">
+ <property name="label">gtk-go-back</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_back_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="app1s_button_import">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked"
handler="app1s_on_button_import_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox387">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="app1s_image_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label445">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Import</property>
+ </widget>
+ <packing>
+ <property name="expand">True</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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label449">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">select session</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox184">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox185">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">30</property>
+ <child>
+ <widget class="GtkLabel" id="label450">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">The
current session will be modified.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkTable" id="table13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <property name="row_spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label451">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">The
data from session:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label452">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">From
file:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="app1s_label_import_file">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="app1s_label_import_session_name">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label453">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Will be
imported into the current session.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">12</property>
+ <property name="position">2</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="GtkHButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_import_confirm_back">
+ <property name="label">gtk-go-back</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_import_confirm_back_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_import_confirm_accept">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_import_confirm_accept_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">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label454">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">import confirm</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox186">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkProgressBar"
id="app1s_progressbarImport">
+ <property name="height_request">30</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">10</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox190">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="app1s_label_import_done_at_new_session">
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Imported
to a new session. You can load it now in Session - Load.</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="app1s_label_import_done_at_current_session">
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Data
merged into the open session.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow"
id="app1s_scrolledwindow_import_error">
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkTextView"
id="app1s_textview_import_error">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</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="app1s_hbuttonbox_page4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_import_close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="app1s_on_button_import_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="app1s_button_import_again">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="app1s_on_button_import_again_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox389">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="app1s_image_import1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label455">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Import
another session</property>
+ </widget>
+ <packing>
+ <property name="expand">True</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">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">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label456">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">import do and end</property>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Session</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="resize">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 38fd48ad..43c25086 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,7 +36,6 @@ glade/repetitive_conditions.glade
glade/report_window.glade
glade/run_type_add.glade
glade/session_add_edit.glade
-glade/session_load.glade
glade/session_upload.glade
glade/splash_window.glade
glade/stats_select_sessions.glade
diff --git a/src/Makefile.am b/src/Makefile.am
index df992cc2..f019af17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -297,7 +297,6 @@ RESOURCES = \
../glade/report_window.glade \
../glade/run_type_add.glade \
../glade/session_add_edit.glade \
- ../glade/session_load.glade \
../glade/session_upload.glade \
../glade/splash_window.glade \
../glade/stats_select_sessions.glade \
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 039ca21a..fd518a70 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -85,6 +85,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_message_permissions_at_boot;
[Widget] Gtk.Label label_message_permissions_at_boot;
[Widget] Gtk.HBox hbox_message_camera_at_boot;
+ [Widget] Gtk.Notebook notebook_import;
[Widget] Gtk.EventBox eventbox_radio_mode_contacts_capture;
[Widget] Gtk.EventBox eventbox_radio_mode_contacts_analyze;
@@ -442,7 +443,6 @@ public partial class ChronoJumpWindow
ChronopicRegisterWindow chronopicRegisterWin;
PreferencesWindow preferencesWin;
SessionAddEditWindow sessionAddEditWin;
- SessionLoadWindow sessionLoadWin;
PersonRecuperateWindow personRecuperateWin;
PersonsRecuperateFromOtherSessionWindow personsRecuperateFromOtherSessionWin;
PersonAddModifyWindow personAddModifyWin;
@@ -484,6 +484,7 @@ public partial class ChronoJumpWindow
private string progVersion;
private string progName;
+ private enum notebook_sup_pages { START, CONTACTS, ENCODER, SESSION }
private enum notebook_analyze_pages { STATISTICS, JUMPSPROFILE, JUMPSDJOPTIMALFALL,
JUMPSWEIGHTFVPROFILE, JUMPSEVOLUTION, SPRINT, FORCESENSOR, RACEENCODER }
private string runningFileName; //useful for knowing if there are two chronojump instances
@@ -568,7 +569,7 @@ public partial class ChronoJumpWindow
//show send log if needed or other messages
if(! showSendLog)
- notebook_sup.CurrentPage = 0; //start with the Mode selector
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
else {
show_send_log(sendLogMessage, preferences.crashLogLanguage);
notebook_start.CurrentPage = 1; //send log
@@ -723,8 +724,7 @@ public partial class ChronoJumpWindow
app1Shown = true;
//done after app1.Show in order to be able to gather the colors
- if(configChronojump.PersonWinHide)
- doPersonLabelsContrast();
+ doLabelsContrast(configChronojump.PersonWinHide);
if(splashWin != null) {
LogB.Information("Destroying splashWin");
@@ -741,12 +741,25 @@ public partial class ChronoJumpWindow
chronopicRegisterWin.Show();
}
- if(! showSendLog && notebook_sup.CurrentPage == 0) //main
+ if(! showSendLog && notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.START))
chronojumpLogo = new ChronojumpLogo (drawingarea_chronojump_logo,
viewport_chronojump_logo);
LogB.Information("Chronojump window started");
}
+ //used on this free labels that have to contrast with background
+ private void doLabelsContrast(bool personsAtTop)
+ {
+ if(personsAtTop)
+ {
+ UtilGtk.HBoxDoContrastLabels (viewport_hpaned_contacts_main, hbox_top_person);
+ UtilGtk.HBoxDoContrastLabels (viewport_hpaned_contacts_main, hbox_top_person_encoder);
+ }
+
+ UtilGtk.HBoxDoContrastLabels (viewport_hpaned_contacts_main, hbox_session_more);
+ UtilGtk.VBoxDoContrastLabels (viewport_hpaned_contacts_main, vbox_session_overview);
+ }
+
private void testNewStuff()
{
//uncomment it to tests the method for add suffixes _copy2, _copy3 to encoderConfiguration
@@ -2469,16 +2482,14 @@ public partial class ChronoJumpWindow
private void on_open_activate (object o, EventArgs args)
{
LogB.Information("open session");
- sessionLoadWin = SessionLoadWindow.Show(app1, SessionLoadWindow.WindowType.LOAD_SESSION);
- sessionLoadWin.Button_accept.Clicked += new EventHandler(on_load_session_accepted_from_open);
- }
+ //store which page we are on notebook_sup, except if we clicked on "more" from the session tab
+ if(notebook_sup.CurrentPage != Convert.ToInt32(notebook_sup_pages.SESSION))
+ app1s_notebook_sup_entered_from = notebook_sup.CurrentPage;
- //from open session
- private void on_load_session_accepted_from_open (object o, EventArgs args)
- {
- currentSession = sessionLoadWin.CurrentSession;
- on_load_session_accepted();
+ sessionLoadWindowShow(app1s_windowType.LOAD_SESSION);
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.SESSION);
}
+
//called from open session OR from gui/networks configInit when config.SessionMode ==
Config.SessionModeEnum.UNIQUE
private void on_load_session_accepted ()
{
@@ -2595,16 +2606,6 @@ public partial class ChronoJumpWindow
RunEncoderOverviewWindow.Show (app1, currentSession.UniqueID);
}
- private void on_export_session_activate(object o, EventArgs args) {
- ConfirmWindow confirmWin = ConfirmWindow.Show(
- Catalog.GetString("Export will include this data:") +
- "\n\n" + Catalog.GetString("Persons") +
- "\n" + Catalog.GetString("Jumps") +
- "\n" + Catalog.GetString("Races") + "\n"
- , "", "");
- confirmWin.Button_accept.Clicked += new EventHandler(on_export_session_accepted);
- }
-
private void on_export_session_accepted(object o, EventArgs args) {
new ExportSessionCSV(currentSession, app1, preferences);
}
@@ -3032,7 +3033,7 @@ public partial class ChronoJumpWindow
private void on_preferences_activate (object o, EventArgs args)
{
- if(notebook_sup.CurrentPage == 0)
+ if(notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.START))
preferencesWin = PreferencesWindow.Show(preferences,
Constants.Menuitem_modes.UNDEFINED, configChronojump.Compujump, progVersion);
else
preferencesWin = PreferencesWindow.Show(preferences, current_menuitem_mode,
configChronojump.Compujump, progVersion);
@@ -3073,7 +3074,7 @@ public partial class ChronoJumpWindow
configInitFromPreferences();
- if( ! configChronojump.PersonWinHide) {
+ if( ! configChronojump.PersonWinHide && currentSession != null) {
alignment_menu_and_persons.Visible = true;
//on_radio_show_persons_clicked (new object (), new EventArgs ());
radio_show_persons.Active = true;
@@ -3141,8 +3142,7 @@ public partial class ChronoJumpWindow
//repaint labels that are on the background
//TODO: only if color changed or personWinHide
- if(configChronojump.PersonWinHide)
- doPersonLabelsContrast();
+ doLabelsContrast(configChronojump.PersonWinHide);
// update force_capture_drawingarea
if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR &&
radiobutton_force_sensor_analyze_manual.Active)
@@ -3162,12 +3162,11 @@ public partial class ChronoJumpWindow
private void show_start_page()
{
notebook_start_selector.CurrentPage = 0;
- notebook_sup.CurrentPage = 0;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
//changes in menus
//vbox_menu_encoder.Visible = false;
- button_menu_session_overview.Visible = false;
- button_menu_session_overview1.Visible = false;
+ button_session_overview.Sensitive = false;
//show title
string tempSessionName = "";
@@ -3249,8 +3248,7 @@ public partial class ChronoJumpWindow
vbox_contacts_load_recalculate.Visible = false;
vbox_contacts_signal_comment.Visible = false;
frame_jumps_automatic.Visible = false;
- button_menu_session_overview.Visible = false;
- button_menu_session_overview1.Visible = false;
+ button_session_overview.Sensitive = false;
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
if(
@@ -3272,7 +3270,7 @@ public partial class ChronoJumpWindow
if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
{
- notebook_sup.CurrentPage = 1;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
//notebook_capture_analyze.ShowTabs = true;
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
button_threshold.Visible = true;
@@ -3300,7 +3298,7 @@ public partial class ChronoJumpWindow
}
else if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
{
- notebook_sup.CurrentPage = 1;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
//notebook_capture_analyze.ShowTabs = true;
hbox_contacts_sup_capture_analyze_two_buttons.Visible = true;
button_threshold.Visible = true;
@@ -3339,7 +3337,7 @@ public partial class ChronoJumpWindow
//vbox_menu_encoder.Visible = true;
menuitem_export_csv.Visible = false;
- notebook_sup.CurrentPage = 2;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.ENCODER);
/*
@@ -3352,8 +3350,7 @@ public partial class ChronoJumpWindow
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
blankEncoderInterface();
- button_menu_session_overview.Visible = true;
- button_menu_session_overview1.Visible = true;
+ button_session_overview.Sensitive = true;
bool changed = false;
if(m == Constants.Menuitem_modes.POWERGRAVITATORY)
@@ -3439,7 +3436,7 @@ public partial class ChronoJumpWindow
}
else if(m == Constants.Menuitem_modes.FORCESENSOR)
{
- notebook_sup.CurrentPage = 1;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
notebooks_change(m);
vbox_contacts_load_recalculate.Visible = true;
@@ -3459,12 +3456,11 @@ public partial class ChronoJumpWindow
notebook_capture_graph_table.ShowTabs = false;
setLabelContactsExerciseSelected(m);
- button_menu_session_overview.Visible = true;
- button_menu_session_overview1.Visible = true;
+ button_session_overview.Sensitive = true;
}
else if(m == Constants.Menuitem_modes.RUNSENCODER)
{
- notebook_sup.CurrentPage = 1;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
notebooks_change(m);
vbox_contacts_load_recalculate.Visible = true;
@@ -3487,12 +3483,11 @@ public partial class ChronoJumpWindow
forceSensorImageTestChange();
setLabelContactsExerciseSelected(m);
- button_menu_session_overview.Visible = true;
- button_menu_session_overview1.Visible = true;
+ button_session_overview.Sensitive = true;
}
else if(m == Constants.Menuitem_modes.RT)
{
- notebook_sup.CurrentPage = 1;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
notebooks_change(m);
on_extra_window_reaction_times_test_changed(new object(), new EventArgs());
@@ -3503,7 +3498,7 @@ public partial class ChronoJumpWindow
//notebook_capture_analyze.GetNthPage(2).Hide(); //hide jumpsProfile on other tests
}
else { //m == Constants.Menuitem_modes.OTHER (contacts / other)
- notebook_sup.CurrentPage = 1;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
hbox_other.Visible = true;
notebooks_change(m);
if(radio_mode_pulses_small.Active)
@@ -7357,15 +7352,11 @@ LogB.Debug("mc finished 5");
private void menuSessionSensitive(bool option)
{
- //menuitem_edit_session.Sensitive = option;
- //menuitem_delete_session.Sensitive = option;
- button_menu_session_edit.Sensitive = option; //menu
- button_menu_session_edit1.Sensitive = option; //menu_tiny
- button_menu_session_overview.Sensitive = option; //menu
- button_menu_session_overview1.Sensitive = option; //menu_tiny
+ button_session_edit.Sensitive = option;
+ button_session_overview.Sensitive = option;
menuitem_export_csv.Sensitive = option;
- //menuitem_export_xml.Sensitive = option; not implemented yet
+ button_session_export.Sensitive = option;
menuitem_encoder_session_overview.Sensitive = option;
menuitem_forceSensor_session_overview.Sensitive = option;
menuitem_runEncoder_session_overview.Sensitive = option;
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index b133b68a..012383d3 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -73,11 +73,4 @@ public partial class ChronoJumpWindow
}
}
- //used on this free labels that have zto contrast with background
- private void doPersonLabelsContrast()
- {
- UtilGtk.HboxDoContrastLabels (viewport_hpaned_contacts_main, hbox_top_person);
- UtilGtk.HboxDoContrastLabels (viewport_hpaned_contacts_main, hbox_top_person_encoder);
- }
-
}
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index f36e580a..a53501b3 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -110,7 +110,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.TextView textview_encoder_signal_comment;
[Widget] Gtk.Button button_encoder_signal_save_comment;
//[Widget] Gtk.MenuItem menuitem_export_encoder_signal;
- [Widget] Gtk.Button button_menu_encoder_export_set;
+// [Widget] Gtk.Button button_menu_encoder_export_set;
[Widget] Gtk.Button button_encoder_delete_signal;
[Widget] Gtk.VPaned vpaned_encoder_main;
@@ -5037,7 +5037,7 @@ public partial class ChronoJumpWindow
// hbox_encoder_configuration, frame_encoder_capture_options
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
- //c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal,
button_menu_encoder_export_set
+ //c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal,
//button_menu_encoder_export_set
// button_encoder_delete_signal, vbox_encoder_signal_comment,
// and images: image_encoder_capture , image_encoder_analyze.Sensitive. Update: both NOT
managed here
//UNUSED c4 button_encoder_save_curve, entry_encoder_curve_comment
@@ -5099,7 +5099,7 @@ public partial class ChronoJumpWindow
hbox_encoder_capture_curves_save_all_none.Sensitive = Util.IntToBool(table[3]);
//menuitem_export_encoder_signal.Sensitive = Util.IntToBool(table[3]);
- button_menu_encoder_export_set.Sensitive = Util.IntToBool(table[3]);
+// button_menu_encoder_export_set.Sensitive = Util.IntToBool(table[3]);
button_encoder_delete_signal.Sensitive = Util.IntToBool(table[3]);
vbox_encoder_signal_comment.Sensitive = Util.IntToBool(table[3]);
//image_encoder_capture.Sensitive = Util.IntToBool(table[3]);
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 129795ee..104d0e02 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -278,6 +278,9 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders.png");
image_menu_folders.Pixbuf = pixbuf;
image_menu_folders1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_more_horiz.png");
+ image_session_more.Pixbuf = pixbuf;
+ image_session_more1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_help.png");
image_menu_help.Pixbuf = pixbuf;
image_menu_help1.Pixbuf = pixbuf;
@@ -448,7 +451,6 @@ public partial class ChronoJumpWindow
image_edit_current_person.Pixbuf = pixbuf;
image_edit_current_person_h.Pixbuf = pixbuf;
image_session_edit.Pixbuf = pixbuf;
- image_session_edit1.Pixbuf = pixbuf;
image_session_edit2.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
@@ -594,9 +596,11 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImport);
image_import_database.Pixbuf = pixbuf;
+ image_session_import.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameExport);
image_export_csv.Pixbuf = pixbuf;
image_export_encoder_signal.Pixbuf = pixbuf;
+ image_session_export.Pixbuf = pixbuf;
//reaction times changes
//UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
@@ -694,7 +698,6 @@ public partial class ChronoJumpWindow
image_menuitem_forceSensor_session_overview.Pixbuf = pixbuf;
image_menuitem_runEncoder_session_overview.Pixbuf = pixbuf;
image_session_overview.Pixbuf = pixbuf;
- image_session_overview1.Pixbuf = pixbuf;
//encoder
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_powerbars);
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 7fc20974..19dfacd6 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -30,13 +30,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_menu_and_persons;
[Widget] Gtk.Arrow arrow_menu_show_session_up;
[Widget] Gtk.Arrow arrow_menu_show_session_down;
-// [Widget] Gtk.Arrow arrow_menu_show_encoder_up;
-// [Widget] Gtk.Arrow arrow_menu_show_encoder_down;
[Widget] Gtk.Arrow arrow_menu_show_help_up;
[Widget] Gtk.Arrow arrow_menu_show_help_down;
[Widget] Gtk.RadioButton radio_show_menu;
[Widget] Gtk.RadioButton radio_show_persons;
- [Widget] Gtk.Button button_show_modes;
[Widget] Gtk.HPaned hpaned_contacts_main;
[Widget] Gtk.Alignment alignment_viewport_menu_top;
[Widget] Gtk.Viewport viewport_hpaned_contacts_main;
@@ -50,38 +47,43 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_check_menu_session;
[Widget] Gtk.EventBox eventbox_button_menu_session_new;
[Widget] Gtk.EventBox eventbox_button_menu_session_load;
- [Widget] Gtk.EventBox eventbox_button_menu_session_edit;
- [Widget] Gtk.EventBox eventbox_button_menu_session_overview;
+ [Widget] Gtk.EventBox eventbox_button_menu_session_more;
[Widget] Gtk.EventBox eventbox_button_menu_preferences;
-// [Widget] Gtk.EventBox eventbox_check_menu_encoder;
[Widget] Gtk.EventBox eventbox_check_menu_help;
[Widget] Gtk.EventBox eventbox_button_menu_help_documents;
[Widget] Gtk.EventBox eventbox_button_menu_help_accelerators;
[Widget] Gtk.EventBox eventbox_button_menu_help_about;
[Widget] Gtk.EventBox eventbox_button_menu_exit;
[Widget] Gtk.CheckButton check_menu_session;
-// [Widget] Gtk.CheckButton check_menu_encoder;
[Widget] Gtk.CheckButton check_menu_help;
+ [Widget] Gtk.VBox vbox_menu_session;
[Widget] Gtk.Alignment alignment_menu_session_options;
[Widget] Gtk.Alignment alignment_menu_person_options;
-// [Widget] Gtk.Alignment alignment_menu_encoder_options;
[Widget] Gtk.Alignment alignment_menu_help_options;
+ [Widget] Gtk.Button button_show_modes;
+ [Widget] Gtk.Button button_session_edit;
+ [Widget] Gtk.Button button_session_overview;
+ [Widget] Gtk.Button button_session_export;
+
[Widget] Gtk.Button button_menu_session_new;
[Widget] Gtk.Button button_menu_session_load;
- [Widget] Gtk.Button button_menu_session_edit;
- [Widget] Gtk.Button button_menu_session_overview;
+ [Widget] Gtk.Button button_menu_session_more;
[Widget] Gtk.Button button_menu_preferences;
[Widget] Gtk.Button button_menu_help_documents;
[Widget] Gtk.Button button_menu_help_accelerators;
[Widget] Gtk.Button button_menu_help_about;
+ [Widget] Gtk.Image image_session_import;
+ [Widget] Gtk.Image image_session_export;
+
//menu icons
[Widget] Gtk.Image image_radio_show_menu;
[Widget] Gtk.Image image_radio_show_persons;
[Widget] Gtk.Image image_menu_folders;
[Widget] Gtk.Image image_session_new3;
[Widget] Gtk.Image image_session_load2;
+ [Widget] Gtk.Image image_session_more;
[Widget] Gtk.Image image_session_edit2;
[Widget] Gtk.Image image_session_overview;
[Widget] Gtk.Image image_button_show_modes;
@@ -134,8 +136,7 @@ public partial class ChronoJumpWindow
List <Gtk.Button> l = new List<Gtk.Button>();
l.Add(button_menu_session_new);
l.Add(button_menu_session_load);
- l.Add(button_menu_session_edit);
- l.Add(button_menu_session_overview);
+ l.Add(button_menu_session_more);
l.Add(button_menu_help_documents);
l.Add(button_menu_help_accelerators);
l.Add(button_menu_help_about);
@@ -166,8 +167,6 @@ public partial class ChronoJumpWindow
private void menuSetTextAndIcons ()
{
//icons
- //image_radio_show_menu.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
- //image_radio_show_persons.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_menu_folders.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_session_new3.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
image_session_load2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
@@ -203,14 +202,12 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_show_modes, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_session, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_preferences, UtilGtk.YELLOW);
-// UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_encoder, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_help, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_exit, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_edit,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_overview,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_more,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_accelerators,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about, UtilGtk.YELLOW_LIGHT);
@@ -224,12 +221,8 @@ public partial class ChronoJumpWindow
private void on_radio_show_menu_toggled (object o, EventArgs args)
{
- if(check_menu_session.Active)
- check_menu_session.Active = false;
if(check_menu_help.Active)
check_menu_help.Active = false;
-// if(check_menu_encoder.Active)
-// check_menu_encoder.Active = false;
viewport_menu.Visible = true;
viewport_persons.Visible = false;
@@ -245,7 +238,6 @@ public partial class ChronoJumpWindow
menuShowVerticalArrow (check_menu_session.Active, arrow_menu_show_session_up,
arrow_menu_show_session_down);
if(check_menu_session.Active)
{
-// check_menu_encoder.Active = false;
check_menu_help.Active = false;
alignment_menu_session_options.Visible = true;
@@ -254,25 +246,11 @@ public partial class ChronoJumpWindow
alignment_menu_session_options.Visible = false;
}
- /*
- private void on_check_menu_encoder_clicked (object o, EventArgs args)
- {
- menuShowVerticalArrow (check_menu_encoder.Active, arrow_menu_show_encoder_up,
arrow_menu_show_encoder_down);
- if(check_menu_encoder.Active)
- {
- check_menu_session.Active = false;
- check_menu_help.Active = false;
- alignment_menu_encoder_options.Visible = true;
- } else
- alignment_menu_encoder_options.Visible = false;
- }
- */
private void on_check_menu_help_clicked (object o, EventArgs args)
{
menuShowVerticalArrow (check_menu_help.Active, arrow_menu_show_help_up,
arrow_menu_show_help_down);
if(check_menu_help.Active)
{
-// check_menu_encoder.Active = false;
check_menu_session.Active = false;
alignment_menu_help_options.Visible = true;
} else
@@ -289,6 +267,36 @@ public partial class ChronoJumpWindow
return max;
}
+ private void on_button_menu_session_more_clicked (object o, EventArgs args)
+ {
+ menus_sensitive_import_not_danger(false);
+
+ //store which page we are on notebook_sup, except if we clicked on "more" from the session tab
+ if(notebook_sup.CurrentPage != Convert.ToInt32(notebook_sup_pages.SESSION))
+ app1s_notebook_sup_entered_from = notebook_sup.CurrentPage;
+
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.SESSION);
+ app1s_notebook.CurrentPage = Convert.ToInt32(app1s_PAGE_MODES);
+ }
+
+ /* if import started we need to reload at the end
+ * we will reload if there's a cancel there
+ * dangerous situation is when treeview of sessions have been loaded
+ * and then we exit, eg. with back and then cancel
+ * so that cancel has a reloadSession()
+ * but ensure user will not be able to manage database in other way by clicking session or preferences
+ *
+ * also is nice to have the menu_more unsensitive
+ */
+ private void menus_sensitive_import_not_danger(bool danger)
+ {
+ alignment_menu_and_persons.Sensitive = danger;
+ vbox_menu_session.Sensitive = danger;
+ vbox_menu_session1.Sensitive = danger;
+ button_menu_preferences.Sensitive = danger;
+ button_menu_preferences1.Sensitive = danger;
+ }
+
private void on_button_show_modes_clicked (object o, EventArgs args)
{
show_start_page();
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index 7b080cc8..9cb1fdc8 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -32,12 +32,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Arrow arrow_menu_show_help_down1;
[Widget] Gtk.Button button_show_modes1;
[Widget] Gtk.VBox vbox_menu_tiny;
- [Widget] Gtk.EventBox eventbox_button_show_modes1;
[Widget] Gtk.EventBox eventbox_check_menu_session1;
+ [Widget] Gtk.EventBox eventbox_button_menu_session_more1;
[Widget] Gtk.EventBox eventbox_button_menu_session_new1;
[Widget] Gtk.EventBox eventbox_button_menu_session_load1;
- [Widget] Gtk.EventBox eventbox_button_menu_session_edit1;
- [Widget] Gtk.EventBox eventbox_button_menu_session_overview1;
+ [Widget] Gtk.EventBox eventbox_button_show_modes1;
[Widget] Gtk.EventBox eventbox_button_menu_preferences1;
[Widget] Gtk.EventBox eventbox_check_menu_help1;
[Widget] Gtk.EventBox eventbox_button_menu_help_documents1;
@@ -46,17 +45,17 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_exit1;
[Widget] Gtk.CheckButton check_menu_session1;
[Widget] Gtk.CheckButton check_menu_help1;
+ [Widget] Gtk.VBox vbox_menu_session1;
[Widget] Gtk.Alignment alignment_menu_session_options1;
[Widget] Gtk.Alignment alignment_menu_person_options1;
[Widget] Gtk.Alignment alignment_menu_help_options1;
- [Widget] Gtk.Button button_menu_session_edit1;
- [Widget] Gtk.Button button_menu_session_overview1;
+ [Widget] Gtk.Button button_menu_session_more1;
+ [Widget] Gtk.Button button_menu_preferences1;
[Widget] Gtk.Image image_menu_folders1;
[Widget] Gtk.Image image_session_new1;
[Widget] Gtk.Image image_session_load1;
- [Widget] Gtk.Image image_session_edit1;
- [Widget] Gtk.Image image_session_overview1;
+ [Widget] Gtk.Image image_session_more1;
[Widget] Gtk.Image image_button_show_modes1;
[Widget] Gtk.Image image_menu_preferences1;
[Widget] Gtk.Image image_menu_help1;
@@ -87,16 +86,15 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_help1, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_exit1, UtilGtk.YELLOW);
-
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load1,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_edit1,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_overview1,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_more1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_accelerators1,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about1,
UtilGtk.YELLOW_LIGHT);
}
+
private void on_check_menu_session1_clicked (object o, EventArgs args)
{
menuShowVerticalArrow (check_menu_session1.Active, arrow_menu_show_session_up1,
arrow_menu_show_session_down1);
diff --git a/src/gui/chronojumpImporter.cs b/src/gui/chronojumpImporter.cs
index 518d55d2..53115512 100644
--- a/src/gui/chronojumpImporter.cs
+++ b/src/gui/chronojumpImporter.cs
@@ -28,42 +28,22 @@ public partial class ChronoJumpWindow
static Thread threadImport;
static ChronojumpImporter chronojumpImporter;
- private void on_button_menu_session_advanced_clicked (object o, EventArgs args)
- {
- on_button_import_chronojump_session (o, args);
- }
private void on_button_import_chronojump_session(object o, EventArgs args)
{
- sessionLoadWin = SessionLoadWindow.Show (app1, SessionLoadWindow.WindowType.IMPORT_SESSION);
-
- if (currentSession == null) {
- sessionLoadWin.DisableImportToCurrentSession ();
- }
-
- sessionLoadWin.Button_import.Clicked -= new EventHandler(on_load_session_accepted_to_import);
- sessionLoadWin.Button_import.Clicked += new EventHandler(on_load_session_accepted_to_import);
- sessionLoadWin.Button_import_confirm_accept.Clicked -= new
EventHandler(importSessionFromDatabasePrepare2);
- sessionLoadWin.Button_import_confirm_accept.Clicked += new
EventHandler(importSessionFromDatabasePrepare2);
- sessionLoadWin.FakeButton_cancel_maybeDatabaseSwitched.Clicked -= new
EventHandler(on_import_cancelled_maybe_database_switched);
- sessionLoadWin.FakeButton_cancel_maybeDatabaseSwitched.Clicked += new
EventHandler(on_import_cancelled_maybe_database_switched);
- }
-
- private void on_import_cancelled_maybe_database_switched (object o, EventArgs args)
- {
- sessionLoadWin.HideAndNull();
- reloadSession();
+ sessionLoadWindowShow(app1s_windowType.IMPORT_SESSION);
+ app1s_radio_import_new_current_sensitive();
}
//from import session
private void on_load_session_accepted_to_import(object o, EventArgs args)
{
- int sourceSession = sessionLoadWin.CurrentSessionId();
- string databasePath = sessionLoadWin.ImportDatabasePath();
+ int sourceSession = app1s_CurrentSessionId();
+ string databasePath = app1s_ImportDatabasePath();
LogB.Information (databasePath);
Session destinationSession = currentSession;
- if (sessionLoadWin.ImportToNewSession ()) {
+ if (app1s_ImportToNewSession ()) {
destinationSession = null;
}
@@ -85,15 +65,15 @@ public partial class ChronoJumpWindow
if(destinationSessionId == 0)
{
- sessionLoadWin.NotebookPage(SessionLoadWindow.PAGE_IMPORT_RESULT); //import do and
end page
+ app1s_NotebookPage(app1s_PAGE_IMPORT_RESULT); //import do and end page
importSessionFromDatabasePrepare2 (new object(), new EventArgs());
} else
{
string sessionName = ChronojumpImporter.GetSessionName
(chronojumpImporter.SourceFile, chronojumpImporter.SourceSession);
- sessionLoadWin.LabelImportSessionName(sessionName);
- sessionLoadWin.LabelImportFile(chronojumpImporter.SourceFile);
+ app1s_LabelImportSessionName(sessionName);
+ app1s_LabelImportFile(chronojumpImporter.SourceFile);
- sessionLoadWin.NotebookPage(SessionLoadWindow.PAGE_IMPORT_CONFIRM); //import confirm
page
+ app1s_NotebookPage(app1s_PAGE_IMPORT_CONFIRM); //import confirm page
}
}
@@ -121,14 +101,14 @@ public partial class ChronoJumpWindow
LogB.ThreadEnding();
importSessionFromDatabaseEnd();
- sessionLoadWin.Pulse(chronojumpImporter.MessageToPulsebar);
- sessionLoadWin.PulseEnd();
+ app1s_Pulse(chronojumpImporter.MessageToPulsebar);
+ app1s_PulseEnd();
LogB.ThreadEnded();
return false;
}
- sessionLoadWin.Pulse(chronojumpImporter.MessageToPulsebar);
+ app1s_Pulse(chronojumpImporter.MessageToPulsebar);
Thread.Sleep (100);
//LogB.Debug(threadImport.ThreadState.ToString());
@@ -187,10 +167,10 @@ public partial class ChronoJumpWindow
reloadSession ();
//chronojumpImporter.showImportCorrectlyFinished ();
- sessionLoadWin.ShowLabelImportedOk();
+ app1s_ShowLabelImportedOk();
} else {
LogB.Debug ("Chronojump Importer error: ", importerResult.error);
- sessionLoadWin.ShowImportError(importerResult.error);
+ app1s_ShowImportError(importerResult.error);
}
}
}
diff --git a/src/gui/guiTests.cs b/src/gui/guiTests.cs
index 042adc9b..e950d300 100644
--- a/src/gui/guiTests.cs
+++ b/src/gui/guiTests.cs
@@ -451,14 +451,14 @@ public partial class ChronoJumpWindow
LogB.TestStart("chronojumpWindowTestsLoadSession");
on_open_activate(new Object(), new EventArgs());
- bool exists = sessionLoadWin.SelectRowByID(sID); //0 is the first
+ bool exists = app1s_SelectRowByID(sID); //0 is the first
if(! exists) {
testsActive = false;
new DialogMessage(Constants.MessageTypes.WARNING, "Warning, This session ID does not
exists");
return;
}
- sessionLoadWin.Button_accept.Click();
+ app1s_Button_accept.Click();
LogB.TestEnd("chronojumpWindowTestsLoadSession");
}
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 361a1234..665d1408 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -53,8 +53,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_encoder_im_weights_n;
//config.EncoderNameAndCapture
- [Widget] Gtk.Box hbox_top_person;
- [Widget] Gtk.Box hbox_top_person_encoder;
+ [Widget] Gtk.HBox hbox_top_person;
+ [Widget] Gtk.HBox hbox_top_person_encoder;
[Widget] Gtk.Label label_top_person_name;
[Widget] Gtk.Label label_top_encoder_person_name;
[Widget] Gtk.Button button_image_current_person_zoom;
diff --git a/src/gui/sendLog.cs b/src/gui/sendLog.cs
index 747ba478..f9dfcba6 100644
--- a/src/gui/sendLog.cs
+++ b/src/gui/sendLog.cs
@@ -131,7 +131,7 @@ public partial class ChronoJumpWindow
private void on_button_open_chronojump_clicked(object o, EventArgs args)
{
notebook_start.CurrentPage = 0;
- notebook_sup.CurrentPage = 0;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
chronojumpLogo = new ChronojumpLogo (drawingarea_chronojump_logo, viewport_chronojump_logo);
}
}
diff --git a/src/gui/session/load.cs b/src/gui/session/load.cs
index ad722436..9c62a1b9 100644
--- a/src/gui/session/load.cs
+++ b/src/gui/session/load.cs
@@ -27,21 +27,25 @@ using System.Text; //StringBuilder
using System.Collections; //ArrayList
using Mono.Unix;
+//here using app1s_ , "s" means session
+//this file has been moved from his old window to be part of app1 on Chronojump 2.0
-public class SessionLoadWindow
+//public class SessionLoadWindow
+public partial class ChronoJumpWindow
{
- public enum WindowType
+ private enum app1s_windowType
{
LOAD_SESSION,
IMPORT_SESSION
};
- [Widget] Gtk.Window session_load;
- private TreeStore store;
- private string selected;
- private string import_file_path;
+ private TreeStore app1s_store;
+ private string app1s_selected;
+ private string app1s_import_file_path;
+ private int app1s_notebook_sup_entered_from; //to store from which page we entered (to return at it)
- [Widget] Gtk.Notebook notebook_import;
+ [Widget] Gtk.Notebook app1s_notebook;
+ [Widget] Gtk.Label app1s_label_select;
/*
* when fillTreeView() is called, it executes:
@@ -51,106 +55,92 @@ public class SessionLoadWindow
* that makes the connection point to client database (and not the database being imported),
* but if we cancel after the fillTreeView()
* then Chronojump continues on old db until load session is called,
- * so this fakeButton_cancel_maybeDatabaseSwitched
* ensure to do a reloadSession() if cancel buttons are clicked or on delete_event
+ *
+ * before 2.0, all load/import gui was on separate window, then this was used:
+ * fakeButton_cancel_maybeDatabaseSwitched.Click();
*/
- [Widget] Gtk.Button fakeButton_cancel_maybeDatabaseSwitched;
-
- //notebook import tab 0
- [Widget] Gtk.RadioButton radio_import_new_session;
- [Widget] Gtk.RadioButton radio_import_current_session;
- [Widget] Gtk.Image image_open_database;
- [Widget] Gtk.Label label_open_database_file;
- [Widget] Gtk.Button button_select_file_import_same_database;
-
- //notebook import tab 1
- [Widget] Gtk.TreeView treeview_session_load;
- [Widget] Gtk.Button button_accept;
- [Widget] Gtk.Button button_import;
- [Widget] Gtk.Image image_import;
- [Widget] Gtk.Entry entry_search_filter;
- [Widget] Gtk.CheckButton checkbutton_show_data_jump_run;
- [Widget] Gtk.CheckButton checkbutton_show_data_other_tests;
- [Widget] Gtk.Label file_path_import;
- [Widget] Gtk.HButtonBox hbuttonbox_page1_load;
- [Widget] Gtk.HButtonBox hbuttonbox_page1_import;
-
- //notebook import tab 2
- [Widget] Gtk.Label label_import_session_name;
- [Widget] Gtk.Label label_import_file;
- [Widget] Gtk.Button button_import_confirm_accept;
-
- //notebook import tab 3
- [Widget] Gtk.ProgressBar progressbarImport;
- [Widget] Gtk.Label label_import_done_at_new_session;
- [Widget] Gtk.Label label_import_done_at_current_session;
- [Widget] Gtk.ScrolledWindow scrolledwindow_import_error;
- [Widget] Gtk.TextView textview_import_error;
- [Widget] Gtk.Image image_import1;
- [Widget] Gtk.HButtonBox hbuttonbox_page3;
-
-
- static SessionLoadWindow SessionLoadWindowBox;
-
- private Session currentSession;
- private WindowType type;
- const int PAGE_IMPORT_START = 0;
- const int PAGE_SELECT_SESSION = 1; //for load session and for import
- public const int PAGE_IMPORT_CONFIRM = 2;
- public const int PAGE_IMPORT_RESULT = 3;
-
- SessionLoadWindow (Gtk.Window parent)
- {
- Glade.XML gladeXML;
- gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "session_load.glade",
"session_load", null);
- gladeXML.Autoconnect(this);
- session_load.Parent = parent;
- }
-
- private void initializeGui()
- {
- if (type == WindowType.LOAD_SESSION) {
- file_path_import.Visible = false;
- hbuttonbox_page1_load.Visible = true;
- hbuttonbox_page1_import.Visible = false;
- session_load.Title = Catalog.GetString ("Load session");
- notebook_import.CurrentPage = PAGE_SELECT_SESSION;
+ //notebook tab 0
+ //notebook tab 1
+ [Widget] Gtk.HBox hbox_session_more;
+ [Widget] Gtk.VBox vbox_session_overview;
+ [Widget] Gtk.RadioButton app1s_radio_import_new_session;
+ [Widget] Gtk.RadioButton app1s_radio_import_current_session;
+ [Widget] Gtk.Image app1s_image_open_database;
+ [Widget] Gtk.Label app1s_label_open_database_file;
+ [Widget] Gtk.Button app1s_button_select_file_import_same_database;
+
+ //notebook tab 2
+ [Widget] Gtk.TreeView app1s_treeview_session_load;
+ [Widget] Gtk.Button app1s_button_accept;
+ [Widget] Gtk.Button app1s_button_import;
+ [Widget] Gtk.Image app1s_image_import;
+ [Widget] Gtk.Entry app1s_entry_search_filter;
+ [Widget] Gtk.CheckButton app1s_checkbutton_show_data_jump_run;
+ [Widget] Gtk.CheckButton app1s_checkbutton_show_data_other_tests;
+ [Widget] Gtk.Label app1s_file_path_import;
+ [Widget] Gtk.HButtonBox app1s_hbuttonbox_page2_load;
+ [Widget] Gtk.HButtonBox app1s_hbuttonbox_page2_import;
+
+ //notebook tab 3
+ [Widget] Gtk.Label app1s_label_import_session_name;
+ [Widget] Gtk.Label app1s_label_import_file;
+ [Widget] Gtk.Button app1s_button_import_confirm_accept;
+
+ //notebook tab 4
+ [Widget] Gtk.ProgressBar app1s_progressbarImport;
+ [Widget] Gtk.Label app1s_label_import_done_at_new_session;
+ [Widget] Gtk.Label app1s_label_import_done_at_current_session;
+ [Widget] Gtk.ScrolledWindow app1s_scrolledwindow_import_error;
+ [Widget] Gtk.TextView app1s_textview_import_error;
+ [Widget] Gtk.Image app1s_image_import1;
+ [Widget] Gtk.HButtonBox app1s_hbuttonbox_page4;
+
+ private app1s_windowType app1s_type;
+
+ const int app1s_PAGE_MODES = 0;
+ const int app1s_PAGE_IMPORT_START = 1;
+ const int app1s_PAGE_SELECT_SESSION = 2; //for load session and for import
+ public const int app1s_PAGE_IMPORT_CONFIRM = 3;
+ public const int app1s_PAGE_IMPORT_RESULT = 4;
+
+ private void app1s_initializeGui()
+ {
+ if (app1s_type == app1s_windowType.LOAD_SESSION) {
+ app1s_file_path_import.Visible = false;
+ app1s_hbuttonbox_page2_load.Visible = true;
+ app1s_hbuttonbox_page2_import.Visible = false;
+ app1s_label_select.Text = "<b>" + Catalog.GetString ("Load session") + "</b>";
+ app1s_label_select.UseMarkup = true;
+ app1s_notebook.CurrentPage = app1s_PAGE_SELECT_SESSION;
} else {
- file_path_import.Visible = true;
- hbuttonbox_page1_load.Visible = false;
- hbuttonbox_page1_import.Visible = true;
- session_load.Title = Catalog.GetString ("Import session");
- button_select_file_import_same_database.Visible = false; //is shown when user want to
import a second session
- notebook_import.CurrentPage = PAGE_IMPORT_START;
+ app1s_file_path_import.Visible = true;
+ app1s_hbuttonbox_page2_load.Visible = false;
+ app1s_hbuttonbox_page2_import.Visible = true;
+ //session_load.Title = Catalog.GetString ("Import session");
+ app1s_button_select_file_import_same_database.Visible = false; //is shown when user
want to import a second session
+ app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_START;
}
- //put an icon to window
- UtilGtk.IconWindow(session_load);
+ app1s_image_open_database.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"folder_open.png");
+ app1s_image_import.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameImport);
+ app1s_image_import1.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameImport);
- image_open_database.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
- image_import.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImport);
- image_import1.Pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImport);
+ app1s_createTreeView(app1s_treeview_session_load, false, false);
+ app1s_store = app1s_getStore(false, false);
+ app1s_treeview_session_load.Model = app1s_store;
+ app1s_fillTreeView(app1s_treeview_session_load, app1s_store, false, false);
- createTreeView(treeview_session_load, false, false);
- store = getStore(false, false);
- treeview_session_load.Model = store;
- fillTreeView(treeview_session_load, store, false, false);
+ app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
+ app1s_store.ChangeSortColumn();
- store.SetSortColumnId(1, Gtk.SortType.Descending); //date
- store.ChangeSortColumn();
+ app1s_button_accept.Sensitive = false;
+ app1s_button_import.Sensitive = false;
+ app1s_entry_search_filter.CanFocus = true;
+ app1s_entry_search_filter.IsFocus = true;
- button_accept.Sensitive = false;
- button_import.Sensitive = false;
- entry_search_filter.CanFocus = true;
- entry_search_filter.IsFocus = true;
-
- // Leave the state of the Importing Comboboxes as they are by default
- /*radio_import_new_session.Active = true;
- radio_import_current_session.Sensitive = false;
- */
-
- treeview_session_load.Selection.Changed += onSelectionEntry;
+ app1s_treeview_session_load.Selection.Changed += app1s_onSelectionEntry;
/**
* Uncomment if we want the session file chooser to be loaded with the dialog.
@@ -160,11 +150,9 @@ public class SessionLoadWindow
chooseDatabaseToImport ();
}
*/
-
- fakeButton_cancel_maybeDatabaseSwitched = new Gtk.Button();
}
- private TreeStore getStore(bool showContacts, bool showEncoderAndForceSensor) {
+ private TreeStore app1s_getStore(bool showContacts, bool showEncoderAndForceSensor) {
TreeStore s;
if(showContacts && showEncoderAndForceSensor)
s = new TreeStore(
@@ -198,14 +186,14 @@ public class SessionLoadWindow
);
//s.SetSortFunc (0, UtilGtk.IdColumnCompare); //not needed, it's hidden
- s.SetSortFunc (1, dateColumnCompare);
+ s.SetSortFunc (1, app1s_dateColumnCompare);
s.ChangeSortColumn();
return s;
}
- private static int dateColumnCompare (TreeModel model, TreeIter iter1, TreeIter iter2)
+ private static int app1s_dateColumnCompare (TreeModel model, TreeIter iter1, TreeIter iter2)
{
var dt1String = (model.GetValue(iter1, 1).ToString());
var dt2String = (model.GetValue(iter2, 1).ToString());
@@ -221,23 +209,15 @@ public class SessionLoadWindow
else
return 0;
}
-
- static public SessionLoadWindow Show (Gtk.Window parent, WindowType type)
- {
- if (SessionLoadWindowBox == null) {
- SessionLoadWindowBox = new SessionLoadWindow (parent);
- }
-
- SessionLoadWindowBox.type = type;
- SessionLoadWindowBox.initializeGui();
- SessionLoadWindowBox.recreateTreeView("loaded the dialog");
- SessionLoadWindowBox.session_load.Show ();
-
- return SessionLoadWindowBox;
+ private void sessionLoadWindowShow (app1s_windowType type)
+ {
+ this.app1s_type = type;
+ app1s_initializeGui();
+ app1s_recreateTreeView("loaded the dialog");
}
- private void createTreeView (Gtk.TreeView tv, bool showContacts, bool showOtherTests)
+ private void app1s_createTreeView (Gtk.TreeView tv, bool showContacts, bool showOtherTests)
{
tv.HeadersVisible=true;
int count = 0;
@@ -286,14 +266,15 @@ public class SessionLoadWindow
tv.AppendColumn ( Catalog.GetString ("Comments"), new CellRendererText(), "text", count++);
}
- protected void on_entry_search_filter_changed (object o, EventArgs args) {
- recreateTreeView("changed search filter");
+ protected void app1s_on_entry_search_filter_changed (object o, EventArgs args) {
+ app1s_recreateTreeView("changed search filter");
}
- private void chooseDatabaseToImport()
+ private void app1s_chooseDatabaseToImport()
{
+ //TODO: try it with Gtk.FileChooserWidget, then we do not need to pass app1 (parent)
Gtk.FileChooserDialog filechooser = new Gtk.FileChooserDialog ("Choose ChronoJump database to
import from",
- session_load,
FileChooserAction.Open,
+ app1, FileChooserAction.Open,
"Cancel",ResponseType.Cancel,
"Open",ResponseType.Accept);
@@ -303,37 +284,37 @@ public class SessionLoadWindow
filechooser.AddFilter (file_filter);
if (filechooser.Run () == (int)ResponseType.Accept) {
- import_file_path = filechooser.Filename;
+ app1s_import_file_path = filechooser.Filename;
//file_path_import.Text = System.IO.Path.GetFileName (import_file_path);
- file_path_import.Text = import_file_path;
- file_path_import.TooltipText = import_file_path;
- notebook_import.CurrentPage = PAGE_SELECT_SESSION;
+ app1s_file_path_import.Text = app1s_import_file_path;
+ app1s_file_path_import.TooltipText = app1s_import_file_path;
+ app1s_notebook.CurrentPage = app1s_PAGE_SELECT_SESSION;
}
filechooser.Destroy ();
- recreateTreeView ("file path changed");
+ app1s_recreateTreeView ("file path changed");
}
- void on_checkbutton_show_data_jump_run_toggled (object o, EventArgs args) {
- recreateTreeView("jump run " + checkbutton_show_data_jump_run.Active.ToString());
+ void app1s_on_checkbutton_show_data_jump_run_toggled (object o, EventArgs args) {
+ app1s_recreateTreeView("jump run " + app1s_checkbutton_show_data_jump_run.Active.ToString());
}
- void on_checkbutton_show_data_other_tests_toggled (object o, EventArgs args) {
- recreateTreeView("other tests " + checkbutton_show_data_other_tests.Active.ToString());
+ void app1s_on_checkbutton_show_data_other_tests_toggled (object o, EventArgs args) {
+ app1s_recreateTreeView("other tests " +
app1s_checkbutton_show_data_other_tests.Active.ToString());
}
- void recreateTreeView(string message)
+ void app1s_recreateTreeView(string message)
{
LogB.Information("Recreate treeview: " + message);
- UtilGtk.RemoveColumns(treeview_session_load);
+ UtilGtk.RemoveColumns(app1s_treeview_session_load);
- createTreeView(treeview_session_load,
- checkbutton_show_data_jump_run.Active,
checkbutton_show_data_other_tests.Active);
- store = getStore(
- checkbutton_show_data_jump_run.Active,
checkbutton_show_data_other_tests.Active);
- treeview_session_load.Model = store;
- fillTreeView(treeview_session_load, store,
- checkbutton_show_data_jump_run.Active,
checkbutton_show_data_other_tests.Active);
+ app1s_createTreeView(app1s_treeview_session_load,
+ app1s_checkbutton_show_data_jump_run.Active,
app1s_checkbutton_show_data_other_tests.Active);
+ app1s_store = app1s_getStore(
+ app1s_checkbutton_show_data_jump_run.Active,
app1s_checkbutton_show_data_other_tests.Active);
+ app1s_treeview_session_load.Model = app1s_store;
+ app1s_fillTreeView(app1s_treeview_session_load, app1s_store,
+ app1s_checkbutton_show_data_jump_run.Active,
app1s_checkbutton_show_data_other_tests.Active);
- store.SetSortColumnId(1, Gtk.SortType.Descending); //date
- store.ChangeSortColumn();
+ app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
+ app1s_store.ChangeSortColumn();
/*
@@ -341,22 +322,22 @@ public class SessionLoadWindow
* call onSelectionEntry to see if there's a row selected
* and it will sensitive on/off button_accept as needed
*/
- onSelectionEntry (treeview_session_load.Selection, new EventArgs ());
+ app1s_onSelectionEntry (app1s_treeview_session_load.Selection, new EventArgs ());
}
- private void fillTreeView (Gtk.TreeView tv, TreeStore store, bool showContacts, bool showOtherTests)
+ private void app1s_fillTreeView (Gtk.TreeView tv, TreeStore store, bool showContacts, bool
showOtherTests)
{
string filterName = "";
- if(entry_search_filter.Text.ToString().Length > 0)
- filterName = entry_search_filter.Text.ToString();
+ if(app1s_entry_search_filter.Text.ToString().Length > 0)
+ filterName = app1s_entry_search_filter.Text.ToString();
SqliteSessionSwitcher.DatabaseType databaseType;
- if (type == WindowType.LOAD_SESSION) {
+ if (app1s_type == app1s_windowType.LOAD_SESSION) {
databaseType = SqliteSessionSwitcher.DatabaseType.DEFAULT;
} else {
databaseType = SqliteSessionSwitcher.DatabaseType.SPECIFIC;
}
- SqliteSessionSwitcher sessionSwitcher = new SqliteSessionSwitcher (databaseType,
import_file_path);
+ SqliteSessionSwitcher sessionSwitcher = new SqliteSessionSwitcher (databaseType,
app1s_import_file_path);
string [] mySessions = sessionSwitcher.SelectAllSessions(filterName); //returns a string of
values separated by ':'
foreach (string session in mySessions) {
@@ -376,7 +357,7 @@ public class SessionLoadWindow
myLevel = Catalog.GetString(myStringFull[6]);
if(showContacts && showOtherTests)
- store.AppendValues (
+ app1s_store.AppendValues (
myStringFull[0], //session num
myStringFull[3], //session date
myStringFull[1], //session name
@@ -399,7 +380,7 @@ public class SessionLoadWindow
myStringFull[7] //description of session
);
else if(showContacts && ! showOtherTests)
- store.AppendValues (
+ app1s_store.AppendValues (
myStringFull[0], //session num
myStringFull[3], //session date
myStringFull[1], //session name
@@ -418,7 +399,7 @@ public class SessionLoadWindow
myStringFull[7] //description of session
);
else if(! showContacts && showOtherTests)
- store.AppendValues (
+ app1s_store.AppendValues (
myStringFull[0], //session num
myStringFull[3], //session date
myStringFull[1], //session name
@@ -434,7 +415,7 @@ public class SessionLoadWindow
myStringFull[7] //description of session
);
else // ! showContacts && ! showOtherTests
- store.AppendValues (
+ app1s_store.AppendValues (
myStringFull[0], //session num
myStringFull[3], //session date
myStringFull[1], //session name
@@ -450,245 +431,234 @@ public class SessionLoadWindow
}
//pass 0 for first row
- public void SelectRowByPos(int rowNumber)
+ public void app1s_SelectRowByPos(int rowNumber)
{
TreeIter iter;
- bool iterOk = store.GetIterFirst(out iter);
+ bool iterOk = app1s_store.GetIterFirst(out iter);
if(iterOk) {
int count = 0;
while (count < rowNumber) {
- store.IterNext(ref iter);
+ app1s_store.IterNext(ref iter);
count ++;
}
- treeview_session_load.Selection.SelectIter(iter);
+ app1s_treeview_session_load.Selection.SelectIter(iter);
}
}
- public bool SelectRowByID(int searchedID)
+ public bool app1s_SelectRowByID(int searchedID)
{
return UtilGtk.TreeviewSelectRowWithID(
- treeview_session_load, store, 0, searchedID, false);
+ app1s_treeview_session_load, app1s_store, 0, searchedID, false);
}
- private void onSelectionEntry (object o, EventArgs args)
+ private void app1s_onSelectionEntry (object o, EventArgs args)
{
TreeModel model;
TreeIter iter;
- selected = "-1";
+ app1s_selected = "-1";
if (((TreeSelection)o).GetSelected(out model, out iter)) {
- selected = (string)model.GetValue (iter, 0);
- button_accept.Sensitive = true;
- button_import.Sensitive = true;
+ app1s_selected = (string)model.GetValue (iter, 0);
+ app1s_button_accept.Sensitive = true;
+ app1s_button_import.Sensitive = true;
} else {
- button_accept.Sensitive = false;
- button_import.Sensitive = false;
+ app1s_button_accept.Sensitive = false;
+ app1s_button_import.Sensitive = false;
}
}
- public int CurrentSessionId() {
+ //TODO: do not need to be public ? maybe for import
+ public int app1s_CurrentSessionId() {
TreeModel model;
TreeIter iter;
- if (treeview_session_load.Selection.GetSelected (out model, out iter)) {
+ if (app1s_treeview_session_load.Selection.GetSelected (out model, out iter)) {
string selected = (string)model.GetValue (iter, 0);
return Convert.ToInt32 (selected.Split (':')[0]);
}
return -1;
}
- public string ImportDatabasePath() {
- return import_file_path;
+ //TODO: do not need to be public ? maybe for import
+ public string app1s_ImportDatabasePath() {
+ return app1s_import_file_path;
}
- public bool ImportToNewSession() {
- return radio_import_new_session.Active;
+ //TODO: do not need to be public ? maybe for import
+ public bool app1s_ImportToNewSession() {
+ return app1s_radio_import_new_session.Active;
}
- public void DisableImportToCurrentSession() {
- radio_import_new_session.Active = true;
- radio_import_current_session.Sensitive = false;
+ private void app1s_radio_import_new_current_sensitive ()
+ {
+ if(currentSession == null)
+ {
+ app1s_radio_import_new_session.Active = true;
+ app1s_radio_import_current_session.Sensitive = false;
+ } else
+ app1s_radio_import_current_session.Sensitive = true;
}
- public void LabelImportSessionName (string str)
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_LabelImportSessionName (string str)
{
- label_import_session_name.Text = str;
+ app1s_label_import_session_name.Text = str;
}
- public void LabelImportFile (string str)
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_LabelImportFile (string str)
{
- label_import_file.Text = str;
+ app1s_label_import_file.Text = str;
}
- public void Pulse(string str)
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_Pulse(string str)
{
- progressbarImport.Pulse();
- progressbarImport.Text = str;
+ app1s_progressbarImport.Pulse();
+ app1s_progressbarImport.Text = str;
}
- public void PulseEnd()
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_PulseEnd()
{
- progressbarImport.Fraction = 1;
- hbuttonbox_page3.Sensitive = true;
+ app1s_progressbarImport.Fraction = 1;
+ app1s_hbuttonbox_page4.Sensitive = true;
}
- public void ShowLabelImportedOk()
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_ShowLabelImportedOk()
{
- if(radio_import_new_session.Active)
- label_import_done_at_new_session.Visible = true;
+ if(app1s_radio_import_new_session.Active)
+ app1s_label_import_done_at_new_session.Visible = true;
else
- label_import_done_at_current_session.Visible = true;
+ app1s_label_import_done_at_current_session.Visible = true;
}
- public void ShowImportError(string str)
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_ShowImportError(string str)
{
- scrolledwindow_import_error.Visible = true;
- textview_import_error.Buffer.Text = str;
+ app1s_scrolledwindow_import_error.Visible = true;
+ app1s_textview_import_error.Buffer.Text = str;
}
- public void NotebookPage(int i)
+ //TODO: do not need to be public ? maybe for import
+ public void app1s_NotebookPage(int i)
{
- if(i == PAGE_IMPORT_RESULT)
- hbuttonbox_page3.Sensitive = false;
+ if(i == app1s_PAGE_IMPORT_RESULT)
+ app1s_hbuttonbox_page4.Sensitive = false;
- notebook_import.CurrentPage = i;
+ app1s_notebook.CurrentPage = i;
}
- //import notebook page 0 buttons
- void on_button_cancel0_clicked (object o, EventArgs args)
+ private void notebook_supSetOldPage()
{
- /*
- SessionLoadWindowBox.session_load.Hide();
- SessionLoadWindowBox = null;
- */
- fakeButton_cancel_maybeDatabaseSwitched.Click();
+ notebook_sup.CurrentPage = app1s_notebook_sup_entered_from;
+
+ //but if it is start page, ensure notebook_start_selector is 0
+ if(notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.START))
+ notebook_start_selector.CurrentPage = 0;
}
- protected void on_button_select_file_import_clicked(object o, EventArgs args) {
- chooseDatabaseToImport ();
+
+ // ---- notebook page 0 buttons ----
+ void app1s_on_button_close0_clicked (object o, EventArgs args)
+ {
+ menus_sensitive_import_not_danger(true);
+ notebook_supSetOldPage();
}
- protected void on_button_select_file_import_same_database_clicked(object o, EventArgs args) {
- notebook_import.CurrentPage = PAGE_SELECT_SESSION;
+
+ // ---- notebook page 1 buttons ----
+ void app1s_on_button_cancel1_clicked (object o, EventArgs args)
+ {
+ app1s_notebook.CurrentPage = app1s_PAGE_MODES;
+ reloadSession(); //explained at top of the file.
+ }
+ protected void app1s_on_button_select_file_import_clicked(object o, EventArgs args) {
+ app1s_chooseDatabaseToImport ();
+ }
+ protected void app1s_on_button_select_file_import_same_database_clicked(object o, EventArgs args) {
+ app1s_notebook.CurrentPage = app1s_PAGE_SELECT_SESSION;
}
- //import notebook page 1 (load sesion) buttons
- void on_button_cancel1_clicked (object o, EventArgs args)
+ // ---- notebook page 2 (load sesion) buttons ----
+ void app1s_on_button_cancel2_clicked (object o, EventArgs args)
{
- SessionLoadWindowBox.session_load.Hide();
- SessionLoadWindowBox = null;
+ notebook_supSetOldPage();
}
- void on_row_double_clicked (object o, Gtk.RowActivatedArgs args)
+ void app1s_on_row_double_clicked (object o, Gtk.RowActivatedArgs args)
{
TreeView tv = (TreeView) o;
TreeModel model;
TreeIter iter;
- LogB.Information("double! type: " + type.ToString());
+ LogB.Information("double! type: " + app1s_type.ToString());
if (tv.Selection.GetSelected (out model, out iter)) {
//put selection in selected
- selected = (string) model.GetValue (iter, 0);
+ app1s_selected = (string) model.GetValue (iter, 0);
- if (type == WindowType.LOAD_SESSION) {
+ if (app1s_type == app1s_windowType.LOAD_SESSION) {
//activate on_button_accept_clicked()
- button_accept.Activate();
+ app1s_button_accept.Activate();
} else {
- button_import.Activate();
+ app1s_button_import.Activate();
}
}
}
- void on_button_accept_clicked (object o, EventArgs args)
+ void app1s_on_button_accept_clicked (object o, EventArgs args)
{
- if(selected != "-1") {
- currentSession = SqliteSession.Select (selected);
- SessionLoadWindowBox.session_load.Hide();
- SessionLoadWindowBox = null;
+ if(app1s_selected != "-1")
+ {
+ currentSession = SqliteSession.Select (app1s_selected);
+ on_load_session_accepted();
+ notebook_supSetOldPage();
}
}
- //import notebook page 1 (import) buttons
- void on_button_back_clicked (object o, EventArgs args)
+ // ---- notebook page 3 (import) buttons ----
+ void app1s_on_button_back_clicked (object o, EventArgs args)
{
- notebook_import.CurrentPage = PAGE_IMPORT_START;
+ app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_START;
}
- void on_button_import_clicked (object o, EventArgs args)
+ void app1s_on_button_import_clicked (object o, EventArgs args)
{
- if(selected != "-1") {
- currentSession = SqliteSession.Select (selected);
+ if(app1s_selected != "-1") {
+ currentSession = SqliteSession.Select (app1s_selected);
+ on_load_session_accepted_to_import(o, args);
}
}
- //import notebook page 2 buttons
- private void on_button_import_confirm_back_clicked(object o, EventArgs args)
- {
- notebook_import.CurrentPage = PAGE_IMPORT_START;
- }
- private void on_button_import_confirm_accept_clicked(object o, EventArgs args)
- {
- hbuttonbox_page3.Sensitive = false;
- notebook_import.CurrentPage = PAGE_IMPORT_RESULT;
- }
-
- //import notebook page 3 buttons
- private void on_button_import_close_clicked(object o, EventArgs args)
+ // ---- notebook page 4 buttons ----
+ private void app1s_on_button_import_confirm_back_clicked(object o, EventArgs args)
{
- SessionLoadWindowBox.session_load.Hide();
- SessionLoadWindowBox = null;
+ app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_START;
}
- private void on_button_import_again_clicked(object o, EventArgs args)
+ private void app1s_on_button_import_confirm_accept_clicked(object o, EventArgs args)
{
- label_import_done_at_new_session.Visible = false;
- label_import_done_at_current_session.Visible = false;
- scrolledwindow_import_error.Visible = false;
-
- label_open_database_file.Text = Catalog.GetString("Open another database");
- button_select_file_import_same_database.Visible = true;
-
- notebook_import.CurrentPage = PAGE_IMPORT_START;
+ app1s_hbuttonbox_page4.Sensitive = false;
+ app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_RESULT;
+ importSessionFromDatabasePrepare2 (new object(), new EventArgs());
}
-
- void on_session_load_delete_event (object o, DeleteEventArgs args)
+ //import notebook page 4 buttons
+ private void app1s_on_button_import_close_clicked(object o, EventArgs args)
{
- if (type == WindowType.LOAD_SESSION) {
- SessionLoadWindowBox.session_load.Hide();
- SessionLoadWindowBox = null;
- } else {
- //read fakeButton_cancel_maybeDatabaseSwitched comment on the top of this file
-
- args.RetVal = true;
- fakeButton_cancel_maybeDatabaseSwitched.Click();
- }
+ app1s_notebook.CurrentPage = app1s_PAGE_MODES;
}
-
- public void HideAndNull()
+ private void app1s_on_button_import_again_clicked(object o, EventArgs args)
{
- if(SessionLoadWindowBox.session_load != null)
- SessionLoadWindowBox.session_load.Hide();
+ app1s_label_import_done_at_new_session.Visible = false;
+ app1s_label_import_done_at_current_session.Visible = false;
+ app1s_scrolledwindow_import_error.Visible = false;
- SessionLoadWindowBox = null;
- }
+ app1s_radio_import_new_current_sensitive();
+ app1s_label_open_database_file.Text = Catalog.GetString("Open another database");
+ app1s_button_select_file_import_same_database.Visible = true;
- public Button FakeButton_cancel_maybeDatabaseSwitched
- {
- get { return fakeButton_cancel_maybeDatabaseSwitched; }
+ app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_START;
}
- public Button Button_accept
- {
- set { button_accept = value; }
- get { return button_accept; }
- }
- public Button Button_import
+ public Button app1s_Button_accept
{
- get { return button_import; }
+ set { app1s_button_accept = value; }
+ get { return app1s_button_accept; }
}
- public Button Button_import_confirm_accept
- {
- get { return button_import_confirm_accept; }
- }
-
- public Session CurrentSession
- {
- get { return currentSession; }
- }
-
}
diff --git a/src/gui/webcam.cs b/src/gui/webcam.cs
index 0f0e4419..9f0d40ec 100644
--- a/src/gui/webcam.cs
+++ b/src/gui/webcam.cs
@@ -488,13 +488,16 @@ public partial class ChronoJumpWindow
*/
//at what tab of notebook_sup there's the video_capture
- private int video_capture_notebook_sup = 1;
+ private int video_capture_notebook_sup = Convert.ToInt32(notebook_sup_pages.CONTACTS);
//changed by user clicking on notebook tabs
private void on_notebook_sup_switch_page (object o, SwitchPageArgs args) {
if(
- (notebook_sup.CurrentPage == 1 && video_capture_notebook_sup == 2) ||
- (notebook_sup.CurrentPage == 2 && video_capture_notebook_sup == 1))
+ (notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.CONTACTS) &&
+ video_capture_notebook_sup == Convert.ToInt32(notebook_sup_pages.ENCODER))
+ ||
+ (notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.ENCODER) &&
+ video_capture_notebook_sup == Convert.ToInt32(notebook_sup_pages.CONTACTS)))
{
//first stop showing video
bool wasActive = false;
@@ -503,7 +506,7 @@ public partial class ChronoJumpWindow
checkbutton_video_contacts.Active = false;
}
- if(notebook_sup.CurrentPage == 1) {
+ if(notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.CONTACTS)) {
/*
* TODO:
//remove video capture from encoder tab
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
