commit ed456751d8579a18d6f7823f6e4574f74c6b7ace
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Mar 20 19:56:36 2020 +0100
capture/analyze buttons with yellow background if active/prelight
glade/app1.glade | 108 +++++++++++++++++++++++++++------------------
src/gui/app1/chronojump.cs | 9 ++++
2 files changed, 75 insertions(+), 42 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 1fc4955b..e98a4b52 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1712,22 +1712,20 @@
<property name="draw_indicator">False</property>
<signal name="clicked"
handler="on_check_menu_help_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox370">
+ <widget class="GtkEventBox"
id="eventbox_check_menu_help">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkEventBox"
id="eventbox_check_menu_help">
+ <widget class="GtkHBox" id="hbox370">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkLabel" id="label459">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Help</property>
</widget>
- </child>
- </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -1771,6 +1769,8 @@
</widget>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
@@ -5873,34 +5873,40 @@ EncoderInertialCapture</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="on_radio_mode_contacts_capture_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox193">
+ <widget class="GtkEventBox"
id="eventbox_radio_mode_contacts_capture">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkImage" id="image_tests_capture">
+ <widget class="GtkHBox" id="hbox193">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_tests_capture">
<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">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_mode_contacts_capture">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_mode_contacts_capture">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Capture</property>
<property name="justify">center</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -5924,7 +5930,11 @@ EncoderInertialCapture</property>
<property
name="group">radio_mode_contacts_capture</property>
<signal name="toggled"
handler="on_radio_mode_contacts_analyze_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox331">
+ <widget class="GtkEventBox"
id="eventbox_radio_mode_contacts_analyze">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox1111">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
@@ -5953,6 +5963,8 @@ EncoderInertialCapture</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -24931,34 +24943,40 @@ Concentric</property>
<property name="draw_indicator">False</property>
<signal name="toggled"
handler="on_radio_mode_encoder_capture_small_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox134">
+ <widget class="GtkEventBox"
id="eventbox_radio_mode_encoder_capture_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkImage"
id="image_mode_encoder_capture">
+ <widget class="GtkHBox" id="hbox134">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_mode_encoder_capture">
<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">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel"
id="label_mode_encoder_capture">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_mode_encoder_capture">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Capture</property>
<property name="justify">center</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -24978,34 +24996,40 @@ Concentric</property>
<property
name="group">radio_mode_encoder_capture_small</property>
<signal name="toggled"
handler="on_radio_mode_encoder_analyze_small_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox135">
+ <widget class="GtkEventBox"
id="eventbox_radio_mode_encoder_analyze_small">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
<child>
- <widget class="GtkImage"
id="image_stats_win_graph3">
+ <widget class="GtkHBox" id="hbox135">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage"
id="image_stats_win_graph3">
<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_mode_encoder_analyze">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_mode_encoder_analyze">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Analyze</property>
<property name="justify">center</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
- </packing>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index df2a90f5..6377605e 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -84,6 +84,11 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_message_permissions_at_boot;
[Widget] Gtk.HBox hbox_message_camera_at_boot;
+ [Widget] Gtk.EventBox eventbox_radio_mode_contacts_capture;
+ [Widget] Gtk.EventBox eventbox_radio_mode_contacts_analyze;
+ [Widget] Gtk.EventBox eventbox_radio_mode_encoder_capture_small;
+ [Widget] Gtk.EventBox eventbox_radio_mode_encoder_analyze_small;
+
[Widget] Gtk.HBox hbox_contacts_sup_capture_analyze_two_buttons;
[Widget] Gtk.Alignment alignment_radio_mode_contacts_analyze;
[Widget] Gtk.HBox hbox_radio_mode_contacts_analyze_jump_buttons;
@@ -596,6 +601,10 @@ public partial class ChronoJumpWindow
initForceSensor();
initRunEncoder();
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_contacts_capture, UtilGtk.YELLOW);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_contacts_analyze, UtilGtk.YELLOW);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_encoder_capture_small,
UtilGtk.YELLOW);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_encoder_analyze_small,
UtilGtk.YELLOW);
createComboSelectJumps(true);
createComboSelectJumpsDjOptimalFall(true);