[chronojump] cancel/accept icons on help,about, shortcuts
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] cancel/accept icons on help,about, shortcuts
- Date: Mon, 26 Jul 2021 15:00:59 +0000 (UTC)
commit ec2f38ab6e61ea55ba35d8d685ca7d86ec648941
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jul 26 17:00:37 2021 +0200
cancel/accept icons on help,about, shortcuts
glade/app1.glade | 24 ++++++++++++++++++++++++
glade/dialog_about.glade | 35 ++++++++++++++++++++++++++++++++---
glade/dialog_shortcuts.glade | 35 ++++++++++++++++++++++++++++++++---
src/gui/about.cs | 6 +++++-
src/gui/app1/icons.cs | 3 +++
src/gui/dialogShortcuts.cs | 4 ++++
6 files changed, 100 insertions(+), 7 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index e43317406..c22d7e90b 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -47793,11 +47793,35 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox546">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_button_help_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
diff --git a/glade/dialog_about.glade b/glade/dialog_about.glade
index e845a2537..aea67429e 100644
--- a/glade/dialog_about.glade
+++ b/glade/dialog_about.glade
@@ -18,18 +18,47 @@
<widget class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="layout_style">center</property>
<child>
<widget class="GtkButton" id="button_close">
- <property name="label">gtk-close</property>
<property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
<signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_button_close">
+ <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="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Close</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>
diff --git a/glade/dialog_shortcuts.glade b/glade/dialog_shortcuts.glade
index 896ac31b8..9c208a168 100644
--- a/glade/dialog_shortcuts.glade
+++ b/glade/dialog_shortcuts.glade
@@ -2138,17 +2138,46 @@
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="layout_style">center</property>
<child>
<widget class="GtkButton" id="button_close">
- <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
<signal name="clicked" handler="on_button_close_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_button_close">
+ <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="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Close</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">True</property>
diff --git a/src/gui/about.cs b/src/gui/about.cs
index 97c1ce395..4519290ea 100644
--- a/src/gui/about.cs
+++ b/src/gui/about.cs
@@ -29,6 +29,7 @@ public class About
[Widget] Gtk.Image image_logo;
[Widget] Gtk.Label dialog_about_label_chronojump;
[Widget] Gtk.Label dialog_about_label_version;
+ [Widget] Gtk.Image image_button_close;
[Widget] Gtk.Label dialog_about_label_developers_software;
[Widget] Gtk.Label dialog_about_label_developers_networks;
@@ -55,11 +56,14 @@ public class About
//put an icon to window
UtilGtk.IconWindow(dialog_about);
- //put logo image
+ //images:
Pixbuf pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogo);
image_logo.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_cancel.png");
+ image_button_close.Pixbuf = pixbuf;
+
dialog_about_label_version.Text = version;
dialog_about_label_translators.Text = translators;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 255cc3b5d..4bef13e0d 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -114,6 +114,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_start_selector_races;
[Widget] Gtk.Label label_start_selector_encoder;
+ [Widget] Gtk.Image image_button_help_close;
+
//jumps
[Widget] Gtk.Image image_button_jumps_simple_capture_save_image_chart;
[Widget] Gtk.Image image_button_jumps_simple_capture_save_image_disk;
@@ -770,6 +772,7 @@ public partial class ChronoJumpWindow
image_app1s_button_export_close.Pixbuf = pixbuf;
image_app1s_button_backup_cancel_close.Pixbuf = pixbuf;
image_app1s_button_cancel1.Pixbuf = pixbuf;
+ image_button_help_close.Pixbuf = pixbuf;
//accept
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_done_blue.png");
diff --git a/src/gui/dialogShortcuts.cs b/src/gui/dialogShortcuts.cs
index 09c139ed4..3cdce31b9 100644
--- a/src/gui/dialogShortcuts.cs
+++ b/src/gui/dialogShortcuts.cs
@@ -33,6 +33,7 @@ public class DialogShortcuts
[Widget] Gtk.Label label_ctrl4;
[Widget] Gtk.Label label_ctrl5;
[Widget] Gtk.Label label_enter;
+ [Widget] Gtk.Image image_button_close;
//images on capture tab
[Widget] Gtk.Image image_enc_grav_1;
@@ -99,6 +100,9 @@ public class DialogShortcuts
{
Pixbuf pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_cancel.png");
+ image_button_close.Pixbuf = pixbuf;
+
//capture tab
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_weight.png"); //encoder
gravitatory
image_enc_grav_1.Pixbuf = pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
