diff --git a/README b/README index 5726850..6ccc1d1 100644 --- a/README +++ b/README @@ -1,3 +1,6 @@ -Expedite 0.6.0 +Expedite 0.7.0 This is meant to be a detailed and comprehensive benchmark suite for Evas. + +The images can be interchanged for demonstration purposes. Logo.png should +have 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. # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([expedite], [0.6.0], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([expedite], [0.7.0], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_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 \ VeraSeBd.ttf \ fonts.alias \ fonts.dir \ -bg.png \ logo.png \ +e-logo.png \ e.png \ image.png \ bar.png \ @@ -24,7 +24,6 @@ pan.png \ tp.png \ tp.yuv \ icon_sel.png \ -icon_sel2.png \ text_sel.png \ exit.png \ watch.png \ diff --git a/data/bar.png b/data/bar.png index ab380c4..cd5c3a7 100644 Binary files a/data/bar.png and b/data/bar.png differ diff --git a/data/bg.png b/data/bg.png deleted file mode 100644 index 600325e..0000000 Binary files a/data/bg.png and /dev/null differ diff --git a/data/bg2.png b/data/bg2.png deleted file mode 100644 index 3692cd9..0000000 Binary files a/data/bg2.png and /dev/null differ diff --git a/data/e-logo.png b/data/e-logo.png new file mode 100644 index 0000000..113ee14 Binary files /dev/null and b/data/e-logo.png differ diff --git a/data/e.png b/data/e.png index 35b78ed..f14feff 100644 Binary files a/data/e.png and b/data/e.png differ diff --git a/data/exit.png b/data/exit.png index a3319ed..f27a0fa 100644 Binary files a/data/exit.png and b/data/exit.png differ diff --git a/data/frame.png b/data/frame.png index 0867f1b..cdb24af 100644 Binary files a/data/frame.png and b/data/frame.png differ diff --git a/data/icon_sel.png b/data/icon_sel.png index 6f89a4a..3075afd 100644 Binary files a/data/icon_sel.png and b/data/icon_sel.png differ diff --git a/data/icon_sel2.png b/data/icon_sel2.png deleted file mode 100644 index 62cb25b..0000000 Binary files a/data/icon_sel2.png and /dev/null differ diff --git a/data/logo.png b/data/logo.png index 46671b2..3b1ddf5 100644 Binary files a/data/logo.png and b/data/logo.png differ diff --git a/data/text_sel.png b/data/text_sel.png index 6b847fa..ac118d2 100644 Binary files a/data/text_sel.png and b/data/text_sel.png 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) " SECTION = "e/test" PRIORITY = "optional" DEPENDS = "evas" -PV = "0.6.0" +PV = "0.7.0" PR = "1" do_prepsources () { diff --git a/expedite.spec b/expedite.spec index 4df3745..a49bbce 100644 --- a/expedite.spec +++ b/expedite.spec @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 0.6.0 +%define ver 0.7.0 %define rel 1 %define prefix /usr 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) o = evas_object_image_add(evas); o_images[i] = o; evas_object_image_file_set(o, build_path("bar.png"), NULL); - evas_object_image_border_set(o, 8, 8, 8, 8); + evas_object_image_border_set(o, 6, 6, 6, 6); evas_object_show(o); } 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) o = evas_object_image_add(evas); o_images[i] = o; evas_object_image_file_set(o, build_path("bar.png"), NULL); - evas_object_image_border_set(o, 8, 8, 8, 8); + evas_object_image_border_set(o, 6, 6, 6, 6); evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); evas_object_show(o); } 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; static Evas_Object *o_menu_icon_sel2 = NULL; static Evas_Object *o_menu_text_sel = NULL; static Evas_Object *o_menu_title = NULL; -static Evas_Object *o_menu_title2 = NULL; static Eina_List *menu = NULL; static int menu_sel = 0; static int menu_active = 0; @@ -72,7 +71,6 @@ _ui_all(void) evas_object_hide(o_menu_logo); evas_object_hide(o_menu_title); - evas_object_hide(o_menu_title2); evas_object_hide(o_menu_icon); evas_object_hide(o_menu_icon_sel); evas_object_hide(o_menu_icon_sel2); @@ -117,7 +115,6 @@ _ui_num(int n) evas_object_hide(o_menu_logo); evas_object_hide(o_menu_title); - evas_object_hide(o_menu_title2); evas_object_hide(o_menu_icon); evas_object_hide(o_menu_icon_sel); evas_object_hide(o_menu_icon_sel2); @@ -157,7 +154,6 @@ _ui_select(void) evas_object_hide(o_menu_logo); evas_object_hide(o_menu_title); - evas_object_hide(o_menu_title2); evas_object_hide(o_menu_icon); evas_object_hide(o_menu_icon_sel); evas_object_hide(o_menu_icon_sel2); @@ -317,18 +313,6 @@ _ui_setup(void) evas_object_show(o); o_wallpaper = o; -/* - o = evas_object_image_add(evas); - evas_object_move(o, 0, 0); - evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/bg.png", NULL); - evas_object_image_fill_set(o, 0, 0, win_w, win_h); - evas_object_image_smooth_scale_set(o, 0); - evas_object_resize(o, win_w, win_h); - evas_object_layer_set(o, -99); - evas_object_show(o); - o_wallpaper = o; - */ - o = evas_object_text_add(evas); evas_object_text_font_set(o, "Vera-Bold", 10); evas_object_text_text_set(o, "EXPEDITE"); @@ -357,7 +341,7 @@ _ui_setup(void) o = evas_object_image_add(evas); evas_object_move(o, (win_w - 120) / 2, ((win_h - 160) / 2)); - evas_object_image_file_set(o, build_path("logo.png"), NULL); + evas_object_image_file_set(o, build_path("e-logo.png"), NULL); evas_object_image_fill_set(o, 0, 0, 120, 160); evas_object_resize(o, 120, 160); evas_object_layer_set(o, -98); @@ -375,8 +359,8 @@ _ui_setup(void) o = evas_object_image_add(evas); evas_object_move(o, 0, 0); evas_object_image_file_set(o, build_path("icon_sel.png"), NULL); - evas_object_resize(o, 56, 56); - evas_object_image_fill_set(o, 0, 0, 56, 56); + evas_object_resize(o, 48, 48); + evas_object_image_fill_set(o, 0, 0, 48, 48); o_menu_icon_sel = o; o = evas_object_image_add(evas); @@ -384,29 +368,11 @@ _ui_setup(void) evas_object_image_file_set(o, build_path("text_sel.png"), NULL); evas_object_resize(o, 96, 32); evas_object_image_fill_set(o, 0, 0, 96, 32); - evas_object_image_border_set(o, 8, 8, 8, 8); + evas_object_image_border_set(o, 7, 7, 7, 7); o_menu_text_sel = o; - o = evas_object_image_add(evas); - evas_object_move(o, 0, 0); - evas_object_image_file_set(o, build_path("icon_sel2.png"), NULL); - evas_object_resize(o, 56, 41); - evas_object_image_fill_set(o, 0, 0, 56, 41); - o_menu_icon_sel2 = o; - o = evas_object_text_add(evas); - evas_object_text_font_set(o, "Vera-Bold", 10); - evas_object_text_text_set(o, ""); - evas_object_color_set(o, 100, 100, 100, 100); - evas_object_pass_events_set(o, 1); - evas_object_geometry_get(o, NULL, NULL, &w, &h); - x = ((win_w - w) / 2) + 1; - y = ((win_h - h) / 2) + 1; - evas_object_move(o, x, y); - o_menu_title2 = o; - - o = evas_object_text_add(evas); - evas_object_text_font_set(o, "Vera-Bold", 10); + evas_object_text_font_set(o, "Vera", 10); evas_object_text_text_set(o, ""); evas_object_color_set(o, 0, 0, 0, 100); evas_object_pass_events_set(o, 1); @@ -568,25 +534,18 @@ ui_loop(void) a = 255 - (255 * a); o = o_menu_icon_sel; - evas_object_move(o, x - ((56 - w) / 2), y - ((56 - h) / 2)); + evas_object_move(o, x - ((48 - w) / 2), y - ((48 - h) / 2)); evas_object_color_set(o, a, a, a, a); - o = o_menu_icon_sel2; - evas_object_move(o, (win_w - 56) / 2, (win_h / 2) + len - 4); - o = o_menu_title; - evas_object_color_set(o, 0, 0, 0, a); + evas_object_color_set(o, 255, 255, 255, a); evas_object_text_text_set(o, mi->text); evas_object_geometry_get(o, NULL, NULL, &tw, &th); x = (win_w - tw) / 2; - y = (win_h / 2) + len + 40; + y = (win_h / 2) + len + 48; evas_object_move(o, x, y); - o = o_menu_title2; - evas_object_color_set(o, a / 2, a / 2, a / 2, a / 2); - evas_object_text_text_set(o, mi->text); - evas_object_move(o, x + 1, y + 1); - + o = o_menu_text_sel; w = tw + 24; h = 28; @@ -606,7 +565,6 @@ ui_loop(void) evas_object_move(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2)); evas_object_show(o_menu_logo); evas_object_show(o_menu_title); - evas_object_show(o_menu_title2); evas_object_show(o_menu_icon); evas_object_show(o_menu_icon_sel); evas_object_show(o_menu_icon_sel2);