diff --git a/data/themes/default.edc b/data/themes/default.edc index 7b8cc9380..52c4d66ca 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -10420,257 +10420,6 @@ collections { /* begin the collection of edje groups that are in this file */ ///////////////////////////////////////////////////////////////////////////// /*** MOD: SYSCON ***/ -/* - group { name: "e/wizard/main"; - images { - image: "vgrad_dark.png" COMP; - image: "grill_dark_tiny_pattern.png" COMP; - image: "bt_base1.png" COMP; - image: "bt_base2.png" COMP; - image: "bt_hilight.png" COMP; - image: "bt_shine.png" COMP; - image: "bt_glow.png" COMP; - image: "bt_dis_base.png" COMP; - image: "bt_dis_hilight.png" COMP; - } - parts { - part { name: "background_image"; - description { state: "default" 0.0; - image.normal: "vgrad_dark.png"; - fill { - smooth: 0; - size { - relative: 0 1.0; - offset: 36 0; - } - } - } - } - part { name: "grill"; - description { state: "default" 0.0; - image.normal: "grill_dark_tiny_pattern.png"; - fill { - size { - relative: 0 0; - offset: 144 144; - } - } - } - } - part { name: "e.text.title"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { - state: "default" 0.0; - align: 0.5 0.0; - rel1 { - relative: 0.0 0.0; - offset: 0 8; - } - rel2 { - relative: 1.0 0.0; - offset: -1 8; - } - color: 255 255 255 255; - color3: 0 0 0 32; - text { - font: "Sans:style=Bold"; - size: 20; - min: 1 1; - align: 0.5 0.5; - } - } - } - part { name: "e.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - to_y: "e.text.title"; - relative: 0.5 1.0; - offset: 0 8; - } - rel2 { - to_y: "button_image"; - relative: 0.5 0.0; - offset: 0 -9; - } - } - } - part { name: "button_image"; - mouse_events: 1; - scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - align: 0.5 1.0; - rel1.relative: 0.5 1.0; - rel1.offset: 0 -9; - rel2.relative: 0.5 1.0; - rel2.offset: 0 -9; - min: 64 32; - max: 64 32; - image { - normal: "bt_base2.png"; - border: 7 7 7 7; - } - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - image.normal: "bt_base1.png"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part { name: "e.text.label"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1 { - to: "button_image"; - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - to: "button_image"; - } - color: 224 224 224 255; - color3: 0 0 0 64; - color_class: "button_text"; - text { - text: "Close"; - font: "Sans"; - size: 10; - min: 1 1; - align: 0.5 0.5; - text_class: "button"; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; - color_class: "button_text_disabled"; - } - } - part { name: "over1"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - rel2.relative: 1.0 0.5; - image { - normal: "bt_hilight.png"; - border: 7 7 7 0; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image { - normal: "bt_dis_hilight.png"; - border: 4 4 4 0; - } - } - } - part { name: "over2"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - image { - normal: "bt_shine.png"; - border: 7 7 7 7; - } - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "over3"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - visible: 0; - color: 255 255 255 0; - image { - normal: "bt_glow.png"; - border: 12 12 12 12; - } - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "block"; - mouse_events: 1; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - visible: 0; - color: 0 0 0 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "button_click"; - signal: "mouse,down,1"; - source: "button_image"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "over3"; - } - program { name: "button_unclick"; - signal: "mouse,up,1"; - source: "button_image"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "over3"; - } - program { name: "button_unclick2"; - signal: "mouse,clicked,1"; - source: "button_image"; - action: SIGNAL_EMIT "e,action,next" ""; - } - program { name: "button_enable"; - signal: "e,state,next,enable"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "e.text.label"; - target: "over1"; - target: "over2"; - target: "block"; - } - program { name: "button_disable"; - signal: "e,state,next,disable"; - source: "e"; - action: STATE_SET "disabled" 0.0; - target: "button_image"; - target: "e.text.label"; - target: "over1"; - target: "over2"; - target: "block"; - } - } - } -*/ group { name: "e/widgets/syscon/main"; images { image: "base_bg.png" COMP; @@ -21776,13 +21525,13 @@ group { name: "e/toolbar/default/base"; description { state: "default" 0.0; rel1 { to_y: "e.text.title"; - relative: 0.5 1.0; - offset: 0 8; + relative: 0.2 1.0; + offset: 8 8; } rel2 { to_y: "button_image"; - relative: 0.5 0.0; - offset: 0 -9; + relative: 0.8 0.0; + offset: -9 -9; } } } diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 1b90e1e7a..b60e424f8 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -676,6 +676,12 @@ e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h) E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, 0); if (!gc->ecore_evas) return 0; ecore_evas_geometry_get(gc->ecore_evas, x, y, w, h); +// so much relies on this down here to have been broken... ie return container-relative coords. +// if (gc->zone) +// { +// if (x) *x = *x - gc->zone->x; +// if (y) *y = *y - gc->zone->y; +// } return 1; } @@ -2303,6 +2309,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even if (ev->button == 3) { E_Menu *mn; + E_Zone *zone; int cx, cy, cw, ch; if (gcc->gadcon->shelf) @@ -2315,9 +2322,11 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even e_gadcon_client_util_menu_items_append(gcc, mn, 0); e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch); - e_menu_activate_mouse(mn, - e_util_zone_current_get(e_manager_current_get()), - cx + ev->output.x, cy + ev->output.y, 1, 1, + zone = gcc->gadcon->zone; + if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + e_menu_activate_mouse(mn, zone, + cx + ev->output.x, + cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); } else if (ev->button == 1) diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index b12689f73..cb7dfb949 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -1236,6 +1236,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf E_Shelf *es; E_Menu *mn; int cx, cy, cw, ch; + E_Zone *zone; es = data; ev = event_info; @@ -1251,10 +1252,13 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf _e_shelf_menu_append(es, mn); - e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, &cw, &ch); + zone = es->gadcon->zone; + if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, &cw, &ch); e_menu_activate_mouse(mn, e_util_zone_current_get(e_manager_current_get()), - cx + ev->output.x, cy + ev->output.y, 1, 1, + cx + ev->output.x, + cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); break; } diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c index 69888e572..1d327b12e 100644 --- a/src/modules/wizard/page_080.c +++ b/src/modules/wizard/page_080.c @@ -62,11 +62,10 @@ wizard_page_show(E_Wizard_Page *pg) Eina_List *l; int i; - printf("desktops = %p\n", desktops); if (!desktops) return 0; o = e_widget_list_add(pg->evas, 1, 0); - e_wizard_title_set(_("IBar Quick Launch")); + e_wizard_title_set(_("Quick Launch")); of = e_widget_framelist_add(pg->evas, _("Select Applications"), 0); diff --git a/src/modules/wizard/page_200.c b/src/modules/wizard/page_200.c index b6bd09512..cb076c70f 100644 --- a/src/modules/wizard/page_200.c +++ b/src/modules/wizard/page_200.c @@ -25,7 +25,6 @@ wizard_page_show(E_Wizard_Page *pg) // delete profile homedir = e_user_homedir_get(); snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, e_config_profile_get()); - printf("del %s\n", buf); if (ecore_file_is_dir(buf)) ecore_file_recursive_rm(buf); } // load profile as e_config @@ -49,23 +48,6 @@ wizard_page_apply(E_Wizard_Page *pg) homedir = e_user_homedir_get(); - // FIXME: this is going into page 070 - // setup default .desktop files -// snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get()); -// ecore_file_mkpath(buf); -// snprintf(buf, sizeof(buf), -// "gzip -d -c < %s/data/other/desktop_files.tar.gz | " -// "(cd %s/applications/ ; tar -xkf -)", -// e_prefix_data_get(), efreet_data_home_get()); -// system(buf); - // FIXME: this is going into page 070 - // setup ibar -// snprintf(buf, sizeof(buf), -// "gzip -d -c < %s/data/other/desktop_order.tar.gz | " -// "(cd %s/.e/e/ ; tar -xkf -)", -// e_prefix_data_get(), homedir); -// system(buf); - // FIXME: should become a wizard page on its own // setup fileman favorites snprintf(buf, sizeof(buf),