commit 974384c35caf66d30c29da78d27cd834035cdd1c
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jul 21 11:27:17 2021 +0200
left menu/sidebar converted to 1 unified session/person sidebar
glade/app1.glade | 1025 ++++++++++++++-------------------
src/gui/app1/chronojump.cs | 41 +-
src/gui/app1/chronojumpPersons.cs | 5 +-
src/gui/app1/contactsExercise.cs | 4 +-
src/gui/app1/encoder.cs | 4 +-
src/gui/app1/forceSensor.cs | 3 -
src/gui/app1/forceSensorAnalyze.cs | 1 -
src/gui/app1/menu.cs | 52 +-
src/gui/app1/runEncoder.cs | 1 -
src/gui/app1/session/addEdit.cs | 4 +
src/gui/app1/session/loadAndImport.cs | 3 -
src/gui/chronojumpImporter.cs | 3 -
12 files changed, 446 insertions(+), 700 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index ed32f5e21..cc13e3c77 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -437,174 +437,45 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkAlignment" id="alignment_viewport_menu_top">
+ <widget class="GtkAlignment" id="alignment_session_persons">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">4</property>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">2</property>
<child>
- <widget class="GtkViewport" id="viewport_menu_top">
+ <widget class="GtkVBox" id="vbox61">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="shadow_type">none</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkVBox" id="vbox12">
+ <widget class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkAlignment"
id="alignment_buttons_menu_and_persons">
+ <widget class="GtkVBox" id="vbox173">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">3</property>
- <property name="left_padding">3</property>
- <property name="right_padding">2</property>
<child>
- <widget class="GtkHBox" id="hbox_radio_show_menu_and_persons">
+ <widget class="GtkVBox" id="vbox_menu_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkRadioButton" id="radio_show_menu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Open
menu</property>
- <property name="yalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <signal name="toggled"
handler="on_radio_show_menu_toggled" swapped="no"/>
- <accelerator key="m" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_radio_show_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_radio_show_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <widget class="GtkRadioButton" id="radio_show_persons">
+ <widget class="GtkCheckButton" id="check_menu_session">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="yalign">0</property>
+ <property name="tooltip"
translatable="yes">Session</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
- <property name="group">radio_show_menu</property>
- <signal name="toggled"
handler="on_radio_show_persons_toggled" swapped="no"/>
+ <signal name="clicked"
handler="on_check_menu_session_clicked" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_radio_show_persons">
+ <widget class="GtkEventBox"
id="eventbox_check_menu_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox385">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_radio_show_persons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_radio_show_persons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Persons</property>
- </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">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment_person">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">2</property>
- <property name="bottom_padding">2</property>
- <property name="left_padding">2</property>
- <property name="right_padding">2</property>
- <child>
- <widget class="GtkVBox" id="vbox61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkViewport" id="viewport_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkAlignment" id="alignment29">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">14</property>
- <child>
- <widget class="GtkVBox" id="vbox173">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkVBox" id="vbox_menu_session">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkCheckButton"
id="check_menu_session">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Session</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_menu_session_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_session">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox369">
+ <widget class="GtkHBox" id="hbox369">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -666,30 +537,30 @@
<property name="position">2</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_session_options">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">16</property>
- <child>
- <widget class="GtkVBox"
id="vbox_manage_sessions">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_menu_session_new">
+ </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_session_options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">16</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_manage_sessions">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_new">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -735,15 +606,15 @@
</child>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_load">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_load">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -789,15 +660,15 @@
</child>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_session_more">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_more">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -842,288 +713,84 @@
</child>
</widget>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_preferences">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Preferences</property>
- <signal name="clicked"
handler="on_preferences_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_preferences">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox331">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_menu_preferences">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_menu_preferences">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Preferences</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>
- <child>
- <widget class="GtkButton" id="button_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_menu_help_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox370">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Help</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>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_menu_news">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_menu_news_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_news">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox297">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_menu_news">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_menu_news">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Latest
products</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_exit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Exit</property>
- <signal name="clicked"
handler="on_quit1_activate" swapped="no"/>
- <accelerator key="q" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_exit">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox364">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage" id="image_menu_quit">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_menu_quit">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Exit</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>
- <child>
- <widget class="GtkButton"
id="button_menu_guiTest">
- <property name="label">Gui test start</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_gui_tests_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- </widget>
+ </packing>
</child>
</widget>
</child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_menu_guiTest">
+ <property name="label">Gui test start</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_gui_tests_clicked"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment44">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">1</property>
+ <property name="bottom_padding">1</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">2</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkViewport" id="viewport_persons">
+ <widget class="GtkFrame" id="frame_exhibition">
<property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkFrame" id="frame_persons">
+ <widget class="GtkAlignment" id="alignment83">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
<child>
- <widget class="GtkAlignment" id="alignment52">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkVBox" id="vbox66">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkFrame" id="frame_exhibition">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">1</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkAlignment" id="alignment44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
- <child>
- <widget class="GtkVBox" id="vbox62">
+ <widget class="GtkVBox" id="vbox81">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
@@ -1838,39 +1505,39 @@
<property name="position">3</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">label_item</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="GtkFrame" id="frame_persons_top">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">1</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkHBox" id="hbox167">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkVBox" id="vbox83">
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</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="GtkFrame" id="frame_persons_top">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkHBox" id="hbox167">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox83">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">2</property>
<child>
<widget class="GtkHBox" id="hbox_persons_top">
<property name="visible">True</property>
@@ -1878,7 +1545,6 @@
<property name="spacing">8</property>
<child>
<widget class="GtkButton"
id="button_manage_persons">
- <property name="height_request">40</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -1906,7 +1572,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label22">
+ <widget class="GtkLabel" id="label128">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Manage</property>
@@ -2030,7 +1696,7 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment83">
+ <widget class="GtkAlignment" id="alignment86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">4</property>
@@ -2419,77 +2085,77 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">label_item</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="GtkScrolledWindow"
id="scrolledwindow24">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView"
id="treeview_persons">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="enable_search">False</property>
- <property name="show_expanders">False</property>
- <signal name="button_release_event"
handler="on_treeview_button_release_event" swapped="no"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox_persons_bottom">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkHBox"
id="hbox_persons_bottom_photo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkImage"
id="image_current_person">
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</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="GtkScrolledWindow" id="scrolledwindow24">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkTreeView" id="treeview_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="enable_search">False</property>
+ <property name="show_expanders">False</property>
+ <signal name="button_release_event"
handler="on_treeview_button_release_event" swapped="no"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox_persons_bottom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkHBox" id="hbox_persons_bottom_photo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <widget class="GtkImage" id="image_current_person">
<property name="width_request">150</property>
<property name="height_request">150</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox172">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox172">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -2591,37 +2257,37 @@
<property name="position">3</property>
</packing>
</child>
- </widget>
- <packing>
+ </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">0</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="GtkHBox"
id="hbox_persons_raspberry">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox129">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_persons_raspberry_left">
+ </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">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_persons_raspberry">
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox129">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_persons_raspberry_left">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2633,15 +2299,15 @@
<property name="arrow_type">left</property>
</widget>
</child>
- </widget>
- <packing>
+ </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_persons_raspberry_right">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_persons_raspberry_right">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2652,64 +2318,187 @@
<property name="can_focus">False</property>
</widget>
</child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">4</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">label_item</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>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Persons</property>
+ <property name="use_markup">True</property>
+ </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">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox340">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox533">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkButton" id="button_menu_preferences">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Preferences</property>
+ <signal name="clicked" handler="on_preferences_activate"
swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_preferences">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_preferences">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </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="button_menu_help">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_menu_help_clicked"
swapped="no"/>
+ <child>
+ <widget class="GtkEventBox" id="eventbox_button_menu_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_menu_news">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_menu_news_clicked"
swapped="no"/>
+ <child>
+ <widget class="GtkEventBox" id="eventbox_button_menu_news">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_news">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_menu_exit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Exit</property>
+ <signal name="clicked" handler="on_quit1_activate"
swapped="no"/>
+ <accelerator key="q" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkEventBox" id="eventbox_button_menu_exit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_quit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</widget>
</child>
</widget>
<packing>
- <property name="resize">False</property>
+ <property name="resize">True</property>
<property name="shrink">False</property>
</packing>
</child>
@@ -25787,6 +25576,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>
@@ -41350,6 +41151,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>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index cc219222f..1caf69e8b 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2620,6 +2620,8 @@ public partial class ChronoJumpWindow
private void on_new_activate (object o, EventArgs args)
{
LogB.Information("new session");
+
+ menus_and_mode_sensitive (false);
app1s_notebook_sup_entered_from = notebook_sup.CurrentPage;
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.SESSION);
sessionAddEditShow (App1saeModes.ADDSESSION);
@@ -2671,6 +2673,7 @@ public partial class ChronoJumpWindow
//serverUniqueID is undefined until session is updated
currentSession.ServerUniqueID = Constants.ServerUndefinedID;
+ menus_and_mode_sensitive (true);
setApp1Title(currentSession.Name, current_menuitem_mode);
if(createdStatsWin) {
@@ -2693,13 +2696,6 @@ public partial class ChronoJumpWindow
sensitiveGuiNoPerson();
currentPerson = null;
-
- if( ! configChronojump.PersonWinHide) {
- alignment_buttons_menu_and_persons.Visible = true;
- //on_radio_show_persons_clicked (new object (), new EventArgs ());
- radio_show_persons.Active = true;
- }
-
definedSession = true;
//for sure, jumpsExists is false, because we create a new session
@@ -2758,6 +2754,7 @@ public partial class ChronoJumpWindow
private void on_open_activate (object o, EventArgs args)
{
LogB.Information("open session");
+
//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;
@@ -2792,18 +2789,8 @@ public partial class ChronoJumpWindow
sensitiveGuiNoSession();
sensitiveGuiYesSession();
- if( ! configChronojump.PersonWinHide) {
- alignment_buttons_menu_and_persons.Visible = true;
- radio_show_menu_and_persons_adjust_height(
- UtilGtk.ColorIsOkWithLogoTransparent(UtilGtk.ColorParse(
- preferences.colorBackgroundString)));
-
- //on_radio_show_persons_clicked (new object (), new EventArgs ());
- radio_show_persons.Active = true;
- }
-
definedSession = true;
-
+
hbox_persons_bottom_photo.Sensitive = false;
hbox_persons_bottom_no_photo.Sensitive = false;
LogB.Information("foundPersons: " + foundPersons.ToString());
@@ -2976,13 +2963,6 @@ public partial class ChronoJumpWindow
configInitFromPreferences();
- if( ! configChronojump.PersonWinHide && currentSession != null) {
- alignment_buttons_menu_and_persons.Visible = true;
- //on_radio_show_persons_clicked (new object (), new EventArgs ());
- radio_show_persons.Active = true;
- }
-
-
if(repetitiveConditionsWin != null)
{
repetitiveConditionsWin.VolumeOn = preferences.volumeOn;
@@ -3636,13 +3616,6 @@ public partial class ChronoJumpWindow
//show the program
notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
- //show persons
- if( currentSession != null && ! configChronojump.PersonWinHide) {
- alignment_buttons_menu_and_persons.Visible = true;
- //on_radio_show_persons_clicked (new object (), new EventArgs ());
- radio_show_persons.Active = true;
- }
-
if(m != Constants.Menuitem_modes.POWERGRAVITATORY && m !=
Constants.Menuitem_modes.POWERINERTIAL)
{
//don't change threshold if changing from jumpssimple to jumpsreactive ...
@@ -7711,9 +7684,6 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiNoSession ()
{
- viewport_persons.Visible = false;
- //treeview_persons.Sensitive = false;
-
//menuitems
menuSessionSensitive(false);
menuPersonSelectedSensitive(false);
@@ -7753,7 +7723,6 @@ LogB.Debug("mc finished 5");
private void sensitiveGuiYesSession ()
{
button_image_test_zoom.Sensitive = true;
- viewport_persons.Visible = true;
frame_persons.Sensitive = true;
button_recuperate_person.Sensitive = true;
button_recuperate_persons_from_session.Sensitive = true;
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index 32dcb905e..e75e808f9 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -31,6 +31,7 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
+ [Widget] Gtk.Alignment alignment_session_persons;
[Widget] Gtk.VBox vbox_manage_persons;
[Widget] Gtk.Arrow arrow_manage_persons_up;
[Widget] Gtk.Arrow arrow_manage_persons_down;
@@ -42,10 +43,10 @@ public partial class ChronoJumpWindow
if(onTop)
{
- alignment_viewport_menu_top.Visible = false;
+ alignment_session_persons.Visible = false;
vbox_menu_tiny.Visible = true;
} else {
- alignment_viewport_menu_top.Visible = true;
+ alignment_session_persons.Visible = true;
vbox_menu_tiny.Visible = false;
}
}
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index db174ba70..a67e86455 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -31,7 +31,7 @@ public partial class ChronoJumpWindow
menus_and_mode_sensitive(false);
notebook_contacts_capture_doing_wait.Sensitive = false;
hbox_contacts_device_adjust_threshold.Sensitive = false;
- viewport_persons.Sensitive = false;
+ frame_persons.Sensitive = false;
button_contacts_exercise.Sensitive = false;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = false;
hbox_top_person.Sensitive = false;
@@ -44,7 +44,7 @@ public partial class ChronoJumpWindow
menus_and_mode_sensitive(true);
notebook_contacts_capture_doing_wait.Sensitive = true;
hbox_contacts_device_adjust_threshold.Sensitive = true;
- viewport_persons.Sensitive = true;
+ frame_persons.Sensitive = true;
button_contacts_exercise.Sensitive = true;
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = true;
hbox_top_person.Sensitive = true;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 7dc5d93f4..72ad0b280 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -4130,7 +4130,7 @@ public partial class ChronoJumpWindow
frame_encoder_analyze_options.Visible = ! s;
table_encoder_analyze_options.Sensitive = s;
- viewport_persons.Sensitive = s;
+ frame_persons.Sensitive = s;
menus_and_mode_sensitive(s);
hbox_encoder_sup_capture_analyze_two_buttons.Sensitive = s;
hbox_top_person_encoder.Sensitive = s;
@@ -5120,7 +5120,7 @@ public partial class ChronoJumpWindow
menus_and_mode_sensitive(! show);
hbox_encoder_sup_capture_analyze.Sensitive = ! show;
- viewport_persons.Sensitive = ! show;
+ frame_persons.Sensitive = ! show;
hbox_encoder_configuration.Sensitive = ! show;
hbox_encoder_capture_top.Sensitive = ! show;
vpaned_encoder_capture_video_and_set_graph.Sensitive = ! show;
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 6b40ac8cb..c7fbbb905 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -524,7 +524,6 @@ public partial class ChronoJumpWindow
//other gui buttons
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = sensitive;
frame_persons.Sensitive = sensitive;
- viewport_persons.Sensitive = sensitive;
menus_and_mode_sensitive(sensitive);
hbox_top_person.Sensitive = sensitive;
@@ -2950,9 +2949,7 @@ LogB.Information(" fs R ");
button_execute_test.Sensitive = (s && currentPerson != null && currentPerson.UniqueID > 0 &&
currentSession != null);
button_force_sensor_image_save_signal.Sensitive = s;
- viewport_persons.Sensitive = s;
menus_and_mode_sensitive(s);
-
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = s;
hbox_top_person.Sensitive = s;
}
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 69fe5ef03..9056af569 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -181,7 +181,6 @@ public partial class ChronoJumpWindow
button_force_sensor_analyze_analyze.Sensitive = false;
}
- viewport_persons.Sensitive = s;
menus_and_mode_sensitive(s);
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = s;
hbox_top_person.Sensitive = s;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 1b9a55604..5a08328f4 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -28,23 +28,13 @@ using System.Collections.Generic; //List
public partial class ChronoJumpWindow
{
- [Widget] Gtk.Alignment alignment_buttons_menu_and_persons;
[Widget] Gtk.Arrow arrow_menu_show_session_up;
[Widget] Gtk.Arrow arrow_menu_show_session_down;
- [Widget] Gtk.HBox hbox_radio_show_menu_and_persons;
- [Widget] Gtk.RadioButton radio_show_menu;
- [Widget] Gtk.RadioButton radio_show_persons;
[Widget] Gtk.HPaned hpaned_contacts_main;
- [Widget] Gtk.Alignment alignment_viewport_menu_top;
[Widget] Gtk.Viewport viewport_send_log;
[Widget] Gtk.Viewport viewport_exit_confirm;
[Widget] Gtk.Viewport viewport_social_network_poll;
[Widget] Gtk.Viewport viewport_start_modes;
- [Widget] Gtk.Viewport viewport_menu_top;
- [Widget] Gtk.Viewport viewport_menu;
- [Widget] Gtk.Viewport viewport_persons;
- [Widget] Gtk.EventBox eventbox_radio_show_menu;
- [Widget] Gtk.EventBox eventbox_radio_show_persons;
[Widget] Gtk.EventBox eventbox_check_menu_session;
[Widget] Gtk.EventBox eventbox_button_menu_session_new;
[Widget] Gtk.EventBox eventbox_button_menu_session_load;
@@ -82,8 +72,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_export_csv1;
//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;
@@ -107,13 +95,12 @@ public partial class ChronoJumpWindow
private void menus_and_mode_sensitive(bool sensitive)
{
- alignment_buttons_menu_and_persons.Sensitive = sensitive;
- viewport_menu.Sensitive = sensitive;
+ LogB.Information("menus_and_mode_sensitive: " + sensitive.ToString());
+
vbox_menu_tiny_menu.Sensitive = sensitive;
+ alignment_session_persons.Sensitive = sensitive;
- //button_show_modes_contacts.Sensitive = sensitive;
hbox_change_modes_contacts.Sensitive = sensitive;
- //button_show_modes_encoder.Sensitive = sensitive;
hbox_change_modes_encoder.Sensitive = sensitive;
}
@@ -186,12 +173,12 @@ public partial class ChronoJumpWindow
LogB.Information(string.Format("hbox_rest_time: {0}", hbox_rest_time.SizeRequest().Width));
*/
- if(viewport_persons.SizeRequest().Width +4 +6 > maxWidth)
- maxWidth = viewport_persons.SizeRequest().Width +4 + 6; //+4 due to alignment_person,
+6 to alignment_viewport_menu_top
+// if(viewport_persons.SizeRequest().Width +4 +6 > maxWidth)
+// maxWidth = viewport_persons.SizeRequest().Width +4 + 6; //+4 due to alignment_person,
+6 to alignment_viewport_menu_top
//if(frame_persons.SizeRequest().Width > maxWidth)
// maxWidth = frame_persons.SizeRequest().Width;
- viewport_menu_top.SetSizeRequest(maxWidth, -1); //-1 is height
+// viewport_menu_top.SetSizeRequest(maxWidth, -1); //-1 is height
if(! Config.UseSystemColor && UtilGtk.ColorIsOkWithLogoTransparent
(UtilGtk.ColorParse(preferences.colorBackgroundString)))
{
@@ -199,16 +186,18 @@ public partial class ChronoJumpWindow
image_logo_contacts_transp.Visible = true;
image_logo_encoder.Visible = false;
image_logo_encoder_transp.Visible = true;
- radio_show_menu_and_persons_adjust_height(true);
+// radio_show_menu_and_persons_adjust_height(true);
} else {
image_logo_contacts.Visible = true;
image_logo_contacts_transp.Visible = false;
image_logo_encoder.Visible = true;
image_logo_encoder_transp.Visible = false;
- radio_show_menu_and_persons_adjust_height(false);
+// radio_show_menu_and_persons_adjust_height(false);
}
}
+ /*
+ unused on 2.1.3 but maybe use it for menu session
private void radio_show_menu_and_persons_adjust_height(bool toTransparentImage)
{
if(toTransparentImage)
@@ -218,6 +207,7 @@ public partial class ChronoJumpWindow
hbox_radio_show_menu_and_persons.SetSizeRequest
(-1, image_logo_contacts.SizeRequest().Height);
}
+ */
private void menuSetTextAndIcons ()
{
@@ -249,17 +239,8 @@ public partial class ChronoJumpWindow
UtilGtk.ViewportColor(viewport_send_log, color);
UtilGtk.ViewportColor(viewport_exit_confirm, color);
UtilGtk.ViewportColor(viewport_social_network_poll, color);
- UtilGtk.ViewportColor(viewport_menu_top, color);
- UtilGtk.ViewportColor(viewport_menu, color);
}
- //UtilGtk.ViewportColor(viewport_menu, UtilGtk.BLUE_CLEAR2);
- //UtilGtk.ViewportColor(viewport_menu, UtilGtk.YELLOW);
- //UtilGtk.ViewportColor(viewport_menu, UtilGtk.GRAY_LIGHT);
- //UtilGtk.ViewportColor(viewport_persons, UtilGtk.BLUE_CLEAR2);
-
- UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_show_menu, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_show_persons, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_session, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_preferences, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
@@ -277,17 +258,6 @@ public partial class ChronoJumpWindow
a_down.Visible = ! selected;
}
- private void on_radio_show_menu_toggled (object o, EventArgs args)
- {
- viewport_menu.Visible = true;
- viewport_persons.Visible = false;
- }
- private void on_radio_show_persons_toggled (object o, EventArgs args)
- {
- viewport_menu.Visible = false;
- viewport_persons.Visible = (currentSession != null);
- }
-
private void on_check_menu_session_clicked (object o, EventArgs args)
{
menuShowVerticalArrow (check_menu_session.Active, arrow_menu_show_session_up,
arrow_menu_show_session_down);
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 13e2d3584..7bfb10749 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1624,7 +1624,6 @@ public partial class ChronoJumpWindow
hbox_contacts_camera.Sensitive = sensitive;
//other gui buttons
- viewport_persons.Sensitive = sensitive;
menus_and_mode_sensitive(sensitive);
hbox_contacts_sup_capture_analyze_two_buttons.Sensitive = sensitive;
diff --git a/src/gui/app1/session/addEdit.cs b/src/gui/app1/session/addEdit.cs
index 86cce560a..8c37320e6 100644
--- a/src/gui/app1/session/addEdit.cs
+++ b/src/gui/app1/session/addEdit.cs
@@ -64,6 +64,7 @@ public partial class ChronoJumpWindow
private void sessionAddEditShow (App1saeModes mode)
{
LogB.Information("sessionAddEditShow, " + mode.ToString());
+
app1s_notebook.CurrentPage = app1s_PAGE_ADD_EDIT;
app1sae_notebook_add_edit.CurrentPage = 0;
@@ -550,7 +551,10 @@ public partial class ChronoJumpWindow
void app1sae_on_button_cancel_clicked (object o, EventArgs args)
{
if(app1sae_mode == App1saeModes.ADDSESSION)
+ {
+ menus_and_mode_sensitive (true); //because we go to main gui, not needed on
EDITCURRENTSESSION or EDITOTHERSESSION
notebook_supSetOldPage();
+ }
else if(app1sae_mode == App1saeModes.EDITCURRENTSESSION)
app1s_notebook.CurrentPage = app1s_PAGE_MODES;
else { //(app1sae_mode == App1saeModes.EDITOTHERSESSION)
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index 116b0c940..63efd404c 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -718,9 +718,6 @@ public partial class ChronoJumpWindow
app1s_notebook.CurrentPage = app1s_PAGE_MODES;
reloadSession(); //explained at top of the file.
- //but after reloading session do not show persons, show menu:
- radio_show_menu.Toggle();
- radio_show_menu.Active = true;
//to not allow to load a session or create a new session until close session/more
menus_sensitive_import_not_danger(false);
diff --git a/src/gui/chronojumpImporter.cs b/src/gui/chronojumpImporter.cs
index acb797ab4..4acb47c8c 100644
--- a/src/gui/chronojumpImporter.cs
+++ b/src/gui/chronojumpImporter.cs
@@ -106,9 +106,6 @@ public partial class ChronoJumpWindow
app1s_ImportPulse(chronojumpImporter.MessageToPulsebar);
app1s_ImportPulseEnd();
- //do not show persons, show menu:
- radio_show_menu.Toggle();
- radio_show_menu.Active = true;
//to not allow to load a session or create a new session until close session/more
menus_sensitive_import_not_danger(false);