summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoma <toma>2010-01-17 02:33:48 +0000
committertoma <toma@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2010-01-17 02:33:48 +0000
commit6687a465cf0c4947646dd29cb8d5e36e0fe8649d (patch)
tree61b946b336dc5801bffc63f6ad71c520f5eeb718
parent9469eef95c3a2874862dde694d66f9f4c3ac4add (diff)
Expedite 0.7.0 now with a nicer look! Reworked graphics to bring it more in-line with EFL current look. Also added a logo.png file that can be easily changed without upsetting the start interface. If you use this version, you may experience different performance results in comparision to the older version so please consider this when using it for benchmarking.
SVN revision: 45237
-rw-r--r--README5
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am3
-rw-r--r--data/bar.pngbin3631 -> 870 bytes
-rw-r--r--data/bg.pngbin36736 -> 0 bytes
-rw-r--r--data/bg2.pngbin211301 -> 0 bytes
-rw-r--r--data/e-logo.pngbin0 -> 15348 bytes
-rw-r--r--data/e.pngbin1951 -> 2012 bytes
-rw-r--r--data/exit.pngbin1250 -> 1729 bytes
-rw-r--r--data/frame.pngbin555 -> 618 bytes
-rw-r--r--data/icon_sel.pngbin3645 -> 3165 bytes
-rw-r--r--data/icon_sel2.pngbin3523 -> 0 bytes
-rw-r--r--data/logo.pngbin28493 -> 33620 bytes
-rw-r--r--data/text_sel.pngbin24253 -> 1108 bytes
-rw-r--r--expedite.oe2
-rw-r--r--expedite.spec2
-rw-r--r--src/bin/image_blend_border.c2
-rw-r--r--src/bin/image_blend_solid_middle_border.c2
-rw-r--r--src/bin/ui.c60
19 files changed, 19 insertions, 59 deletions
diff --git a/README b/README
index 5726850..6ccc1d1 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
1Expedite 0.6.0 1Expedite 0.7.0
2 2
3This is meant to be a detailed and comprehensive benchmark suite for Evas. 3This is meant to be a detailed and comprehensive benchmark suite for Evas.
4
5The images can be interchanged for demonstration purposes. Logo.png should
6have some areas of alpha to demonstrate transparency. \ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 5910beb..e59ce97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
3# get rid of that stupid cache mechanism 3# get rid of that stupid cache mechanism
4rm -f config.cache 4rm -f config.cache
5 5
6AC_INIT([expedite], [0.6.0], [enlightenment-devel@lists.sourceforge.net]) 6AC_INIT([expedite], [0.7.0], [enlightenment-devel@lists.sourceforge.net])
7AC_PREREQ([2.52]) 7AC_PREREQ([2.52])
8AC_CONFIG_SRCDIR([configure.ac]) 8AC_CONFIG_SRCDIR([configure.ac])
9AC_CONFIG_HEADERS([config.h]) 9AC_CONFIG_HEADERS([config.h])
diff --git a/data/Makefile.am b/data/Makefile.am
index c3e6a03..8157ca1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,8 +14,8 @@ VeraSe.ttf \
14VeraSeBd.ttf \ 14VeraSeBd.ttf \
15fonts.alias \ 15fonts.alias \
16fonts.dir \ 16fonts.dir \
17bg.png \
18logo.png \ 17logo.png \
18e-logo.png \
19e.png \ 19e.png \
20image.png \ 20image.png \
21bar.png \ 21bar.png \
@@ -24,7 +24,6 @@ pan.png \
24tp.png \ 24tp.png \
25tp.yuv \ 25tp.yuv \
26icon_sel.png \ 26icon_sel.png \
27icon_sel2.png \
28text_sel.png \ 27text_sel.png \
29exit.png \ 28exit.png \
30watch.png \ 29watch.png \
diff --git a/data/bar.png b/data/bar.png
index ab380c4..cd5c3a7 100644
--- a/data/bar.png
+++ b/data/bar.png
Binary files differ
diff --git a/data/bg.png b/data/bg.png
deleted file mode 100644
index 600325e..0000000
--- a/data/bg.png
+++ /dev/null
Binary files differ
diff --git a/data/bg2.png b/data/bg2.png
deleted file mode 100644
index 3692cd9..0000000
--- a/data/bg2.png
+++ /dev/null
Binary files differ
diff --git a/data/e-logo.png b/data/e-logo.png
new file mode 100644
index 0000000..113ee14
--- /dev/null
+++ b/data/e-logo.png
Binary files differ
diff --git a/data/e.png b/data/e.png
index 35b78ed..f14feff 100644
--- a/data/e.png
+++ b/data/e.png
Binary files differ
diff --git a/data/exit.png b/data/exit.png
index a3319ed..f27a0fa 100644
--- a/data/exit.png
+++ b/data/exit.png
Binary files differ
diff --git a/data/frame.png b/data/frame.png
index 0867f1b..cdb24af 100644
--- a/data/frame.png
+++ b/data/frame.png
Binary files differ
diff --git a/data/icon_sel.png b/data/icon_sel.png
index 6f89a4a..3075afd 100644
--- a/data/icon_sel.png
+++ b/data/icon_sel.png
Binary files differ
diff --git a/data/icon_sel2.png b/data/icon_sel2.png
deleted file mode 100644
index 62cb25b..0000000
--- a/data/icon_sel2.png
+++ /dev/null
Binary files differ
diff --git a/data/logo.png b/data/logo.png
index 46671b2..3b1ddf5 100644
--- a/data/logo.png
+++ b/data/logo.png
Binary files differ
diff --git a/data/text_sel.png b/data/text_sel.png
index 6b847fa..ac118d2 100644
--- a/data/text_sel.png
+++ b/data/text_sel.png
Binary files differ
diff --git a/expedite.oe b/expedite.oe
index bc4a41f..acae6e6 100644
--- a/expedite.oe
+++ b/expedite.oe
@@ -4,7 +4,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
4SECTION = "e/test" 4SECTION = "e/test"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "evas" 6DEPENDS = "evas"
7PV = "0.6.0" 7PV = "0.7.0"
8PR = "1" 8PR = "1"
9 9
10do_prepsources () { 10do_prepsources () {
diff --git a/expedite.spec b/expedite.spec
index 4df3745..a49bbce 100644
--- a/expedite.spec
+++ b/expedite.spec
@@ -1,5 +1,5 @@
1# Note that this is NOT a relocatable package 1# Note that this is NOT a relocatable package
2%define ver 0.6.0 2%define ver 0.7.0
3%define rel 1 3%define rel 1
4%define prefix /usr 4%define prefix /usr
5 5
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index e946334..d1fe7bf 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = evas_object_image_add(evas); 26 o = evas_object_image_add(evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("bar.png"), NULL); 28 evas_object_image_file_set(o, build_path("bar.png"), NULL);
29 evas_object_image_border_set(o, 8, 8, 8, 8); 29 evas_object_image_border_set(o, 6, 6, 6, 6);
30 evas_object_show(o); 30 evas_object_show(o);
31 } 31 }
32 done = 0; 32 done = 0;
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 13b3a0b..a63eae0 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = evas_object_image_add(evas); 26 o = evas_object_image_add(evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 evas_object_image_file_set(o, build_path("bar.png"), NULL); 28 evas_object_image_file_set(o, build_path("bar.png"), NULL);
29 evas_object_image_border_set(o, 8, 8, 8, 8); 29 evas_object_image_border_set(o, 6, 6, 6, 6);
30 evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); 30 evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
31 evas_object_show(o); 31 evas_object_show(o);
32 } 32 }
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 586c2a7..e9619d8 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -32,7 +32,6 @@ static Evas_Object *o_menu_icon_sel = NULL;
32static Evas_Object *o_menu_icon_sel2 = NULL; 32static Evas_Object *o_menu_icon_sel2 = NULL;
33static Evas_Object *o_menu_text_sel = NULL; 33static Evas_Object *o_menu_text_sel = NULL;
34static Evas_Object *o_menu_title = NULL; 34static Evas_Object *o_menu_title = NULL;
35static Evas_Object *o_menu_title2 = NULL;
36static Eina_List *menu = NULL; 35static Eina_List *menu = NULL;
37static int menu_sel = 0; 36static int menu_sel = 0;
38static int menu_active = 0; 37static int menu_active = 0;
@@ -72,7 +71,6 @@ _ui_all(void)
72 71
73 evas_object_hide(o_menu_logo); 72 evas_object_hide(o_menu_logo);
74 evas_object_hide(o_menu_title); 73 evas_object_hide(o_menu_title);
75 evas_object_hide(o_menu_title2);
76 evas_object_hide(o_menu_icon); 74 evas_object_hide(o_menu_icon);
77 evas_object_hide(o_menu_icon_sel); 75 evas_object_hide(o_menu_icon_sel);
78 evas_object_hide(o_menu_icon_sel2); 76 evas_object_hide(o_menu_icon_sel2);
@@ -117,7 +115,6 @@ _ui_num(int n)
117 115
118 evas_object_hide(o_menu_logo); 116 evas_object_hide(o_menu_logo);
119 evas_object_hide(o_menu_title); 117 evas_object_hide(o_menu_title);
120 evas_object_hide(o_menu_title2);
121 evas_object_hide(o_menu_icon); 118 evas_object_hide(o_menu_icon);
122 evas_object_hide(o_menu_icon_sel); 119 evas_object_hide(o_menu_icon_sel);
123 evas_object_hide(o_menu_icon_sel2); 120 evas_object_hide(o_menu_icon_sel2);
@@ -157,7 +154,6 @@ _ui_select(void)
157 154
158 evas_object_hide(o_menu_logo); 155 evas_object_hide(o_menu_logo);
159 evas_object_hide(o_menu_title); 156 evas_object_hide(o_menu_title);
160 evas_object_hide(o_menu_title2);
161 evas_object_hide(o_menu_icon); 157 evas_object_hide(o_menu_icon);
162 evas_object_hide(o_menu_icon_sel); 158 evas_object_hide(o_menu_icon_sel);
163 evas_object_hide(o_menu_icon_sel2); 159 evas_object_hide(o_menu_icon_sel2);
@@ -317,18 +313,6 @@ _ui_setup(void)
317 evas_object_show(o); 313 evas_object_show(o);
318 o_wallpaper = o; 314 o_wallpaper = o;
319 315
320/*
321 o = evas_object_image_add(evas);
322 evas_object_move(o, 0, 0);
323 evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/bg.png", NULL);
324 evas_object_image_fill_set(o, 0, 0, win_w, win_h);
325 evas_object_image_smooth_scale_set(o, 0);
326 evas_object_resize(o, win_w, win_h);
327 evas_object_layer_set(o, -99);
328 evas_object_show(o);
329 o_wallpaper = o;
330 */
331
332 o = evas_object_text_add(evas); 316 o = evas_object_text_add(evas);
333 evas_object_text_font_set(o, "Vera-Bold", 10); 317 evas_object_text_font_set(o, "Vera-Bold", 10);
334 evas_object_text_text_set(o, "EXPEDITE"); 318 evas_object_text_text_set(o, "EXPEDITE");
@@ -357,7 +341,7 @@ _ui_setup(void)
357 341
358 o = evas_object_image_add(evas); 342 o = evas_object_image_add(evas);
359 evas_object_move(o, (win_w - 120) / 2, ((win_h - 160) / 2)); 343 evas_object_move(o, (win_w - 120) / 2, ((win_h - 160) / 2));
360 evas_object_image_file_set(o, build_path("logo.png"), NULL); 344 evas_object_image_file_set(o, build_path("e-logo.png"), NULL);
361 evas_object_image_fill_set(o, 0, 0, 120, 160); 345 evas_object_image_fill_set(o, 0, 0, 120, 160);
362 evas_object_resize(o, 120, 160); 346 evas_object_resize(o, 120, 160);
363 evas_object_layer_set(o, -98); 347 evas_object_layer_set(o, -98);
@@ -375,8 +359,8 @@ _ui_setup(void)
375 o = evas_object_image_add(evas); 359 o = evas_object_image_add(evas);
376 evas_object_move(o, 0, 0); 360 evas_object_move(o, 0, 0);
377 evas_object_image_file_set(o, build_path("icon_sel.png"), NULL); 361 evas_object_image_file_set(o, build_path("icon_sel.png"), NULL);
378 evas_object_resize(o, 56, 56); 362 evas_object_resize(o, 48, 48);
379 evas_object_image_fill_set(o, 0, 0, 56, 56); 363 evas_object_image_fill_set(o, 0, 0, 48, 48);
380 o_menu_icon_sel = o; 364 o_menu_icon_sel = o;
381 365
382 o = evas_object_image_add(evas); 366 o = evas_object_image_add(evas);
@@ -384,29 +368,11 @@ _ui_setup(void)
384 evas_object_image_file_set(o, build_path("text_sel.png"), NULL); 368 evas_object_image_file_set(o, build_path("text_sel.png"), NULL);
385 evas_object_resize(o, 96, 32); 369 evas_object_resize(o, 96, 32);
386 evas_object_image_fill_set(o, 0, 0, 96, 32); 370 evas_object_image_fill_set(o, 0, 0, 96, 32);
387 evas_object_image_border_set(o, 8, 8, 8, 8); 371 evas_object_image_border_set(o, 7, 7, 7, 7);
388 o_menu_text_sel = o; 372 o_menu_text_sel = o;
389 373
390 o = evas_object_image_add(evas);
391 evas_object_move(o, 0, 0);
392 evas_object_image_file_set(o, build_path("icon_sel2.png"), NULL);
393 evas_object_resize(o, 56, 41);
394 evas_object_image_fill_set(o, 0, 0, 56, 41);
395 o_menu_icon_sel2 = o;
396
397 o = evas_object_text_add(evas);
398 evas_object_text_font_set(o, "Vera-Bold", 10);
399 evas_object_text_text_set(o, "");
400 evas_object_color_set(o, 100, 100, 100, 100);
401 evas_object_pass_events_set(o, 1);
402 evas_object_geometry_get(o, NULL, NULL, &w, &h);
403 x = ((win_w - w) / 2) + 1;
404 y = ((win_h - h) / 2) + 1;
405 evas_object_move(o, x, y);
406 o_menu_title2 = o;
407
408 o = evas_object_text_add(evas); 374 o = evas_object_text_add(evas);
409 evas_object_text_font_set(o, "Vera-Bold", 10); 375 evas_object_text_font_set(o, "Vera", 10);
410 evas_object_text_text_set(o, ""); 376 evas_object_text_text_set(o, "");
411 evas_object_color_set(o, 0, 0, 0, 100); 377 evas_object_color_set(o, 0, 0, 0, 100);
412 evas_object_pass_events_set(o, 1); 378 evas_object_pass_events_set(o, 1);
@@ -568,25 +534,18 @@ ui_loop(void)
568 a = 255 - (255 * a); 534 a = 255 - (255 * a);
569 535
570 o = o_menu_icon_sel; 536 o = o_menu_icon_sel;
571 evas_object_move(o, x - ((56 - w) / 2), y - ((56 - h) / 2)); 537 evas_object_move(o, x - ((48 - w) / 2), y - ((48 - h) / 2));
572 evas_object_color_set(o, a, a, a, a); 538 evas_object_color_set(o, a, a, a, a);
573 539
574 o = o_menu_icon_sel2;
575 evas_object_move(o, (win_w - 56) / 2, (win_h / 2) + len - 4);
576
577 o = o_menu_title; 540 o = o_menu_title;
578 evas_object_color_set(o, 0, 0, 0, a); 541 evas_object_color_set(o, 255, 255, 255, a);
579 evas_object_text_text_set(o, mi->text); 542 evas_object_text_text_set(o, mi->text);
580 evas_object_geometry_get(o, NULL, NULL, &tw, &th); 543 evas_object_geometry_get(o, NULL, NULL, &tw, &th);
581 x = (win_w - tw) / 2; 544 x = (win_w - tw) / 2;
582 y = (win_h / 2) + len + 40; 545 y = (win_h / 2) + len + 48;
583 evas_object_move(o, x, y); 546 evas_object_move(o, x, y);
584 547
585 o = o_menu_title2; 548
586 evas_object_color_set(o, a / 2, a / 2, a / 2, a / 2);
587 evas_object_text_text_set(o, mi->text);
588 evas_object_move(o, x + 1, y + 1);
589
590 o = o_menu_text_sel; 549 o = o_menu_text_sel;
591 w = tw + 24; 550 w = tw + 24;
592 h = 28; 551 h = 28;
@@ -606,7 +565,6 @@ ui_loop(void)
606 evas_object_move(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2)); 565 evas_object_move(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2));
607 evas_object_show(o_menu_logo); 566 evas_object_show(o_menu_logo);
608 evas_object_show(o_menu_title); 567 evas_object_show(o_menu_title);
609 evas_object_show(o_menu_title2);
610 evas_object_show(o_menu_icon); 568 evas_object_show(o_menu_icon);
611 evas_object_show(o_menu_icon_sel); 569 evas_object_show(o_menu_icon_sel);
612 evas_object_show(o_menu_icon_sel2); 570 evas_object_show(o_menu_icon_sel2);