commit 805a99138d249ca79345c15935d0a2a8d5a66dc0
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Oct 13 12:06:37 2022 +0200
Persons management moved to the center of the screen
glade/app1.glade | 1484 +++++++++++++++++++++----------------
src/gui/app1/chronojump.cs | 11 +-
src/gui/app1/chronojumpPersons.cs | 2 -
src/gui/app1/icons.cs | 1 +
src/gui/app1/menu.cs | 62 +-
5 files changed, 885 insertions(+), 675 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index f8cdeae64..21d7557e8 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -588,7 +588,7 @@
<property name="receives_default">False</property>
<property name="tooltip"
translatable="yes">Session</property>
<property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_menu_session_or_persons_clicked" swapped="no"/>
+ <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>
@@ -914,51 +914,44 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox91">
+ <widget class="GtkHBox" id="hbox105">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox373">
+ <widget class="GtkHBox" id="hbox573">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">25</property>
<child>
- <widget class="GtkCheckButton"
id="check_manage_persons">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_menu_session_or_persons_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_check_manage_persons">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox386">
+ <widget class="GtkHBox" id="hbox583">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_persons_manage">
+ <widget class="GtkButton" id="button_persons_up">
<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>
+ <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">Select previous person</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_treeview_persons_up" swapped="no"/>
+ <accelerator key="Up" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
<child>
- <widget class="GtkHBox" id="hbox390">
+ <widget class="GtkEventBox"
id="eventbox_persons_up">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkArrow"
id="arrow_manage_persons_up">
+ <widget class="GtkArrow" id="arrow_up2">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="arrow_type">up</property>
</widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -966,16 +959,28 @@
</packing>
</child>
<child>
- <widget class="GtkArrow"
id="arrow_manage_persons_down">
+ <widget class="GtkButton"
id="button_persons_down">
+ <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">Select next person</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_treeview_persons_down" swapped="no"/>
+ <accelerator key="Down" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_persons_down">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkArrow" id="arrow_down2">
<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>
</child>
</widget>
<packing>
@@ -984,10 +989,6 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
- </child>
- </widget>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -996,64 +997,58 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox385">
+ <widget class="GtkCheckButton"
id="check_manage_persons">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_manage_persons_clicked" swapped="no"/>
<child>
- <widget class="GtkButton" id="button_persons_up">
+ <widget class="GtkEventBox"
id="eventbox_check_manage_persons">
<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">Select previous person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_treeview_persons_up" swapped="no"/>
- <accelerator key="Up" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkEventBox"
id="eventbox_persons_up">
+ <widget class="GtkHBox" id="hbox581">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkArrow" id="arrow_up1">
+ <widget class="GtkImage"
id="image_persons_manage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </widget>
- </child>
- </widget>
- </child>
+ <property
name="stock">gtk-missing-image</property>
</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">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_persons_down">
- <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">Select next person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_treeview_persons_down" swapped="no"/>
- <accelerator key="Down" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_persons_down">
+ <widget class="GtkHBox" id="hbox582">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkArrow" id="arrow_down1">
- <property name="visible">True</property>
+ <widget class="GtkArrow"
id="arrow_manage_persons_left">
<property name="can_focus">False</property>
- <property name="arrow_type">down</property>
+ <property name="arrow_type">left</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_manage_persons_right">
+ <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">2</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1062,6 +1057,10 @@
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -1829,590 +1828,109 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame_persons_top">
+ <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="padding">2</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="label_xalign">0</property>
- <property name="label_yalign">1</property>
- <property name="shadow_type">none</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox167">
+ <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="GtkVBox" id="vbox83">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkAlignment" id="alignment86">
- <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">8</property>
- <property name="right_padding">8</property>
- <child>
- <widget class="GtkVBox" id="vbox_manage_persons">
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkVBox"
id="vbox_person_manage_create">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">1</property>
- <child>
- <widget class="GtkLabel" id="label153">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Create
new person</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="alignment52">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox535">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkButton"
id="button_person_add_single">
- <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">New
person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_person_add_single_from_main_gui" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_person_add_single">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox536">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_persons_new_1">
- <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="label141">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">One</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">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_person_add_multiple">
- <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">New
persons (multiple)</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_person_add_multiple_from_main_gui" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_person_add_multiple">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_persons_new_plus">
+ <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>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox"
id="vbox_person_manage_load">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">1</property>
- <child>
- <widget class="GtkLabel" id="label156">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Load
into session</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment85">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox537">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkButton"
id="button_recuperate_person">
+ </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="can_default">True</property>
<property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Load
person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_recuperate_person_from_main_gui" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_recuperate_person">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox538">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_persons_open_1">
- <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>
+ <signal name="clicked"
handler="on_button_persons_raspberry_left_clicked" swapped="no"/>
<child>
- <widget class="GtkLabel" id="label258">
+ <widget class="GtkArrow" id="arrow25">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">One</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <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_recuperate_persons_from_session">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_persons_raspberry_right">
<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">Load
persons from other session</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_recuperate_persons_from_session_at_main_gui" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_recuperate_persons_from_other_session">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <signal name="clicked"
handler="on_button_persons_raspberry_right_clicked" swapped="no"/>
<child>
- <widget class="GtkImage"
id="image_persons_open_plus">
+ <widget class="GtkArrow" id="arrow26">
<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">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">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox"
id="vbox_persons_bottom_no_photo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkLabel"
id="label_current_person">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="ellipsize">end</property>
- <property name="width_chars">20</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="alignment87">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox"
id="hbox_persons_bottom_no_photo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkButton"
id="button_image_current_person_zoom_h">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Zoom
image</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_button_image_current_person_zoom_clicked" swapped="no"/>
- <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_current_person_zoom_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_current_person_zoom_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
- </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_edit_current_person_h">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Edit
selected person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
- <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_edit_current_person_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_edit_current_person_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</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_show_all_person_events_h">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Show
all tests of this person</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_show_all_person_events_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_show_all_person_events_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_all_persons_events_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- </child>
- </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_delete_current_person_h">
- <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">Delete person from this session.</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_delete_current_person_from_session_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_delete_current_person_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_person_delete_h">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-size">2</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">3</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">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </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="padding">2</property>
- <property name="position">2</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="padding">2</property>
- <property name="position">3</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>
- <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">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</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>
- <signal name="clicked"
handler="on_button_persons_raspberry_left_clicked" swapped="no"/>
- <child>
- <widget class="GtkArrow" id="arrow25">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">left</property>
- </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_persons_raspberry_right">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_persons_raspberry_right_clicked" swapped="no"/>
- <child>
- <widget class="GtkArrow" id="arrow26">
- <property name="visible">True</property>
- <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>
@@ -2431,7 +1949,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">5</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -21781,6 +21299,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27115,6 +26639,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -43442,6 +42972,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -51619,6 +51155,12 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -51770,6 +51312,694 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox_person">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkFrame" id="frame37">
+ <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="vbox144">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox82">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox208">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">25</property>
+ <child>
+ <widget class="GtkVBox" id="vbox254">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkFrame" id="frame_persons_top">
+ <property name="width_request">450</property>
+ <property name="height_request">350</property>
+ <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">in</property>
+ <child>
+ <widget class="GtkViewport" id="viewport29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</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">2</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment86">
+ <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">8</property>
+ <property name="right_padding">8</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_manage_persons">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">20</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkVBox"
id="vbox_person_manage_create">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">1</property>
+ <child>
+ <widget class="GtkLabel" id="label153">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Create
new person</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="alignment52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox535">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkButton"
id="button_person_add_single">
+ <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">New
person</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_person_add_single_from_main_gui" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_person_add_single">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox536">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_persons_new_1">
+ <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="label141">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">One</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_person_add_multiple">
+ <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">New
persons (multiple)</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_person_add_multiple_from_main_gui" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_person_add_multiple">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox579">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_persons_new_plus">
+ <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="label638">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Multiple</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>
+ </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">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox"
id="vbox_person_manage_load">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">1</property>
+ <child>
+ <widget class="GtkLabel" id="label156">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Load
into session</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment85">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox537">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkButton"
id="button_recuperate_person">
+ <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">Load
person</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_recuperate_person_from_main_gui" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_recuperate_person">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox538">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_persons_open_1">
+ <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="label258">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">One</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">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_recuperate_persons_from_session">
+ <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">Load
persons from other session</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_recuperate_persons_from_session_at_main_gui" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_recuperate_persons_from_other_session">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox584">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_persons_open_plus">
+ <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="label669">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Multiple</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>
+ </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">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox"
id="vbox_persons_bottom_no_photo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="label_current_person">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="ellipsize">end</property>
+ <property name="width_chars">20</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="alignment87">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox"
id="hbox_persons_bottom_no_photo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkButton"
id="button_image_current_person_zoom_h">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Zoom
image</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_button_image_current_person_zoom_clicked" swapped="no"/>
+ <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_current_person_zoom_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_current_person_zoom_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </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_edit_current_person_h">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Edit
selected person</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_edit_current_person_clicked_from_main_gui" swapped="no"/>
+ <accelerator key="p" signal="clicked"
modifiers="GDK_CONTROL_MASK"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_edit_current_person_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_edit_current_person_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</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_show_all_person_events_h">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Show
all tests of this person</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_show_all_person_events_activate" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_show_all_person_events_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_all_persons_events_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </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_delete_current_person_h">
+ <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">Delete person from this session.</property>
+ <property name="relief">half</property>
+ <signal name="clicked"
handler="on_delete_current_person_from_session_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_delete_current_person_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_person_delete_h">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</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">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Manage
persons</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">2</property>
+ <property name="position">0</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="hbuttonbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_person_close">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property
name="receives_default">False</property>
+ <signal name="clicked"
handler="on_button_person_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_person_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox580">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_button_person_close">
+ <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="label_button_person_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Close</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">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">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>
+ <placeholder/>
+ <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>
+ </widget>
+ <packing>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Person</property>
+ </widget>
+ <packing>
+ <property name="position">8</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="resize">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 47b903e06..4cf80f001 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -515,7 +515,7 @@ public partial class ChronoJumpWindow
private string progVersion;
private string progName;
private enum notebook_start_pages { PROGRAM, SENDLOG, EXITCONFIRM, SOCIALNETWORKPOLL }
- private enum notebook_sup_pages { START, CONTACTS, ENCODER, SESSION, NETWORKSPROBLEMS, HELP, NEWS,
MICRODISCOVER }
+ private enum notebook_sup_pages { START, CONTACTS, ENCODER, SESSION, NETWORKSPROBLEMS, HELP, NEWS,
MICRODISCOVER, PERSON }
private enum notebook_contacts_execute_or_pages { EXECUTE, INSTRUCTIONS, FORCESENSORADJUST,
RACEINSPECTOR }
private enum notebook_analyze_pages { STATISTICS, JUMPSPROFILE, JUMPSDJOPTIMALFALL,
JUMPSWEIGHTFVPROFILE, JUMPSASYMMETRY, JUMPSEVOLUTION, JUMPSRJFATIGUE,
RUNSEVOLUTION, SPRINT, FORCESENSOR, RACEENCODER }
@@ -932,9 +932,6 @@ public partial class ChronoJumpWindow
UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark,
label_session_at_frame_session);
UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark,
label_current_session);
UtilGtk.ContrastLabelsLabel (Config.ColorBackgroundIsDark,
label_persons_at_frame_persons);
- UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark,
vbox_person_manage_create);
- UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark,
vbox_person_manage_load);
- UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark,
vbox_persons_bottom_no_photo);
}
Pixbuf pixbuf;
@@ -957,6 +954,7 @@ public partial class ChronoJumpWindow
UtilGtk.ContrastLabelsNotebook (Config.ColorBackgroundIsDark, app1s_notebook);
UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark, vbox_help);
UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark, vbox_micro_discover);
+ UtilGtk.ContrastLabelsVBox (Config.ColorBackgroundIsDark, vbox_person);
if(Config.ColorBackgroundIsDark)
image_chronopic_connect_encoder2.Pixbuf =
@@ -3098,9 +3096,6 @@ public partial class ChronoJumpWindow
//fold menu session
check_menu_session.Click();
- //unfold menu person
- check_manage_persons.Click();
-
SqlitePreferences.Update(SqlitePreferences.LastSessionID, currentSession.UniqueID.ToString(),
false);
}
@@ -3193,8 +3188,6 @@ public partial class ChronoJumpWindow
currentPerson = null;
label_top_person_name.Text = "";
label_top_encoder_person_name.Text = "";
-
- check_manage_persons.Click(); //unfold persons.
}
//update report
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index 5c2331551..701750a97 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -33,8 +33,6 @@ 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;
private void showPersonsOnTop (bool onTop)
{
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index d60151df7..5275022ce 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -558,6 +558,7 @@ public partial class ChronoJumpWindow
image_force_sensor_capture_adjust_close.Pixbuf = pixbuf;
app1s_image_button_close.Pixbuf = pixbuf;
image_news_close.Pixbuf = pixbuf;
+ image_button_person_close.Pixbuf = pixbuf;
/*
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 96e6beb52..d2eb2a093 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -43,6 +43,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_help;
[Widget] Gtk.EventBox eventbox_button_menu_news;
[Widget] Gtk.EventBox eventbox_button_menu_exit;
+ [Widget] Gtk.VBox vbox_person;
+ [Widget] Gtk.Arrow arrow_manage_persons_left;
+ [Widget] Gtk.Arrow arrow_manage_persons_right;
+ [Widget] Gtk.Image image_button_person_close;
[Widget] Gtk.EventBox eventbox_check_manage_persons;
[Widget] Gtk.EventBox eventbox_persons_up;
[Widget] Gtk.EventBox eventbox_persons_down;
@@ -82,9 +86,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_menu_guiTest;
//just to manage width
- [Widget] Gtk.VBox vbox_person_manage_create;
- [Widget] Gtk.VBox vbox_person_manage_load;
-
[Widget] Gtk.Image image_session_import;
[Widget] Gtk.Image image_session_export;
[Widget] Gtk.Image image_session_export1;
@@ -179,9 +180,6 @@ public partial class ChronoJumpWindow
l.Add(button_menu_help_shortcuts.SizeRequest().Width + 16);
l.Add(button_menu_help_about.SizeRequest().Width + 16);
- l.Add(vbox_person_manage_create.SizeRequest().Width);
- l.Add(vbox_person_manage_load.SizeRequest().Width);
-
//int maxWidth = getMenuButtonsMaxWidth(l) + 4 + 6; //4, 6 are alignments spaces.
/*
@@ -289,43 +287,33 @@ public partial class ChronoJumpWindow
a_down.Visible = ! selected;
}
- private void on_check_menu_session_or_persons_clicked (object o, EventArgs args)
+ private void on_check_manage_persons_clicked (object o, EventArgs args)
{
- /*
- if one checkbutton unfolds, the other should get folded.
- do not need to care for circular calls, because it sets the other as false
- */
-
- if(o == (object) check_menu_session)
+ if (check_manage_persons.Active)
{
- menuShowVerticalArrow (check_menu_session.Active, arrow_menu_show_session_up,
arrow_menu_show_session_down);
- if(check_menu_session.Active)
- {
- vbuttonbox_menu_session.Visible = true;
-
- if(check_manage_persons.Active)
- check_manage_persons.Active = false; //changing the other checkbutton
- }
- else
- vbuttonbox_menu_session.Visible = false;
- }
- else if(o == (object) check_manage_persons)
- {
- menuShowVerticalArrow (check_manage_persons.Active, arrow_manage_persons_up,
arrow_manage_persons_down);
- if(check_manage_persons.Active)
- {
- vbox_manage_persons.Visible = true;
-
- if(check_menu_session.Active)
- check_menu_session.Active = false; //changing the other checkbutton
- } else
- vbox_manage_persons.Visible = false;
+ app1s_notebook_sup_entered_from = notebook_sup.CurrentPage;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.PERSON);
+ arrow_manage_persons_left.Visible = true;
+ arrow_manage_persons_right.Visible = false;
+ } else {
+ notebook_sup.CurrentPage = app1s_notebook_sup_entered_from;
+ arrow_manage_persons_left.Visible = false;
+ arrow_manage_persons_right.Visible = true;;
}
+ }
+ private void on_button_person_close_clicked (object o, EventArgs args)
+ {
+ check_manage_persons.Click ();
+ }
+
+ 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);
+ vbuttonbox_menu_session.Visible = check_menu_session.Active;
//hide the person photo if anything is unfolded
if(preferences.personPhoto)
- vbox_persons_bottom.Visible =
- (! check_menu_session.Active && ! check_manage_persons.Active);
+ vbox_persons_bottom.Visible = ! check_menu_session.Active;
//scroll it, but wait a bit before to be all the things at place
if(myTreeViewPersons != null)