[chronojump] 3 icons on the menu



commit f607cf11a8e59c17bf695b6711e854545af89f57
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sat Mar 21 19:10:01 2020 +0100

    3 icons on the menu

 glade/app1.glade      | 52 +++++++++++++++++++++++++++++++++++++++++++--------
 src/Makefile.am       |  3 +++
 src/gui/app1/icons.cs |  7 +++++++
 src/gui/app1/menu.cs  |  7 ++++++-
 4 files changed, 60 insertions(+), 9 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 1f18bd76..cd65fbed 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -801,6 +801,18 @@
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">4</property>
                                                             <child>
+                                                            <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>
+                                                            <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">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
@@ -809,7 +821,7 @@
                                                             <packing>
                                                             <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -843,7 +855,7 @@
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                           </widget>
@@ -874,7 +886,19 @@
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">4</property>
                                                             <child>
-                                                            <widget class="GtkLabel" id="label460">
+                                                            <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>
@@ -882,7 +906,7 @@
                                                             <packing>
                                                             <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -893,7 +917,7 @@
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                           </widget>
@@ -1768,7 +1792,19 @@
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">4</property>
                                                             <child>
-                                                            <widget class="GtkLabel" id="label459">
+                                                            <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>
+                                                            <property name="position">0</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <widget class="GtkLabel" id="label_menu_help">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="label" 
translatable="yes">Help</property>
@@ -1776,7 +1812,7 @@
                                                             <packing>
                                                             <property name="expand">True</property>
                                                             <property name="fill">True</property>
-                                                            <property name="position">0</property>
+                                                            <property name="position">1</property>
                                                             </packing>
                                                             </child>
                                                             <child>
@@ -1810,7 +1846,7 @@
                                                             <packing>
                                                             <property name="expand">False</property>
                                                             <property name="fill">False</property>
-                                                            <property name="position">1</property>
+                                                            <property name="position">2</property>
                                                             </packing>
                                                             </child>
                                                             </widget>
diff --git a/src/Makefile.am b/src/Makefile.am
index f829e3eb..d6077bfd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -529,6 +529,9 @@ RESOURCES = \
        ../images/md/baseline_save_blue_24dp.png,save.png \
        ../images/md/baseline_grid_on_blue_24dp.png,grid.png \
        ../images/md/baseline_new_releases_blue_24dp.png,new.png \
+       ../images/md/baseline_menu_blue_24dp.png,image_menu.png \
+       ../images/md/baseline_apps_6_blue_24dp.png,image_modes.png \
+       ../images/md/baseline_help_blue_24dp.png,image_help.png \
        ../images/chronojump_icon.png,chronojump_icon.png \
        ../images/chronojump_icon_graph.png,chronojump_icon_graph.png \
        ../images/stock_right.png,stock_right.png \
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index b47ae4c5..1e469f2b 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -272,6 +272,13 @@ public partial class ChronoJumpWindow
                image_quit_from_app1.Pixbuf = pixbuf;
                image_menu_quit.Pixbuf = pixbuf;
 
+               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_menu.png");
+               image_button_show_menu.Pixbuf = pixbuf;
+               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_modes.png");
+               image_button_show_modes.Pixbuf = pixbuf;
+               pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_help.png");
+               image_menu_help.Pixbuf = pixbuf;
+
                pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_warning_red.png");
                image_message_permissions_at_boot.Pixbuf = pixbuf;
                image_button_force_sensor_stiffness_problem.Pixbuf = pixbuf;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 5e7bd55c..54e13c50 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -29,7 +29,6 @@ using Glade;
 
 public partial class ChronoJumpWindow
 {
-       [Widget] Gtk.Label label_button_show_menu;
        [Widget] Gtk.Arrow arrow_menu_show_menu_up;
        [Widget] Gtk.Arrow arrow_menu_show_menu_down;
        [Widget] Gtk.Arrow arrow_menu_show_session_up;
@@ -55,6 +54,12 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.CheckButton check_menu_session;
        [Widget] Gtk.CheckButton check_menu_encoder;
        [Widget] Gtk.CheckButton check_menu_help;
+       [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_help;
+       [Widget] Gtk.Label label_menu_help;
        [Widget] Gtk.Image image_menu_preferences;
        [Widget] Gtk.Label label_menu_preferences;
        [Widget] Gtk.Image image_menu_quit;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]