commit d8a77a9e37c916b3156cb4b40781df9174147c8e
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Mar 21 13:47:58 2020 +0100
Yellow color for button menu and mode
glade/app1.glade | 64 +++++++++++++++++++++++++++-------------------
src/gui/app1/chronojump.cs | 2 +-
src/gui/app1/menu.cs | 10 +++++---
3 files changed, 46 insertions(+), 30 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index ce8596e9..b1896893 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -792,24 +792,28 @@
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_button_show_menu_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox367">
+ <widget class="GtkEventBox"
id="eventbox_button_show_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
<child>
- <widget class="GtkLabel"
id="label_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="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">0</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>
@@ -835,12 +839,14 @@
<property name="position">1</property>
</packing>
</child>
- </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>
@@ -852,39 +858,45 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_modes">
+ <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_modes_clicked"
swapped="no"/>
+ <signal name="clicked"
handler="on_button_show_modes_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox366">
+ <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="label460">
+ <widget class="GtkHBox" id="hbox366">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label460">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Mode</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkArrow" id="arrow_down5">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkArrow" id="arrow_down5">
<property name="visible">True</property>
<property name="can_focus">False</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 3624e44a..7cc7809f 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3465,7 +3465,7 @@ public partial class ChronoJumpWindow
//show the program
notebook_start.CurrentPage = 0;
- button_modes.Sensitive = true;
+ button_show_modes.Sensitive = true;
//make main_menu visible because it's not visible at startup.
//but don't show if session == UNIQUE
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index ce5ceac4..bbc36c15 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -38,13 +38,15 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Arrow arrow_menu_show_encoder_down;
[Widget] Gtk.Arrow arrow_menu_show_help_up;
[Widget] Gtk.Arrow arrow_menu_show_help_down;
- [Widget] Gtk.Button button_modes;
+ [Widget] Gtk.Button button_show_modes;
//[Widget] Gtk.HPaned hpaned_contacts_main;
[Widget] Gtk.Viewport viewport_hpaned_contacts_main;
[Widget] Gtk.Viewport viewport_start_modes;
[Widget] Gtk.Viewport viewport_menu_top;
[Widget] Gtk.Viewport viewport_menu;
[Widget] Gtk.Viewport viewport_persons;
+ [Widget] Gtk.EventBox eventbox_button_show_menu;
+ [Widget] Gtk.EventBox eventbox_button_show_modes;
[Widget] Gtk.EventBox eventbox_check_menu_session;
[Widget] Gtk.EventBox eventbox_button_menu_preferences;
[Widget] Gtk.EventBox eventbox_check_menu_encoder;
@@ -77,6 +79,8 @@ public partial class ChronoJumpWindow
//UtilGtk.ViewportColor(viewport_menu, UtilGtk.GRAY_LIGHT);
//UtilGtk.ViewportColor(viewport_persons, UtilGtk.BLUE_CLEAR2);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_show_menu, UtilGtk.YELLOW);
+ UtilGtk.EventBoxColorBackgroundActive (eventbox_button_show_modes, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_session, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_menu_preferences, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_encoder, UtilGtk.YELLOW);
@@ -148,10 +152,10 @@ public partial class ChronoJumpWindow
alignment_menu_help_options.Visible = false;
}
- private void on_button_modes_clicked (object o, EventArgs args)
+ private void on_button_show_modes_clicked (object o, EventArgs args)
{
show_start_page();
- button_modes.Sensitive = false;
+ button_show_modes.Sensitive = false;
/*
//to care about viewport_menu_top being lower width allocated and a bit hidden by
hpaned_contacts_main