commit 475297feb90f348ebb55070015596d24296831a6
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 21 19:16:09 2020 +0200
Removed menu help drowpdown to avoid confusion with session dropdown
glade/app1.glade | 705 ++++++++++++++++++++-------------------------
src/gui/app1/chronojump.cs | 5 +-
src/gui/app1/icons.cs | 3 -
src/gui/app1/menu.cs | 45 +--
src/gui/app1/menu_tiny.cs | 35 +--
5 files changed, 331 insertions(+), 462 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index a5de7f2e..6aa47a93 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -276,181 +276,24 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox86">
+ <widget class="GtkButton" id="button_menu_help1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkCheckButton" id="check_menu_help1">
- <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_help1_clicked"
swapped="no"/>
- <child>
- <widget class="GtkEventBox" id="eventbox_check_menu_help1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox392">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkImage" id="image_menu_help1">
- <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="GtkHBox" id="hbox393">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkArrow"
id="arrow_menu_show_help_up1">
- <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_down1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">down</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Help</property>
+ <signal name="clicked" handler="on_button_menu_help_clicked"
swapped="no"/>
<child>
- <widget class="GtkAlignment" id="alignment_menu_help_options1">
+ <widget class="GtkEventBox" id="eventbox_button_menu_help1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">8</property>
- <property name="right_padding">8</property>
<child>
- <widget class="GtkVBox" id="vbox181">
+ <widget class="GtkImage" id="image_menu_help1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton"
id="button_menu_help_documents1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_menuitem_manual_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_help_documents1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_menu_help_documents1">
- <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">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_menu_shortcuts1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_shortcuts_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_help_shortcuts1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_menu_help_shortcuts1">
- <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>
- <child>
- <widget class="GtkButton" id="button_menu_help_about1">
- <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="GtkEventBox"
id="eventbox_button_menu_help_about1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_menu_help_about1">
- <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">2</property>
- </packing>
- </child>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
@@ -1036,19 +879,13 @@
</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">
+ <widget class="GtkButton" id="button_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"/>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_menu_help_clicked" swapped="no"/>
<child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_help">
+ <widget class="GtkEventBox"
id="eventbox_button_menu_help">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1080,217 +917,9 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox375">
- <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>
- </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>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment"
id="alignment_menu_help_options">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">5</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">5</property>
- <child>
- <widget class="GtkButton"
id="button_menu_help_documents">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_menuitem_manual_activate" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_help_documents">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox378">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_menu_help_documents">
- <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_documents">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Documents</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_help_shortcuts">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_shortcuts_clicked" swapped="no"/>
- <child>
- <widget class="GtkEventBox"
id="eventbox_button_menu_help_shortcuts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox376">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImage"
id="image_menu_help_shortcuts">
- <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_shortcuts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Shortcuts</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
</widget>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_menu_help_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="GtkEventBox"
id="eventbox_button_menu_help_about">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <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>
- <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">2</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>
@@ -24352,6 +23981,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27192,18 +26824,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>
@@ -27240,6 +26860,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>
@@ -35121,6 +34753,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -39801,6 +39436,286 @@ then click this button.</property>
<property name="type">tab</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkFrame" id="frame23">
+ <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="vbox224">
+ <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>
+ <child>
+ <widget class="GtkVBox" id="vbox225">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">25</property>
+ <child>
+ <widget class="GtkFrame" id="frame_help">
+ <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="viewport19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">4</property>
+ <child>
+ <widget class="GtkVBox" id="vbox226">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">20</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_help_documents">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_menuitem_manual_activate" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox378">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_menu_help_documents">
+ <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_documents">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Documents</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="GtkButton"
id="button_menu_help_shortcuts">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_shortcuts_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox376">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_menu_help_shortcuts">
+ <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_shortcuts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Shortcuts</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="spacing">10</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>
+ <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">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label538">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Help</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkButton" id="button_help_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_help_close_clicked" swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_help_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel"
id="label_button_help_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Close</property>
+ </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">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label531">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">help</property>
+ </widget>
+ <packing>
+ <property name="position">5</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 292017c1..3aa13d7e 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -364,6 +364,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_forcesensor_analyze_save_rfd_auto;
[Widget] Gtk.Image image_forcesensor_analyze_save_rfd_manual;
+ [Widget] Gtk.VBox vbox_help;
+
Random rand;
//persons
@@ -461,7 +463,7 @@ public partial class ChronoJumpWindow
private string progVersion;
private string progName;
private enum notebook_start_pages { PROGRAM, SENDLOG, EXITCONFIRM }
- private enum notebook_sup_pages { START, CONTACTS, ENCODER, SESSION, NETWORKSPROBLEMS }
+ private enum notebook_sup_pages { START, CONTACTS, ENCODER, SESSION, NETWORKSPROBLEMS, HELP }
private enum notebook_analyze_pages { STATISTICS, JUMPSPROFILE, JUMPSDJOPTIMALFALL,
JUMPSWEIGHTFVPROFILE, JUMPSEVOLUTION, SPRINT, FORCESENSOR, RACEENCODER }
private string runningFileName; //useful for knowing if there are two chronojump instances
@@ -754,6 +756,7 @@ public partial class ChronoJumpWindow
}
UtilGtk.ContrastLabelsNotebook (preferences.colorBackgroundIsDark, app1s_notebook);
+ UtilGtk.ContrastLabelsVBox (preferences.colorBackgroundIsDark, vbox_help);
if(preferences.colorBackgroundIsDark)
{
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 71e49b9d..e6d1b65f 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -260,13 +260,10 @@ public partial class ChronoJumpWindow
image_menu_help1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_book.png");
image_menu_help_documents.Pixbuf = pixbuf;
- image_menu_help_documents1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_keyboard.png");
image_menu_help_shortcuts.Pixbuf = pixbuf;
- image_menu_help_shortcuts1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_about.png");
image_menu_help_about.Pixbuf = pixbuf;
- image_menu_help_about1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_warning_red.png");
image_message_permissions_at_boot.Pixbuf = pixbuf;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index b7267eaf..3711bc78 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -30,8 +30,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_buttons_menu_and_persons;
[Widget] Gtk.Arrow arrow_menu_show_session_up;
[Widget] Gtk.Arrow arrow_menu_show_session_down;
- [Widget] Gtk.Arrow arrow_menu_show_help_up;
- [Widget] Gtk.Arrow arrow_menu_show_help_down;
[Widget] Gtk.HBox hbox_radio_show_menu_and_persons;
[Widget] Gtk.RadioButton radio_show_menu;
[Widget] Gtk.RadioButton radio_show_persons;
@@ -51,17 +49,13 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_session_load;
[Widget] Gtk.EventBox eventbox_button_menu_session_more;
[Widget] Gtk.EventBox eventbox_button_menu_preferences;
- [Widget] Gtk.EventBox eventbox_check_menu_help;
- [Widget] Gtk.EventBox eventbox_button_menu_help_documents;
- [Widget] Gtk.EventBox eventbox_button_menu_help_shortcuts;
- [Widget] Gtk.EventBox eventbox_button_menu_help_about;
+ [Widget] Gtk.EventBox eventbox_button_menu_help;
[Widget] Gtk.EventBox eventbox_button_menu_exit;
[Widget] Gtk.CheckButton check_menu_session;
- [Widget] Gtk.CheckButton check_menu_help;
+ [Widget] Gtk.Button button_menu_help;
[Widget] Gtk.VBox vbox_menu_session;
[Widget] Gtk.Alignment alignment_menu_session_options;
[Widget] Gtk.Alignment alignment_menu_person_options;
- [Widget] Gtk.Alignment alignment_menu_help_options;
[Widget] Gtk.Button button_menu_session_new;
@@ -115,11 +109,6 @@ public partial class ChronoJumpWindow
//LogB.Information("hpaned MinPosition: " + hpaned_contacts_main.MinPosition.ToString());
- //unselect menu_help if selected
- if(check_menu_help.Active)
- check_menu_help.Active = false;
- alignment_menu_help_options.Visible = false;
-
/*
//do 1 and then 2 to ensure menu is shrinked after changing to icons
//1
@@ -136,7 +125,7 @@ public partial class ChronoJumpWindow
//menus
l.Add(check_menu_session.SizeRequest().Width);
- l.Add(check_menu_help.SizeRequest().Width);
+ l.Add(button_menu_help.SizeRequest().Width);
l.Add(button_menu_exit.SizeRequest().Width);
l.Add(button_menu_preferences.SizeRequest().Width);
@@ -234,15 +223,12 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_show_persons, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_session, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_preferences, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_help, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_exit, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_more, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_shortcuts, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
}
private void menuShowVerticalArrow (bool selected, Gtk.Arrow a_up, Gtk.Arrow a_down)
@@ -253,9 +239,6 @@ public partial class ChronoJumpWindow
private void on_radio_show_menu_toggled (object o, EventArgs args)
{
- if(check_menu_help.Active)
- check_menu_help.Active = false;
-
viewport_menu.Visible = true;
viewport_persons.Visible = false;
}
@@ -270,23 +253,23 @@ public partial class ChronoJumpWindow
menuShowVerticalArrow (check_menu_session.Active, arrow_menu_show_session_up,
arrow_menu_show_session_down);
if(check_menu_session.Active)
{
- check_menu_help.Active = false;
alignment_menu_session_options.Visible = true;
-
alignment_menu_session_options.Show();
} else
alignment_menu_session_options.Visible = false;
}
- private void on_check_menu_help_clicked (object o, EventArgs args)
+ private void on_button_menu_help_clicked (object o, EventArgs args)
{
- menuShowVerticalArrow (check_menu_help.Active, arrow_menu_show_help_up,
arrow_menu_show_help_down);
- if(check_menu_help.Active)
- {
- check_menu_session.Active = false;
- alignment_menu_help_options.Visible = true;
- } else
- alignment_menu_help_options.Visible = false;
+ menus_and_mode_sensitive(false);
+ app1s_notebook_sup_entered_from = notebook_sup.CurrentPage;
+ notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.HELP);
+ }
+
+ private void on_button_help_close_clicked (object o, EventArgs args)
+ {
+ menus_and_mode_sensitive(true);
+ notebook_sup.CurrentPage = app1s_notebook_sup_entered_from;
}
private int getMenuButtonsMaxWidth(List<int> l)
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index bdbb3c1c..25fdf09f 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -29,8 +29,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Alignment alignment_menu_tiny;
[Widget] Gtk.Arrow arrow_menu_show_session_up1;
[Widget] Gtk.Arrow arrow_menu_show_session_down1;
- [Widget] Gtk.Arrow arrow_menu_show_help_up1;
- [Widget] Gtk.Arrow arrow_menu_show_help_down1;
[Widget] Gtk.VBox vbox_menu_tiny;
[Widget] Gtk.VBox vbox_menu_tiny_menu; //really the menu (without the logos at the bottom)
[Widget] Gtk.EventBox eventbox_check_menu_session1;
@@ -38,19 +36,15 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox eventbox_button_menu_session_new1;
[Widget] Gtk.EventBox eventbox_button_menu_session_load1;
[Widget] Gtk.EventBox eventbox_button_menu_preferences1;
- [Widget] Gtk.EventBox eventbox_check_menu_help1;
- [Widget] Gtk.EventBox eventbox_button_menu_help_documents1;
- [Widget] Gtk.EventBox eventbox_button_menu_help_shortcuts1;
- [Widget] Gtk.EventBox eventbox_button_menu_help_about1;
+ [Widget] Gtk.EventBox eventbox_button_menu_help1;
[Widget] Gtk.EventBox eventbox_button_menu_exit1;
[Widget] Gtk.EventBox eventbox_button_contacts_person_change;
[Widget] Gtk.EventBox eventbox_button_encoder_person_change;
[Widget] Gtk.CheckButton check_menu_session1;
- [Widget] Gtk.CheckButton check_menu_help1;
+ [Widget] Gtk.Button button_menu_help1;
[Widget] Gtk.VBox vbox_menu_session1;
[Widget] Gtk.Alignment alignment_menu_session_options1;
[Widget] Gtk.Alignment alignment_menu_person_options1;
- [Widget] Gtk.Alignment alignment_menu_help_options1;
[Widget] Gtk.Button button_menu_session_more1;
[Widget] Gtk.Button button_menu_preferences1;
@@ -60,9 +54,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_more1;
[Widget] Gtk.Image image_menu_preferences1;
[Widget] Gtk.Image image_menu_help1;
- [Widget] Gtk.Image image_menu_help_documents1;
- [Widget] Gtk.Image image_menu_help_shortcuts1;
- [Widget] Gtk.Image image_menu_help_about1;
[Widget] Gtk.Image image_menu_quit1;
[Widget] Gtk.Viewport viewport_image_logo_icon;
@@ -80,11 +71,6 @@ public partial class ChronoJumpWindow
*/
alignment_menu_tiny.TopPadding = (uint) radio_mode_contacts_capture.SizeRequest().Height + 4
+ 4;
- //unselect menu_help if selected
- if(check_menu_help1.Active)
- check_menu_help1.Active = false;
- alignment_menu_help_options1.Visible = false;
-
image_logo_contacts_transp.Visible = false;
frame_logo_contacts.Visible = false;
image_logo_encoder_transp.Visible = false;
@@ -113,15 +99,12 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_session1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_preferences1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_help1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_exit1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_new1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_load1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_session_more1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_documents1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_shortcuts1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
- UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_help_about1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_contacts_person_change,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_encoder_person_change, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
@@ -133,22 +116,10 @@ public partial class ChronoJumpWindow
menuShowVerticalArrow (check_menu_session1.Active, arrow_menu_show_session_up1,
arrow_menu_show_session_down1);
if(check_menu_session1.Active)
{
- check_menu_help1.Active = false;
alignment_menu_session_options1.Visible = true;
-
alignment_menu_session_options1.Show();
} else
alignment_menu_session_options1.Visible = false;
}
- private void on_check_menu_help1_clicked (object o, EventArgs args)
- {
- menuShowVerticalArrow (check_menu_help1.Active, arrow_menu_show_help_up1,
arrow_menu_show_help_down1);
- if(check_menu_help1.Active)
- {
- check_menu_session1.Active = false;
- alignment_menu_help_options1.Visible = true;
- } else
- alignment_menu_help_options1.Visible = false;
- }
}