commit 1b88d9c00cf62f29182f32a45cb14389e3d011b7
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Mar 23 12:04:13 2020 +0100
Menu: code for accelerators and about icons
glade/app1.glade | 86 +++++++++++++++++++++++++++++++++++++++++++++++++--
src/Makefile.am | 2 ++
src/gui/app1/icons.cs | 4 +++
src/gui/app1/menu.cs | 4 +++
4 files changed, 94 insertions(+), 2 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 030f947c..76e72224 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1902,11 +1902,40 @@
</child>
<child>
<widget class="GtkButton"
id="button_menu_help_accelerators">
- <property name="label"
translatable="yes">Accelerators</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="on_menuitem_accelerators_activate" swapped="no"/>
+ <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_accelerators">
+ <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_accelerators">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Accelerators</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>
@@ -1916,11 +1945,40 @@
</child>
<child>
<widget class="GtkButton"
id="button_menu_help_about">
- <property name="label"
translatable="yes">About</property>
<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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24443,6 +24501,18 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -34253,6 +34323,18 @@ then click this button.</property>
<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/src/Makefile.am b/src/Makefile.am
index 76d1d3aa..e4d2292c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -531,6 +531,8 @@ RESOURCES = \
../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_keyboard_blue_24dp.png,image_keyboard.png \
+ ../images/md/about.png,image_about.png \
../images/md/folders_blue.png,image_folders.png \
../images/md/baseline_help_blue_24dp.png,image_help.png \
../images/chronojump_icon.png,chronojump_icon.png \
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 25ccb8d3..ec5c3f73 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -280,6 +280,10 @@ public partial class ChronoJumpWindow
image_menu_folders.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_keyboard.png");
+ image_menu_help_accelerators.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_about.png");
+ image_menu_help_about.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 cf201680..87e01dfb 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -64,6 +64,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_menu_preferences;
[Widget] Gtk.Image image_menu_help;
[Widget] Gtk.Label label_menu_help;
+ [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;
[Widget] Gtk.Label label_menu_quit;
[Widget] Gtk.Alignment alignment_menu_session_options;