ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=64f33b0823dc1722b6fb21c067faace423a9e2c7
commit 64f33b0823dc1722b6fb21c067faace423a9e2c7
Author: Andy Williams <a...@andywilliams.me>
Date: Tue May 26 23:59:16 2015 +0100
Update icons and about imagery
---
AUTHORS | 1 +
ChangeLog | 4 ++++
data/desktop/edi.png | Bin 93235 -> 95694 bytes
data/images/Makefile.am | 4 +++-
data/images/about.png | Bin 0 -> 98898 bytes
data/images/welcome.png | Bin 93235 -> 95694 bytes
src/bin/screens/edi_about.c | 3 ++-
7 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 7ca130a..cebf4d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ ajwillia.ms (Andy Williams) <a...@andywilliams.me>
wilsonk (Kelly Wilson) <wils...@cpsc.ucalgary.ca>
Windows compatibility thanks to Vincent Torri <vincent.to...@gmail.com>
+Icon created by The Rasterman (Carsten Haitzler) <ras...@rasterman.com>
With sections from Ecrire by Tom Hacohen <t...@stosb.com>
Clang syntax higlighting from cedric and TAsn in the edi PROTO project
diff --git a/ChangeLog b/ChangeLog
index edf07b5..c62ac0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-26 ajwillia.ms (Andy Williams)
+
+ * Add new icon from raster and update welcome/about image layouts
+
2015-05-18 ajwillia.ms (Andy Williams)
* Remember open tabs and windows per project
diff --git a/data/desktop/edi.png b/data/desktop/edi.png
index a375b55..640f448 100644
Binary files a/data/desktop/edi.png and b/data/desktop/edi.png differ
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 84b0505..126fcf7 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,6 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
imagesdir = $(datadir)/$(PACKAGE)/images
-images_DATA = welcome.png
+images_DATA = \
+about.png \
+welcome.png
EXTRA_DIST = $(images_DATA)
diff --git a/data/images/about.png b/data/images/about.png
new file mode 100644
index 0000000..de0511d
Binary files /dev/null and b/data/images/about.png differ
diff --git a/data/images/welcome.png b/data/images/welcome.png
index a375b55..640f448 100644
Binary files a/data/images/welcome.png and b/data/images/welcome.png differ
diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index 3337bea..26bad12 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -40,10 +40,11 @@ edi_about_show(Evas_Object *mainwin)
elm_win_resize_object_add(win, table);
evas_object_show(table);
- snprintf(buf, sizeof(buf), "%s/images/welcome.png", elm_app_data_dir_get());
+ snprintf(buf, sizeof(buf), "%s/images/about.png", elm_app_data_dir_get());
bg = elm_bg_add(win);
elm_bg_option_set(bg, ELM_BG_OPTION_CENTER);
elm_bg_file_set(bg, buf, NULL);
+ elm_bg_option_set(bg, ELM_BG_OPTION_SCALE);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(table, bg, 0, 0, 1, 1);
--
