commit 6f1f5486e813d1e35ae01eb2a7a7487b69947ca0
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Mar 23 14:52:52 2020 +0100
DB:1.92 menuType: ALL, TEXT, ICONS
glade/app1.glade | 927 ++++++++++++++++++++++----------------------
glade/preferences_win.glade | 217 ++++++++++-
src/gui/app1/chronojump.cs | 4 +-
src/gui/app1/icons.cs | 12 +-
src/gui/app1/menu.cs | 82 +++-
src/gui/preferences.cs | 50 +++
src/preferences.cs | 2 +
src/sqlite/main.cs | 13 +-
src/sqlite/preferences.cs | 5 +
9 files changed, 825 insertions(+), 487 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 62ed8bad..454639a1 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -780,51 +780,46 @@
<property name="left_padding">3</property>
<property name="right_padding">2</property>
<child>
- <widget class="GtkHBox" id="hbox365">
+ <widget class="GtkButton" id="button_show_menu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_button_show_menu_clicked"
swapped="no"/>
<child>
- <widget class="GtkButton" id="button_show_menu">
+ <widget class="GtkEventBox" id="eventbox_button_show_menu">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_show_menu_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkEventBox"
id="eventbox_button_show_menu">
+ <widget class="GtkHBox" id="hbox367">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox367">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_button_show_menu">
+ <widget class="GtkImage"
id="image_button_show_menu">
<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="GtkLabel"
id="label_button_show_menu">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_button_show_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Menu</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox368">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox368">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -850,86 +845,16 @@
<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>
- </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_show_modes">
- <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_show_modes_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_show_modes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox366">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage"
id="image_button_show_modes">
- <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_button_show_modes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Mode</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkArrow" id="arrow_down5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- <packing>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
- </packing>
- </child>
- </widget>
+ </packing>
</child>
</widget>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
@@ -1092,7 +1017,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label454">
+ <widget class="GtkLabel" id="label_session_new">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">New</property>
@@ -1140,7 +1065,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label455">
+ <widget class="GtkLabel" id="label_session_load">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Load</property>
@@ -1189,7 +1114,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label457">
+ <widget class="GtkLabel" id="label_session_edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Edit</property>
@@ -1238,7 +1163,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label458">
+ <widget class="GtkLabel"
id="label_session_delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Delete</property>
@@ -1275,114 +1200,99 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox174">
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkRadioButton"
id="radio_menu_person">
+ <widget class="GtkButton" id="button_show_modes">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_show_modes_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox363">
+ <widget class="GtkEventBox"
id="eventbox_button_show_modes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label456">
+ <widget class="GtkHBox" id="hbox366">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Person</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkArrow" id="arrow_down3">
+ <widget class="GtkImage"
id="image_button_show_modes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="arrow_type">down</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment"
id="alignment_menu_person_options">
- <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_persons1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkVBox" id="vbox175">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkLabel" id="label443">
+ <widget class="GtkLabel"
id="label_button_show_modes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Create
new</property>
+ <property name="label"
translatable="yes">Mode</property>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox2">
+ <widget class="GtkArrow" id="arrow_down5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_person_add_single1">
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</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_preferences">
<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>
+ <property name="tooltip"
translatable="yes">Preferences</property>
+ <signal name="clicked"
handler="on_preferences_activate" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox176">
+ <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_persons_new_2">
+ <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">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label445">
+ <widget class="GtkLabel"
id="label_menu_preferences">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">One</property>
+ <property name="label"
translatable="yes">Preferences</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1393,30 +1303,39 @@
</widget>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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>
+ <child>
+ <widget class="GtkVBox" id="vbox_menu_encoder">
+ <property name="can_focus">False</property>
<child>
- <widget class="GtkButton"
id="button_person_add_multiple1">
+ <widget class="GtkCheckButton"
id="check_menu_encoder">
<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>
+ <property
name="receives_default">False</property>
+ <property name="tooltip"
translatable="yes">Encoder</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_menu_encoder_clicked" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox177">
+ <widget class="GtkEventBox"
id="eventbox_check_menu_encoder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_persons_new_plus_2">
+ <widget class="GtkHBox" id="hbox93">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Encoder</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1425,34 +1344,132 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label449">
+ <widget class="GtkHBox" id="hbox159">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Multiple</property>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_encoder_up">
+ <property name="can_focus">False</property>
+ <property name="arrow_type">up</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- </child>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_encoder_down">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">down</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment"
id="alignment_menu_encoder_options">
+ <property name="can_focus">False</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">16</property>
+ <child>
+ <widget class="GtkVBox" id="vbox56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_encoder_export_set">
+ <property name="label" translatable="yes">Export
current set</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Export set to CSV (Spreadsheet)</property>
+ <signal name="clicked"
handler="on_button_encoder_export_all_curves_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_encoder_session_overview">
+ <property name="label"
translatable="yes">Sesssion overview</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_menuitem_encoder_session_overview_activate" 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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox187">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton"
id="check_menu_help">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip"
translatable="yes">Help</property>
+ <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="on_check_menu_help_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_check_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>
@@ -1460,15 +1477,55 @@
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_menu_session_load">
+ <widget class="GtkLabel" id="label_menu_help">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">2</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>
<child>
- <widget class="GtkLabel" id="label450">
+ <widget class="GtkHBox" id="hbox375">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Load
into session</property>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_help_up">
+ <property name="can_focus">False</property>
+ <property name="arrow_type">up</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow"
id="arrow_menu_show_help_down">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="arrow_type">down</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -1477,40 +1534,42 @@
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
+ <widget class="GtkAlignment"
id="alignment_menu_help_options">
+ <property name="can_focus">False</property>
+ <property name="top_padding">8</property>
+ <property name="left_padding">16</property>
+ <child>
+ <widget class="GtkVBox" id="vbox188">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkButton"
id="button_recuperate_person1">
+ <widget class="GtkButton"
id="button_menu_help_documents">
<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_menuitem_manual_activate" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox178">
+ <widget class="GtkHBox" id="hbox378">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_persons_open_2">
+ <widget class="GtkImage"
id="image_menu_help_documents">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label451">
+ <widget class="GtkLabel"
id="label_menu_help_documents">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">One</property>
+ <property name="label"
translatable="yes">Documents</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1528,35 +1587,32 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_recuperate_persons_from_session1">
+ <widget class="GtkButton"
id="button_menu_help_accelerators">
<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_menuitem_accelerators_activate" swapped="no"/>
<child>
- <widget class="GtkVBox" id="vbox179">
+ <widget class="GtkHBox" id="hbox376">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_persons_open_plus_2">
+ <widget class="GtkImage"
id="image_menu_help_accelerators">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label452">
+ <widget class="GtkLabel"
id="label_menu_help_accelerators">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Multiple</property>
+ <property name="label"
translatable="yes">Shortcuts</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1573,6 +1629,33 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_menu_help_about">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_about1_activate" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox377">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_menu_help_about">
+ <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_about">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">About</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1581,10 +1664,12 @@
</packing>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -1592,7 +1677,7 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1600,41 +1685,42 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_preferences">
+ <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">Preferences</property>
- <signal name="clicked"
handler="on_preferences_activate" swapped="no"/>
+ <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_preferences">
+ <widget class="GtkEventBox"
id="eventbox_button_menu_exit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox331">
+ <widget class="GtkHBox" id="hbox364">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_menu_preferences">
+ <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">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_menu_preferences">
+ <widget class="GtkLabel" id="label_menu_quit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Preferences</property>
+ <property name="label"
translatable="yes">Exit</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1650,34 +1736,28 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_menu_encoder">
+ <widget class="GtkVBox" id="vbox174">
<property name="can_focus">False</property>
<child>
- <widget class="GtkCheckButton"
id="check_menu_encoder">
+ <widget class="GtkRadioButton"
id="radio_menu_person">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Encoder</property>
<property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_menu_encoder_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_encoder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox93">
+ <widget class="GtkHBox" id="hbox363">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel" id="label22">
+ <widget class="GtkLabel" id="label456">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Encoder</property>
+ <property name="label"
translatable="yes">Person</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1686,22 +1766,7 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox159">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkArrow"
id="arrow_menu_show_encoder_up">
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkArrow"
id="arrow_menu_show_encoder_down">
+ <widget class="GtkArrow" id="arrow_down3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="arrow_type">down</property>
@@ -1713,15 +1778,6 @@
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
</child>
</widget>
<packing>
@@ -1731,142 +1787,75 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment"
id="alignment_menu_encoder_options">
+ <widget class="GtkAlignment"
id="alignment_menu_person_options">
<property name="can_focus">False</property>
- <property name="top_padding">8</property>
+ <property name="top_padding">6</property>
<property name="left_padding">16</property>
<child>
- <widget class="GtkVBox" id="vbox56">
+ <widget class="GtkVBox"
id="vbox_manage_persons1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkButton"
id="button_menu_encoder_export_set">
- <property name="label" translatable="yes">Export
current set</property>
+ <widget class="GtkVBox" id="vbox175">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip"
translatable="yes">Export set to CSV (Spreadsheet)</property>
- <signal name="clicked"
handler="on_button_encoder_export_all_curves_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child>
- <widget class="GtkButton"
id="button_menu_encoder_session_overview">
- <property name="label"
translatable="yes">Sesssion overview</property>
+ <widget class="GtkLabel" id="label443">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_menuitem_encoder_session_overview_activate" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Create
new</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</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="GtkVBox" id="vbox187">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkCheckButton"
id="check_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip"
translatable="yes">Help</property>
- <property name="draw_indicator">False</property>
- <signal name="clicked"
handler="on_check_menu_help_clicked" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox370">
+ <widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image_menu_help">
+ <widget class="GtkButton"
id="button_person_add_single1">
<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>
+ <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>
<child>
- <widget class="GtkLabel" id="label_menu_help">
+ <widget class="GtkVBox" id="vbox176">
<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>
<child>
- <widget class="GtkHBox" id="hbox375">
+ <widget class="GtkImage"
id="image_persons_new_2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <widget class="GtkArrow"
id="arrow_menu_show_help_up">
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
+ <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="GtkArrow"
id="arrow_menu_show_help_down">
+ <widget class="GtkLabel" id="label445">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="arrow_type">down</property>
+ <property name="label"
translatable="yes">One</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">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>
</child>
</widget>
<packing>
@@ -1876,42 +1865,44 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment"
id="alignment_menu_help_options">
- <property name="can_focus">False</property>
- <property name="top_padding">8</property>
- <property name="left_padding">16</property>
- <child>
- <widget class="GtkVBox" id="vbox188">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkButton"
id="button_menu_help_documents">
+ <widget class="GtkButton"
id="button_person_add_multiple1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_menuitem_manual_activate" swapped="no"/>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">New
persons (multiple)</property>
+ <property name="relief">half</property>
<child>
- <widget class="GtkHBox" id="hbox378">
+ <widget class="GtkVBox" id="vbox177">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_menu_help_documents">
+ <widget class="GtkImage"
id="image_persons_new_plus_2">
<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="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_menu_help_documents">
+ <widget class="GtkLabel" id="label449">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Documents</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>
<packing>
<property name="expand">True</property>
@@ -1920,6 +1911,11 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1929,32 +1925,57 @@
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_help_accelerators">
+ <widget class="GtkVBox"
id="vbox_menu_session_load">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkLabel" id="label450">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton"
id="button_recuperate_person1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_menuitem_accelerators_activate" swapped="no"/>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Load
person</property>
+ <property name="relief">half</property>
<child>
- <widget class="GtkHBox" id="hbox376">
+ <widget class="GtkVBox" id="vbox178">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_menu_help_accelerators">
+ <widget class="GtkImage"
id="image_persons_open_2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="stock">gtk-open</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="GtkLabel"
id="label_menu_help_accelerators">
+ <widget class="GtkLabel" id="label451">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Shortcuts</property>
+ <property name="label"
translatable="yes">One</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -1968,36 +1989,39 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_menu_help_about">
+ <widget class="GtkButton"
id="button_recuperate_persons_from_session1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_about1_activate" swapped="no"/>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Load
persons from other session</property>
+ <property name="relief">half</property>
<child>
- <widget class="GtkHBox" id="hbox377">
+ <widget class="GtkVBox" id="vbox179">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkImage"
id="image_menu_help_about">
+ <widget class="GtkImage"
id="image_persons_open_plus_2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="stock">gtk-open</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="GtkLabel"
id="label_menu_help_about">
+ <widget class="GtkLabel" id="label452">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">About</property>
+ <property name="label"
translatable="yes">Multiple</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -2011,74 +2035,37 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
- </child>
- </widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</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="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>
+ <property name="position">1</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>
+ </child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</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">5</property>
+ <property name="position">6</property>
</packing>
</child>
</widget>
@@ -24544,6 +24531,21 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26858,18 +26860,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -26906,6 +26896,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -34369,6 +34371,21 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <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/glade/preferences_win.glade b/glade/preferences_win.glade
index 9ebb8178..fc40af72 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -119,6 +119,221 @@
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <widget class="GtkAlignment" id="alignment24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkLabel" id="label128">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">At menu show:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox48">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">15</property>
+ <child>
+ <widget class="GtkRadioButton" id="radio_menu_show_all">
+ <property name="label" translatable="yes">All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radio_menu_show_text">
+ <property name="label" translatable="yes">Only text</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_menu_show_all</property>
+ <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radio_menu_show_icons">
+ <property name="label" translatable="yes">Only icons</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radio_menu_show_all</property>
+ <signal name="toggled" handler="on_radio_menu_show_toggled"
swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkCheckButton" id="check_example_menu_all">
+ <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>
+ <child>
+ <widget class="GtkHBox" id="hbox369">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_folders">
+ <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_folders">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Session</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="check_example_menu_text">
+ <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>
+ <child>
+ <widget class="GtkHBox" id="hbox62">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label_menu_folders1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Session</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="check_example_menu_icons">
+ <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>
+ <child>
+ <widget class="GtkHBox" id="hbox64">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_folders2">
+ <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>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</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">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
<child>
<widget class="GtkCheckButton" id="check_appearance_person_photo">
<property name="label" translatable="yes">Show persons photo</property>
@@ -130,7 +345,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index f14354c1..ce3f4dae 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -708,7 +708,7 @@ public partial class ChronoJumpWindow
} else
LogB.Information("Ping discarded (Compujump)");
- menu_initialize_colors();
+ menu_initialize();
testNewStuff();
@@ -3086,7 +3086,7 @@ public partial class ChronoJumpWindow
if(pen_black_force_ai != null)
pen_black_force_ai.SetLineAttributes (preferences.forceSensorGraphsLineWidth,
Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
- menu_initialize_colors();
+ menu_initialize();
// update force_capture_drawingarea
if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR &&
radiobutton_force_sensor_analyze_manual.Active)
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 6e242254..9c4c233b 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -39,12 +39,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_quit3;
[Widget] Gtk.Image image_quit_from_app1;
[Widget] Gtk.Image image_session_new2;
- [Widget] Gtk.Image image_session_new3;
- [Widget] Gtk.Image image_session_load2;
[Widget] Gtk.Image image_session_edit;
- [Widget] Gtk.Image image_session_edit2;
[Widget] Gtk.Image image_session_delete;
- [Widget] Gtk.Image image_session_delete2;
[Widget] Gtk.Image image_session_preferences;
[Widget] Gtk.Image image_mode_encoder_capture;
[Widget] Gtk.Image image_manage_persons;
@@ -462,16 +458,16 @@ public partial class ChronoJumpWindow
//persons buttons
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_add.png");
image_persons_new_1.Pixbuf = pixbuf;
- image_persons_new_2.Pixbuf = pixbuf;
+ //image_persons_new_2.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_group_add.png");
image_persons_new_plus.Pixbuf = pixbuf;
- image_persons_new_plus_2.Pixbuf = pixbuf;
+ //image_persons_new_plus_2.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_outline.png");
image_persons_open_1.Pixbuf = pixbuf;
- image_persons_open_2.Pixbuf = pixbuf;
+ //dimage_persons_open_2.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_group_outline.png");
image_persons_open_plus.Pixbuf = pixbuf;
- image_persons_open_plus_2.Pixbuf = pixbuf;
+ //image_persons_open_plus_2.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_rest.png");
image_rest.Pixbuf = pixbuf;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 00020010..f6e37da4 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -55,34 +55,82 @@ public partial class ChronoJumpWindow
[Widget] Gtk.CheckButton check_menu_session;
[Widget] Gtk.CheckButton check_menu_encoder;
[Widget] Gtk.CheckButton check_menu_help;
+ [Widget] Gtk.Alignment alignment_menu_session_options;
+ [Widget] Gtk.Alignment alignment_menu_person_options;
+ [Widget] Gtk.Alignment alignment_menu_encoder_options;
+ [Widget] Gtk.Alignment alignment_menu_help_options;
+
+ //menu icons
[Widget] Gtk.Image image_button_show_menu;
- [Widget] Gtk.Label label_button_show_menu;
[Widget] Gtk.Image image_button_show_modes;
- [Widget] Gtk.Label label_button_show_modes;
[Widget] Gtk.Image image_menu_folders;
- [Widget] Gtk.Label label_menu_folders;
+ [Widget] Gtk.Image image_session_new3;
+ [Widget] Gtk.Image image_session_load2;
+ [Widget] Gtk.Image image_session_edit2;
+ [Widget] Gtk.Image image_session_delete2;
[Widget] Gtk.Image image_menu_preferences;
- [Widget] Gtk.Label label_menu_preferences;
[Widget] Gtk.Image image_menu_help;
- [Widget] Gtk.Label label_menu_help;
[Widget] Gtk.Image image_menu_help_documents;
- [Widget] Gtk.Label label_menu_help_documents;
[Widget] Gtk.Image image_menu_help_accelerators;
- [Widget] Gtk.Label label_menu_help_accelerators;
[Widget] Gtk.Image image_menu_help_about;
- [Widget] Gtk.Label label_menu_help_about;
[Widget] Gtk.Image image_menu_quit;
+
+ //menu labels
+ [Widget] Gtk.Label label_button_show_menu;
+ [Widget] Gtk.Label label_button_show_modes;
+ [Widget] Gtk.Label label_menu_folders;
+ [Widget] Gtk.Label label_session_new;
+ [Widget] Gtk.Label label_session_load;
+ [Widget] Gtk.Label label_session_edit;
+ [Widget] Gtk.Label label_session_delete;
+ [Widget] Gtk.Label label_menu_preferences;
+ [Widget] Gtk.Label label_menu_help;
+ [Widget] Gtk.Label label_menu_help_documents;
+ [Widget] Gtk.Label label_menu_help_accelerators;
+ [Widget] Gtk.Label label_menu_help_about;
[Widget] Gtk.Label label_menu_quit;
- [Widget] Gtk.Alignment alignment_menu_session_options;
- [Widget] Gtk.Alignment alignment_menu_person_options;
- [Widget] Gtk.Alignment alignment_menu_encoder_options;
- [Widget] Gtk.Alignment alignment_menu_help_options;
- [Widget] Gtk.Image image_persons_new_2;
- [Widget] Gtk.Image image_persons_new_plus_2;
- [Widget] Gtk.Image image_persons_open_2;
- [Widget] Gtk.Image image_persons_open_plus_2;
- private void menu_initialize_colors()
+
+ private void menu_initialize ()
+ {
+ menuSetTextAndIcons();
+ menuSetColors();
+ }
+
+ private void menuSetTextAndIcons ()
+ {
+ //icons
+ image_button_show_menu.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_button_show_modes.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_folders.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_session_new3.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_session_load2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_session_edit2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_session_delete2.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_preferences.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_help.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_help_documents.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_help_accelerators.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_help_about.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+ image_menu_quit.Visible = preferences.menuType != Preferences.MenuTypes.TEXT;
+
+ //labels
+ label_button_show_menu.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_button_show_modes.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_folders.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_session_new.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_session_load.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_session_edit.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_session_delete.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_preferences.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_help.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_help_documents.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_help_accelerators.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_help_about.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ label_menu_quit.Visible = preferences.menuType != Preferences.MenuTypes.ICONS;
+ }
+
+ private void menuSetColors ()
{
//Gdk.Color color = UtilGtk.YELLOW;
//Gdk.Color color = UtilGtk.BLUE_CHRONOJUMP;
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 76383367..c0559932 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -51,6 +51,14 @@ public class PreferencesWindow
[Widget] Gtk.CheckButton check_appearance_maximized;
[Widget] Gtk.CheckButton check_appearance_maximized_undecorated;
[Widget] Gtk.CheckButton check_appearance_person_win_hide;
+ [Widget] Gtk.RadioButton radio_menu_show_all;
+ [Widget] Gtk.RadioButton radio_menu_show_text;
+ [Widget] Gtk.RadioButton radio_menu_show_icons;
+ [Widget] Gtk.CheckButton check_example_menu_all;
+ [Widget] Gtk.CheckButton check_example_menu_text;
+ [Widget] Gtk.CheckButton check_example_menu_icons;
+ [Widget] Gtk.Image image_menu_folders;
+ [Widget] Gtk.Image image_menu_folders2;
[Widget] Gtk.CheckButton check_appearance_person_photo;
[Widget] Gtk.Alignment alignment_undecorated;
[Widget] Gtk.DrawingArea drawingarea_background_color;
@@ -332,11 +340,22 @@ public class PreferencesWindow
PreferencesWindowBox.check_appearance_person_photo.Sensitive = ! preferences.personWinHide;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders.png");
+ PreferencesWindowBox.image_menu_folders.Pixbuf = pixbuf;
+ PreferencesWindowBox.image_menu_folders2.Pixbuf = pixbuf;
+
if(preferences.personPhoto)
PreferencesWindowBox.check_appearance_person_photo.Active = true;
else
PreferencesWindowBox.check_appearance_person_photo.Active = false;
+ if(preferences.menuType == Preferences.MenuTypes.ALL)
+ PreferencesWindowBox.radio_menu_show_all.Active = true;
+ else if(preferences.menuType == Preferences.MenuTypes.TEXT)
+ PreferencesWindowBox.radio_menu_show_text.Active = true;
+ else //if(preferences.menuType == Preferences.MenuTypes.ICONS)
+ PreferencesWindowBox.radio_menu_show_icons.Active = true;
+
PreferencesWindowBox.colorBackground = UtilGtk.ColorParse(preferences.colorBackgroundString);
PreferencesWindowBox.paintColorDrawingArea(PreferencesWindowBox.colorBackground);
@@ -635,6 +654,21 @@ public class PreferencesWindow
return PreferencesWindowBox;
}
+ private void on_radio_menu_show_toggled (object o, EventArgs args)
+ {
+ /*
+ if(radio_menu_show_all.Active)
+ {
+ check_example_menu_all.Visible = true;
+ check_example_menu_text.Visible = false;
+ check_example_menu_icons.Visible = false;
+ }
+ */
+ check_example_menu_all.Visible = (o == (object) radio_menu_show_all &&
radio_menu_show_all.Active);
+ check_example_menu_text.Visible = (o == (object) radio_menu_show_text &&
radio_menu_show_text.Active);
+ check_example_menu_icons.Visible = (o == (object) radio_menu_show_icons &&
radio_menu_show_icons.Active);
+ }
+
private void paintColorDrawingArea(Gdk.Color color)
{
UtilGtk.PaintColorDrawingArea(drawingarea_background_color, color);
@@ -1752,6 +1786,22 @@ public class PreferencesWindow
preferences.personPhoto = PreferencesWindowBox.check_appearance_person_photo.Active;
}
+ if(PreferencesWindowBox.radio_menu_show_all.Active && preferences.menuType !=
Preferences.MenuTypes.ALL)
+ {
+ SqlitePreferences.Update(SqlitePreferences.MenuType,
Preferences.MenuTypes.ALL.ToString(), true);
+ preferences.menuType = Preferences.MenuTypes.ALL;
+ }
+ else if(PreferencesWindowBox.radio_menu_show_text.Active && preferences.menuType !=
Preferences.MenuTypes.TEXT)
+ {
+ SqlitePreferences.Update(SqlitePreferences.MenuType,
Preferences.MenuTypes.TEXT.ToString(), true);
+ preferences.menuType = Preferences.MenuTypes.TEXT;
+ }
+ else if(PreferencesWindowBox.radio_menu_show_icons.Active && preferences.menuType !=
Preferences.MenuTypes.ICONS)
+ {
+ SqlitePreferences.Update(SqlitePreferences.MenuType,
Preferences.MenuTypes.ICONS.ToString(), true);
+ preferences.menuType = Preferences.MenuTypes.ICONS;
+ }
+
preferences.colorBackgroundString = Preferences.PreferencesChange(
SqlitePreferences.ColorBackground, preferences.colorBackgroundString,
UtilGtk.ColorToColorString(colorBackground)); //this does the reverse of
Gdk.Color.Parse on UtilGtk.ColorParse()
diff --git a/src/preferences.cs b/src/preferences.cs
index dc0d111b..8c1eb23b 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -33,6 +33,8 @@ public class Preferences
public bool personWinHide;
public bool personPhoto;
//public string colorBackgroundString = "#0e1e46";
+ public enum MenuTypes { ALL, TEXT, ICONS};
+ public MenuTypes menuType;
public string colorBackgroundString;
public enum UnitsEnum { METRIC, IMPERIAL };
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index 5e9eb480..3687a345 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -129,7 +129,7 @@ class Sqlite
/*
* Important, change this if there's any update to database
*/
- static string lastChronojumpDatabaseVersion = "1.91";
+ static string lastChronojumpDatabaseVersion = "1.92";
public Sqlite() {
}
@@ -2673,12 +2673,16 @@ class Sqlite
}
if(currentVersion == "1.90")
{
- LogB.SQL("Inserted into preferences: ColorBackground");
-
+ LogB.SQL("Inserted into preferences: colorBackground");
SqlitePreferences.Insert (SqlitePreferences.ColorBackground, "#0e1e46");
-
currentVersion = updateVersion("1.91");
}
+ if(currentVersion == "1.91")
+ {
+ LogB.SQL("Inserted into preferences: menuType");
+ SqlitePreferences.Insert (SqlitePreferences.MenuType,
Preferences.MenuTypes.ALL.ToString());
+ currentVersion = updateVersion("1.92");
+ }
/*
if(currentVersion == "1.79")
@@ -2893,6 +2897,7 @@ class Sqlite
//changes [from - to - desc]
//just testing: 1.79 - 1.80 Converted DB to 1.80 Created table ForceSensorElasticBandGlue and moved
stiffnessString records there
//
+ //1.91 - 1.92 Converted DB to 1.92 Inserted into preferences: menuType
//1.90 - 1.91 Converted DB to 1.91 Inserted into preferences: ColorBackground
//1.89 - 1.90 Converted DB to 1.90 Inserted into preferences: units
//1.88 - 1.89 Converted DB to 1.89 Inserted into preferences: encoderCaptureFeedbackEccon
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index 3ab137df..d9dd6e28 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -28,6 +28,7 @@ using System.Collections; //ArrayList
class SqlitePreferences : Sqlite
{
public const string UnitsStr = "units";
+ public const string MenuType = "menuType";
public const string ColorBackground = "colorBackground";
//contacts
@@ -116,6 +117,7 @@ class SqlitePreferences : Sqlite
Insert ("maximized", Preferences.MaximizedTypes.NO.ToString(), dbcmdTr);
Insert ("personWinHide", "False", dbcmdTr);
Insert ("personPhoto", "True", dbcmdTr);
+ Insert (MenuType, Preferences.MenuTypes.ALL.ToString(), dbcmdTr);
Insert (ColorBackground, "#0e1e46", dbcmdTr);
Insert (UnitsStr, Preferences.UnitsEnum.METRIC.ToString(), dbcmdTr);
Insert ("encoderCaptureShowOnlyBars", "False", dbcmdTr);
@@ -359,6 +361,9 @@ class SqlitePreferences : Sqlite
preferences.personWinHide = reader[1].ToString() == "True";
else if(reader[0].ToString() == "personPhoto")
preferences.personPhoto = reader[1].ToString() == "True";
+ else if(reader[0].ToString() == MenuType)
+ preferences.menuType = (Preferences.MenuTypes)
+ Enum.Parse(typeof(Preferences.MenuTypes), reader[1].ToString());
else if(reader[0].ToString() == ColorBackground)
preferences.colorBackgroundString = reader[1].ToString();
else if(reader[0].ToString() == UnitsStr)