[chronojump] Improved icons on session menu and person_multiple_infinite
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Improved icons on session menu and person_multiple_infinite
- Date: Mon, 27 Nov 2017 17:48:31 +0000 (UTC)
commit d5cfd857f0d9bef0d1c4b15d4e6cb2bcfb6edf35
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Nov 27 18:47:44 2017 +0100
Improved icons on session menu and person_multiple_infinite
glade/app1.glade | 51 +++++++++++++++++------
glade/person_multiple_infinite.glade | 7 ++-
images/md/ic_create_new_folder_blue_24dp_1x.png | Bin 280 -> 282 bytes
src/gui/chronojumpIcons.cs | 17 +++++++-
src/gui/person.cs | 10 ++++
5 files changed, 67 insertions(+), 18 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 17aecce..fe0e43c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -33,10 +33,10 @@
<property name="always_show_image">True</property>
<signal name="activate" handler="on_new_activate" swapped="no"/>
<child internal-child="image">
- <widget class="GtkImage" id="image44">
+ <widget class="GtkImage" id="image_session_new2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-new</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -54,7 +54,7 @@
<widget class="GtkImage" id="image_session_open">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -69,10 +69,10 @@
<property name="always_show_image">True</property>
<signal name="activate" handler="on_edit_session_activate" swapped="no"/>
<child internal-child="image">
- <widget class="GtkImage" id="image11">
+ <widget class="GtkImage" id="image_session_edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-edit</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -88,10 +88,10 @@
<property name="always_show_image">True</property>
<signal name="activate" handler="on_delete_session_activate" swapped="no"/>
<child internal-child="image">
- <widget class="GtkImage" id="image12">
+ <widget class="GtkImage" id="image_session_delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -198,13 +198,19 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="menuitem_preferences">
- <property name="label">gtk-preferences</property>
+ <property name="label">Preferences</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
+ <property name="use_stock">False</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="on_preferences_activate" swapped="no"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image_session_preferences">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
@@ -278,13 +284,20 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="quit1">
- <property name="label">gtk-quit</property>
+ <property name="label">Quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
+ <property name="use_stock">False</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="on_quit1_activate" swapped="no"/>
+ <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image_quit_from_app1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -1481,6 +1494,12 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -22181,6 +22200,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/glade/person_multiple_infinite.glade b/glade/person_multiple_infinite.glade
index fc10da2..4d308aa 100644
--- a/glade/person_multiple_infinite.glade
+++ b/glade/person_multiple_infinite.glade
@@ -159,7 +159,7 @@
<property name="tooltip" translatable="yes">Open CSV file</property>
<signal name="clicked" handler="on_button_csv_load_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkImage" id="image_load">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
@@ -180,7 +180,7 @@
<property name="tooltip" translatable="yes">Help</property>
<signal name="clicked" handler="on_button_csv_help_clicked" swapped="no"/>
<child>
- <widget class="GtkImage" id="image1">
+ <widget class="GtkImage" id="image_info">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-info</property>
@@ -7095,7 +7095,7 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
</packing>
</child>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkImage" id="image_load2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
@@ -7198,6 +7198,7 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<property name="can_default">True</property>
<property name="receives_default">False</property>
<signal name="clicked" handler="on_button_csv_help_close_clicked"
swapped="no"/>
+ <accelerator key="Escape" signal="clicked"/>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/images/md/ic_create_new_folder_blue_24dp_1x.png b/images/md/ic_create_new_folder_blue_24dp_1x.png
index 501a71d..855c652 100644
Binary files a/images/md/ic_create_new_folder_blue_24dp_1x.png and
b/images/md/ic_create_new_folder_blue_24dp_1x.png differ
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index ab65a87..499ebcf 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -34,8 +34,13 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_quit;
[Widget] Gtk.Image image_quit1;
[Widget] Gtk.Image image_quit2;
+ [Widget] Gtk.Image image_quit_from_app1;
[Widget] Gtk.Image image_session_new;
+ [Widget] Gtk.Image image_session_new2;
[Widget] Gtk.Image image_session_load;
+ [Widget] Gtk.Image image_session_edit;
+ [Widget] Gtk.Image image_session_delete;
+ [Widget] Gtk.Image image_session_preferences;
[Widget] Gtk.Image image_mode_encoder_capture;
[Widget] Gtk.Image image_manage_persons;
[Widget] Gtk.Image image_person;
@@ -134,11 +139,13 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_settings.png");
image_settings.Pixbuf = pixbuf;
image_settings1.Pixbuf = pixbuf;
+ image_session_preferences.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_quit.png");
image_quit.Pixbuf = pixbuf;
image_quit1.Pixbuf = pixbuf;
image_quit2.Pixbuf = pixbuf;
+ image_quit_from_app1.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "muscle-concentric.png");
image_top_eccon.Pixbuf = pixbuf;
@@ -220,9 +227,13 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_new_big.png");
image_session_new.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_new.png");
+ image_session_new2.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open_big.png");
image_session_load.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
+ image_session_open.Pixbuf = pixbuf;
image_encoder_capture_open.Pixbuf = pixbuf;
image_encoder_capture_open1.Pixbuf = pixbuf;
image_force_sensor_capture_load.Pixbuf = pixbuf;
@@ -244,6 +255,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_edit.png");
image_encoder_exercise_edit.Pixbuf = pixbuf;
image_edit_current_person.Pixbuf = pixbuf;
+ image_session_edit.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
image_encoder_exercise1.Pixbuf = pixbuf;
@@ -372,8 +384,8 @@ public partial class ChronoJumpWindow
UtilGtk.ColorsRadio(viewport_chronopics, extra_window_radio_multichronopic_run_analysis);
//open buttons (this is shown better in windows than the default open icon)
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameOpen);
- image_session_open.Pixbuf = pixbuf;
+ //pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameOpen);
+ //image_session_open.Pixbuf = pixbuf;
//not changed because it's small. TODO: do bigger
//image_encoder_capture_open.Pixbuf = pixbuf;
@@ -401,6 +413,7 @@ public partial class ChronoJumpWindow
image_jump_type_delete_reactive.Pixbuf = pixbuf;
image_run_type_delete_simple.Pixbuf = pixbuf;
image_run_type_delete_intervallic.Pixbuf = pixbuf;
+ image_session_delete.Pixbuf = pixbuf;
//zoom icons, done like this because there's one zoom icon created ad-hoc,
//and is not nice that the other are different for an user theme change
diff --git a/src/gui/person.cs b/src/gui/person.cs
index 106a8da..c7a62f7 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -1741,6 +1741,9 @@ public class PersonAddMultipleWindow {
[Widget] Gtk.Image image_csv_noheaders;
[Widget] Gtk.Image image_csv_headers_help;
[Widget] Gtk.Image image_csv_noheaders_help;
+ [Widget] Gtk.Image image_load;
+ [Widget] Gtk.Image image_load2;
+ [Widget] Gtk.Image image_info;
[Widget] Gtk.Table table_headers_1_column;
[Widget] Gtk.Table table_no_headers_1_column;
@@ -1839,6 +1842,13 @@ public class PersonAddMultipleWindow {
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameCSVName2Icon);
image_name2.Pixbuf = pixbuf;
image_name2_help.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_open.png");
+ image_load.Pixbuf = pixbuf;
+ image_load2.Pixbuf = pixbuf;
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_info.png");
+ image_info.Pixbuf = pixbuf;
}
void tablesVisibility() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
