[chronojump] GUI improvements
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] GUI improvements
- Date: Fri, 13 Jan 2017 15:39:53 +0000 (UTC)
commit c96bff1269e61aa297836f4252114973a3484e10
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jan 13 16:33:06 2017 +0100
GUI improvements
glade/app1.glade | 47 +++++++++++++++++++++++++++++++-----
glade/encoder_configuration.glade | 8 ++++--
images/export-24.png | Bin 0 -> 1220 bytes
images/import-24.png | Bin 0 -> 1196 bytes
src/Makefile.am | 2 +
src/constants.cs | 3 ++
src/gui/chronojump.cs | 10 ++++++++
src/gui/encoderConfiguration.cs | 9 ++++++-
8 files changed, 68 insertions(+), 11 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index ec38601..ada26d9 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -48,6 +48,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_open_activate" swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image_session_open">
@@ -65,6 +66,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
+ <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">
@@ -83,6 +85,7 @@
<property name="tooltip" translatable="yes">delete current session</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
+ <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">
@@ -106,15 +109,32 @@
<property name="can_focus">False</property>
<property name="tooltip" translatable="yes">Export set to CSV
(Spreadsheet)</property>
<property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_button_encoder_export_all_curves_clicked"
swapped="no"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image_export_encoder_signal">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem_import_chronojump_session">
+ <widget class="GtkImageMenuItem" id="menuitem_import_chronojump_session">
+ <property name="label" translatable="yes">Import session from another Chronojump
database</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Import session from another Chronojump
database</property>
+ <property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_button_encoder_import_chronojump_session"
swapped="no"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image_import_database">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
@@ -134,12 +154,13 @@
<property name="tooltip" translatable="yes">Useful to export to a Spreadsheet like
MS Excel, LibreOffice or Google Spreadsheets</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_export_session_activate" swapped="no"/>
<child internal-child="image">
- <widget class="GtkImage" id="image9">
+ <widget class="GtkImage" id="image_export_csv">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-convert</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -166,6 +187,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_preferences_activate" swapped="no"/>
</widget>
</child>
@@ -245,6 +267,7 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_quit1_activate" swapped="no"/>
</widget>
</child>
@@ -263,12 +286,20 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkMenuItem" id="menuitem_mode_main_menu">
+ <widget class="GtkImageMenuItem" id="menuitem_mode_main_menu">
+ <property name="label" translatable="yes">Main menu</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Main menu</property>
- <property name="use_underline">True</property>
+ <property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_menuitem_mode_main_menu_activate" swapped="no"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image_mode_main_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-home</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
@@ -452,6 +483,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_menuitem_manual_activate" swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image36">
@@ -516,6 +548,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_stock">False</property>
+ <property name="always_show_image">True</property>
<signal name="activate" handler="on_about1_activate" swapped="no"/>
<child internal-child="image">
<widget class="GtkImage" id="image35">
diff --git a/glade/encoder_configuration.glade b/glade/encoder_configuration.glade
index b8221d0..a4ca07b 100644
--- a/glade/encoder_configuration.glade
+++ b/glade/encoder_configuration.glade
@@ -5,7 +5,7 @@
<widget class="GtkWindow" id="encoder_configuration">
<property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="title" translatable="yes">Select encoder</property>
+ <property name="title" translatable="yes">Select encoder configuration</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<signal name="delete_event" handler="on_delete_event" swapped="no"/>
@@ -1175,7 +1175,7 @@ Eg. value = 2, means person does twice force at half speed.</property>
<widget class="GtkImage" id="image_import">
<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>
@@ -1196,7 +1196,7 @@ Eg. value = 2, means person does twice force at half speed.</property>
<widget class="GtkImage" id="image_export">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-convert</property>
+ <property name="stock">gtk-missing-image</property>
</widget>
</child>
</widget>
@@ -1312,6 +1312,7 @@ Eg. value = 2, means person does twice force at half speed.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Delete</property>
<signal name="clicked" handler="on_button_delete_clicked" swapped="no"/>
<child>
<widget class="GtkImage" id="image_delete">
@@ -1334,6 +1335,7 @@ Eg. value = 2, means person does twice force at half speed.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">New</property>
<signal name="clicked" handler="on_button_new_clicked" swapped="no"/>
<child>
<widget class="GtkImage" id="image_new">
diff --git a/images/export-24.png b/images/export-24.png
new file mode 100644
index 0000000..d2a7146
Binary files /dev/null and b/images/export-24.png differ
diff --git a/images/import-24.png b/images/import-24.png
new file mode 100644
index 0000000..0094827
Binary files /dev/null and b/images/import-24.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 468068c..fa0dd69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -372,6 +372,8 @@ RESOURCES = \
../images/import-csv-headers.png,import-csv-headers.png \
../images/import-csv-name-1-column.png,import-csv-name-1-column.png \
../images/import-csv-name-2-columns.png,import-csv-name-2-columns.png \
+ ../images/import-24.png,import.png \
+ ../images/export-24.png,export.png \
../images/calendar.png,calendar.png \
../images/chronojump-logo-transparent.png,chronojump-logo-transparent.png \
../images/chronojump-logo-2013_320.png,chronojump-logo-2013_320.png \
diff --git a/src/constants.cs b/src/constants.cs
index 4f2be96..5e7389a 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -413,6 +413,9 @@ public class Constants
public static string FileNameOpen1 = "gtk-open-1.png";
public static string FileNameOpenPlus = "gtk-open-plus.png";
+ public static string FileNameImport = "import.png";
+ public static string FileNameExport = "export.png";
+
public static string FileNameCSVHeadersIcon = "import-csv-headers.png";
public static string FileNameCSVNoHeadersIcon = "import-csv-noheaders.png";
public static string FileNameCSVName1Icon = "import-csv-name-1-column.png";
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 6fe4338..7864a74 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -109,6 +109,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_persons_open_1;
[Widget] Gtk.Image image_persons_open_plus;
+ [Widget] Gtk.Image image_import_database;
+ [Widget] Gtk.Image image_export_csv;
+ [Widget] Gtk.Image image_export_encoder_signal;
+
//contact tests execute buttons
//[Widget] Gtk.Image image_button_execute;
[Widget] Gtk.Image image_button_finish;
@@ -754,6 +758,12 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "line_person_max_all_sessions.png");
image_line_person_max_all_sessions.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImport);
+ image_import_database.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameExport);
+ image_export_csv.Pixbuf = pixbuf;
+ image_export_encoder_signal.Pixbuf = pixbuf;
+
//reaction times changes
//UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
//UtilGtk.ColorsTestLabel(viewport_chronopics,
label_extra_window_radio_reaction_time_animation_lights);
diff --git a/src/gui/encoderConfiguration.cs b/src/gui/encoderConfiguration.cs
index e3b5c2d..e148b49 100644
--- a/src/gui/encoderConfiguration.cs
+++ b/src/gui/encoderConfiguration.cs
@@ -89,6 +89,8 @@ public class EncoderConfigurationWindow
[Widget] Gtk.Box vbox_select_encoder;
[Widget] Gtk.Notebook notebook_side;
[Widget] Gtk.TreeView treeview_select;
+ [Widget] Gtk.Image image_import;
+ [Widget] Gtk.Image image_export;
[Widget] Gtk.Image image_delete;
[Widget] Gtk.Entry entry_save_name;
@@ -560,7 +562,12 @@ public class EncoderConfigurationWindow
store = getStore();
treeview_select.Model = store;
- Pixbuf pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
+ Pixbuf pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameImport);
+ image_import.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameExport);
+ image_export.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "stock_delete.png");
image_delete.Pixbuf = pixbuf;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
