From 625d598e9855001b8d4b4823f7b39bf379b7e734 Mon Sep 17 00:00:00 2001 From: Sthithaprajna Garapaty Date: Sat, 5 Jan 2008 17:55:53 +0000 Subject: [PATCH] Slightly better theme SVN revision: 33354 --- e_mod_main.c | 2 +- mpdule.edc | 402 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 254 insertions(+), 150 deletions(-) diff --git a/e_mod_main.c b/e_mod_main.c index 18868a5..7b1893f 100644 --- a/e_mod_main.c +++ b/e_mod_main.c @@ -238,7 +238,7 @@ _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL); } else if (ev->button == 1) { - e_gadcon_popup_toggle_pinned(inst->popup); + //e_gadcon_popup_toggle_pinned(inst->popup); } } diff --git a/mpdule.edc b/mpdule.edc index 8a71313..9627d90 100644 --- a/mpdule.edc +++ b/mpdule.edc @@ -67,22 +67,68 @@ collections { } color: 255 255 255 0; } + description { + state: "hide" 0.00; + visible: 1; + rel1 { + relative: 0.00 -1.00; + offset: 0 0; + } + rel2 { + relative: 1.00 0.00; + offset: -1 -1; + } + color: 255 255 255 0; + } + } + part { + name: "controls_clip"; + type: RECT; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 1.00; + offset: 0 0; + } + rel2 { + relative: 1.00 2.00; + offset: -1 -1; + } + color: 255 255 255 0; + } + description { + state: "show" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -1; + } + color: 255 255 255 0; + } } part { name: "mpdule.artist"; type: TEXT; effect: OUTLINE_SOFT_SHADOW; clip_to: "base"; + mouse_events: 0; description { state: "default" 0.00; visible: 1; rel1 { relative: 0.00 0.00; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 0.50; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -101,10 +147,12 @@ collections { rel1 { relative: 0.00 0.00; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 0.50; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -123,10 +171,12 @@ collections { rel1 { relative: 0.00 0.00; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 0.50; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -145,16 +195,19 @@ collections { type: TEXT; effect: OUTLINE_SOFT_SHADOW; clip_to: "base"; + mouse_events: 0; description { state: "default" 0.00; visible: 1; rel1 { relative: 0.00 0.50; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 1.00; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -173,10 +226,12 @@ collections { rel1 { relative: 0.00 0.50; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 1.00; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -195,10 +250,12 @@ collections { rel1 { relative: 0.00 0.50; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 1.00; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -212,14 +269,206 @@ collections { } } } + part { + name: "mpdule.previous"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "controls_clip"; + } + rel2 { + relative: 0.0 1.0; + to: "controls_clip"; + } + image { + normal: "prev.png"; + } + } + } + part { + name: "mpdule.play"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.previous"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.previous"; + to_y: "controls_clip"; + } + image { + normal: "play.png"; + } + } + } + part { + name: "mpdule.pause"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.play"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.play"; + to_y: "controls_clip"; + } + image { + normal: "pause.png"; + } + } + } + part { + name: "mpdule.stop"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.pause"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.pause"; + to_y: "controls_clip"; + } + image { + normal: "stop.png"; + } + } + } + part { + name: "mpdule.next"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.stop"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.stop"; + to_y: "controls_clip"; + } + image { + normal: "next.png"; + } + } + } } programs { program { - name: "show"; - signal: "show"; - source: ""; + name: "show_controls"; + signal: "mouse,in"; + source: "item_clip"; + action: STATE_SET "show" 0.0; + transition: LINEAR 0.1; + target: "controls_clip"; + } + program { + name: "show_controls2"; + signal: "mouse,in"; + source: "item_clip"; + action: STATE_SET "hide" 0.0; + transition: LINEAR 0.1; + target: "item_clip"; + } + program { + name: "wait"; + action: STATE_SET "hide" 0.0; + transition: LINEAR 2; + target: "item_clip"; + after: "hide_controls"; + after: "hide_controls2"; + } + program { + name: "hide_controls"; + signal: "mouse,out"; + source: "controls_clip"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.1; + target: "controls_clip"; + } + program { + name: "hide_controls2"; + signal: "mouse,out"; + source: "controls_clip"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.1; + target: "item_clip"; + } + program { + name: "mouse_play"; + signal: "mouse,clicked,1"; + source: "mpdule.play"; action: SIGNAL_EMIT "mpdule,play" ""; } + program { + name: "mouse_pause"; + signal: "mouse,clicked,1"; + source: "mpdule.pause"; + action: SIGNAL_EMIT "mpdule,pause" ""; + } + program { + name: "mouse_stop"; + signal: "mouse,clicked,1"; + source: "mpdule.stop"; + action: SIGNAL_EMIT "mpdule,stop" ""; + } + program { + name: "mouse_previous"; + signal: "mouse,clicked,1"; + source: "mpdule.previous"; + action: SIGNAL_EMIT "mpdule,previous" ""; + } + program { + name: "mouse_next"; + signal: "mouse,clicked,1"; + source: "mpdule.next"; + action: SIGNAL_EMIT "mpdule,next" ""; + } } } group { @@ -232,7 +481,7 @@ collections { description { state: "default" 0.00; visible: 1; - min: 200 105; + min: 200 65; rel1 { relative: 0.00 0.00; offset: 5 5; @@ -558,153 +807,8 @@ collections { } } } - part { - name: "mpdule.previous"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 0.0 1.0; - offset: 0 0; - to_x: "base"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 0.0 1.0; - offset: 32 32; - to_x: "base"; - to_y: "mpdule.genre_label"; - } - image { - normal: "prev.png"; - } - } - } - part { - name: "mpdule.play"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.previous"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.previous"; - to_y: "mpdule.genre_label"; - } - image { - normal: "play.png"; - } - } - } - part { - name: "mpdule.pause"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.play"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.play"; - to_y: "mpdule.genre_label"; - } - image { - normal: "pause.png"; - } - } - } - part { - name: "mpdule.stop"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.pause"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.pause"; - to_y: "mpdule.genre_label"; - } - image { - normal: "stop.png"; - } - } - } - part { - name: "mpdule.next"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.stop"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.stop"; - to_y: "mpdule.genre_label"; - } - image { - normal: "next.png"; - } - } - } } programs { - program { - name: "mouse_play"; - signal: "mouse,clicked,1"; - source: "mpdule.play"; - action: SIGNAL_EMIT "mpdule,play" ""; - } - program { - name: "mouse_pause"; - signal: "mouse,clicked,1"; - source: "mpdule.pause"; - action: SIGNAL_EMIT "mpdule,pause" ""; - } - program { - name: "mouse_stop"; - signal: "mouse,clicked,1"; - source: "mpdule.stop"; - action: SIGNAL_EMIT "mpdule,stop" ""; - } - program { - name: "mouse_previous"; - signal: "mouse,clicked,1"; - source: "mpdule.previous"; - action: SIGNAL_EMIT "mpdule,previous" ""; - } - program { - name: "mouse_next"; - signal: "mouse,clicked,1"; - source: "mpdule.next"; - action: SIGNAL_EMIT "mpdule,next" ""; - } } } }