raster pushed a commit to branch master.

commit e5b21fb274d6fdc730a2f125cffa27f41aeed26e
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date:   Tue Jul 23 19:12:35 2013 +0900

    lots of work on player for dark. now it's a vaguely good looking player.
---
 edje/edc/elm/button.edc         |  97 ++++++++++++
 edje/edc/elm/icon.edc           |  37 ++++-
 edje/edc/elm/player.edc         | 333 ++++++++++++++++++++++++++++------------
 edje/edc/music_control.edc      | 145 ++++++-----------
 edje/img/icon_forward_mono.png  | Bin 0 -> 330 bytes
 edje/img/icon_info_mono.png     | Bin 0 -> 923 bytes
 edje/img/icon_next_mono.png     | Bin 0 -> 284 bytes
 edje/img/icon_pause_mono.png    | Bin 0 -> 165 bytes
 edje/img/icon_play_mono.png     | Bin 0 -> 262 bytes
 edje/img/icon_prev_mono.png     | Bin 0 -> 280 bytes
 edje/img/icon_rewind_mono.png   | Bin 0 -> 342 bytes
 edje/img/icon_stop_mono.png     | Bin 0 -> 162 bytes
 edje/img/music_control_icon.png | Bin 47348 -> 6491 bytes
 edje/img/next.png               | Bin 1382 -> 0 bytes
 edje/img/pause.png              | Bin 638 -> 0 bytes
 edje/img/play.png               | Bin 1153 -> 0 bytes
 edje/img/previous.png           | Bin 1240 -> 0 bytes
 mock-18.xcf.gz                  | Bin 20945 -> 612340 bytes
 mock-20.xcf.gz                  | Bin 0 -> 16885 bytes
 19 files changed, 409 insertions(+), 203 deletions(-)

diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index 09b5ea9..de42348 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -679,3 +679,100 @@ group { name: 
"elm/button/base/colorselector/right/default";
       }
    }
 }
+
+group { name: "elm/button/base/media_player/prev/default";
+   alias: "elm/button/base/media_player/rewind/default";
+   alias: "elm/button/base/media_player/play/default";
+   alias: "elm/button/base/media_player/pause/default";
+   alias: "elm/button/base/media_player/stop/default";
+   alias: "elm/button/base/media_player/forward/default";
+   alias: "elm/button/base/media_player/next/default";
+   alias: "elm/button/base/media_player/info/default";
+   images.image: "shadow_inset_bevels.png" COMP;
+   images.image: "shadow_angled_in_sides.png" COMP;
+   parts {
+      part { name: "clip"; type: RECT;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "shadow1"; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            rel2.offset: -1 0;
+            image.normal: "shadow_inset_bevels.png";
+            image.border: 2 2 0 1;
+            visible: 0;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "shadow2"; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            rel1.offset: 1 0;
+            rel2.offset: -2 -1;
+            image.normal: "shadow_angled_in_sides.png";
+            image.border: 8 8 0 1;
+            image.middle: 0;
+            visible: 0;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1.offset: 3 1;
+            rel2.offset: -4 -2;
+         }
+      }
+      part { name: "event"; type: RECT;
+         ignore_flags: ON_HOLD;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "mouse,down,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,press" "";
+         after: "button_click_anim";
+      }
+      program { name:   "button_click_anim";
+         action: STATE_SET "selected" 0.0;
+         target: "shadow1";
+         target: "shadow2";
+      }
+      program {
+         signal: "mouse,up,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,unpress" "";
+         after: "button_unclick_anim";
+      }
+      program { name:   "button_unclick_anim";
+         action: STATE_SET "default" 0.0;
+         target: "shadow1";
+         target: "shadow2";
+      }
+      program {
+         signal: "elm,anim,activate"; source: "elm";
+         action: STATE_SET "clicked" 0.0;
+         target: "shadow1";
+         target: "shadow2";
+         after: "button_unpressed_anim";
+      }
+      program { name:   "button_unpressed_anim";
+         action: STATE_SET "default" 0.0;
+         in: 0.5 0.0;
+         target: "shadow1";
+         target: "shadow2";
+      }
+      program {
+         signal: "mouse,clicked,1"; source: "event";
+         action: SIGNAL_EMIT "elm,action,click" "";
+      }
+   }
+}
diff --git a/edje/edc/elm/icon.edc b/edje/edc/elm/icon.edc
index fd9de62..f052a37 100644
--- a/edje/edc/elm/icon.edc
+++ b/edje/edc/elm/icon.edc
@@ -49,12 +49,33 @@ IC("menu/refresh",         "icon_refresh.png",     16, 0);
 IC("menu/folder",          "icon_folder.png",      16, 0);
 IC("menu/file",            "icon_file.png",        16, 0);
 
-IC("media_player/forward", "icon_forward.png",       16, 0);
-IC("media_player/info",    "icon_info.png",          16, 0);
-IC("media_player/next",    "icon_next.png",          16, 0);
-IC("media_player/pause",   "icon_pause.png",         16, 0);
-IC("media_player/play",    "icon_play.png",          16, 0);
-IC("media_player/prev",    "icon_prev.png",          16, 0);
-IC("media_player/rewind",  "icon_rewind.png",        16, 0);
-IC("media_player/stop",    "icon_stop.png",          16, 0);
+IC("media_player/forward", "icon_forward.png", 16, 0);
+IC("media_player/info",    "icon_info.png",    16, 0);
+IC("media_player/next",    "icon_next.png",    16, 0);
+IC("media_player/pause",   "icon_pause.png",   16, 0);
+IC("media_player/play",    "icon_play.png",    16, 0);
+IC("media_player/prev",    "icon_prev.png",    16, 0);
+IC("media_player/rewind",  "icon_rewind.png",  16, 0);
+IC("media_player/stop",    "icon_stop.png",    16, 0);
+#undef IC
+
+#define IC(Name, File, Min, Max) \
+   group { name: "elm/icon/"##Name##"/default/default"; min: Min Min; max: Max 
Max; \
+   images.image: File COMP; parts { \
+   part { name: "hi"; \
+   description { \
+   rel1.to: "base"; rel1.offset: 0 1; rel2.to: "base"; rel2.offset: -1 0; \
+   image.normal: File; color: 255 255 255 25;} } \
+   part { name: "base"; \
+   description { aspect: 1.0 1.0; aspect_preference: BOTH; \
+   image.normal: File; color: 21 21 21 255;} } \
+   } }
+IC("media_player/forward", "icon_forward_mono.png", 16, 0);
+IC("media_player/info",    "icon_info_mono.png",    16, 0);
+IC("media_player/next",    "icon_next_mono.png",    16, 0);
+IC("media_player/pause",   "icon_pause_mono.png",   16, 0);
+IC("media_player/play",    "icon_play_mono.png",    16, 0);
+IC("media_player/prev",    "icon_prev_mono.png",    16, 0);
+IC("media_player/rewind",  "icon_rewind_mono.png",  16, 0);
+IC("media_player/stop",    "icon_stop_mono.png",    16, 0);
 #undef IC
diff --git a/edje/edc/elm/player.edc b/edje/edc/elm/player.edc
index 2a036c9..021a7ff 100644
--- a/edje/edc/elm/player.edc
+++ b/edje/edc/elm/player.edc
@@ -1,182 +1,313 @@
-#define BSZ 24
+#define BSZ 20
 group { name: "elm/player/base/default";
-   min: 20 10;
-
+   images.image: "inset_shadow.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   
+   images.image: "vgrad_med_lighter.png" COMP;
+   images.image: "bevel_out.png" COMP;
+   images.image: "shine.png" COMP;
+   images.image: "vgrad_shadow_bi.png" COMP;
+   
    parts {
-      part { name: "media_player/slider"; type: SWALLOW; 
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            fixed: 0 1;
-            rel1.offset: 2 2;
-            rel2.offset: 2 -3;
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+            color: 0 0 0 255;
+         }
+      }
+      part { name: "clipper"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+      }
+      // video (elm_video) content here
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+         }
+      }
+
+      part { name: "barshad";
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            image.normal: "vgrad_shadow_bi.png";
+            rel1.to: "bar";
+            rel1.relative: 0.0 -0.5;
+            rel2.to: "bar";
+            rel2.relative: 1.0 0.5;
+            color: 255 255 255 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            visible: 1;
+         }
+      }
+      part { name: "bar";
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            color_class: "player_bar";
+            image.normal: "vgrad_med_lighter.png";
+            rel1.to_y: "elm.swallow.media_player.prev";
+            rel1.offset: 1 -1;
+            rel2.to_y: "elm.swallow.media_player.slider";
+            rel2.offset: -2 -1;
+            fill.smooth: 0;
+            TILED_HORIZ(120)
+         }
+      }
+      part { name: "barbevclip"; type: RECT;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            rel1.to: "bar";
+            rel2.to: "bar";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -1 0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "barbev";
+         clip_to: "barbevclip";
+         description { state: "default" 0.0;
+            rel1.to: "bar";
+            rel2.to: "bar";
+            image.normal: "bevel_out.png";
+            image.border: 2 2 2 2;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "shine"; mouse_events: 0;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            image.normal: "shine.png";
+            rel1.offset: 0 -2;
+            rel1.to: "bar";
             rel2.relative: 1.0 0.0;
-            align: 0.5 0.0;
+            rel2.offset: -1 2;
+            rel2.to: "bar";
+            FIXED_SIZE(69, 5)
          }
       }
-      part { name: "media_player/rewind"; type: SWALLOW; 
+      
+      part { name: "elm.swallow.media_player.prev"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 0;
+            fixed: 1 1;
             min: BSZ BSZ;
+            align: 0.0 0.0;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 1 7;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 1 7;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel2.offset: -2 -2;
             align: 0.0 1.0;
-            rel1 {
-               to_y: "media_player/slider";
-               offset: 2 2;
-               relative: 0.0 1.0;
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               offset: 2 -3;
-            }
          }
       }
-      part { name: "media_player/prev"; type: SWALLOW; 
+      part { name: "elm.swallow.media_player.rewind"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: BSZ BSZ;
             align: 0.0 1.0;
-            rel1 { to: "media_player/rewind";
-               offset: 2 0;
-               relative: 1.0 0.0;
-            }
-            rel2 { to: "media_player/rewind";
-               offset: 2 -1;
-               relative: 1.0 1.0;
-            }
+            rel1.to: "elm.swallow.media_player.prev";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.to: "elm.swallow.media_player.prev";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
          }
       }
-      part { name: "media_player/play"; type: SWALLOW; 
+      part { name: "elm.swallow.media_player.play"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: BSZ BSZ;
             align: 0.0 1.0;
-            rel1 { to: "media_player/prev";
-               offset: 2 0;
-               relative: 1.0 0.0;
-            }
-            rel2 { to: "media_player/prev";
-               offset: 2 -1;
-               relative: 1.0 1.0;
-            }
+            rel1.to: "elm.swallow.media_player.rewind";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.to: "elm.swallow.media_player.rewind";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "media_player/pause"; type: SWALLOW;
+      part { name: "elm.swallow.media_player.pause"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "media_player/play";
-            rel2.to: "media_player/play";
+            min: BSZ BSZ;
+            rel1.to: "elm.swallow.media_player.play";
+            rel2.to: "elm.swallow.media_player.play";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "media_player/info"; type: SWALLOW; 
+      part { name: "elm.swallow.media_player.forward"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: BSZ BSZ;
             align: 0.0 1.0;
-            rel1 { to: "media_player/play";
-               offset: 2 0;
-               relative: 1.0 0.0;
-            }
-            rel2 { to: "media_player/play";
-               offset: 2 -1;
-               relative: 1.0 1.0;
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+            rel1.to: "elm.swallow.media_player.play";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.to: "elm.swallow.media_player.play";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
          }
       }
-      part { name: "media_player/stop"; type: SWALLOW; 
+      part { name: "elm.swallow.media_player.next"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: BSZ BSZ;
             align: 0.0 1.0;
-            rel1 { to: "media_player/info";
-               offset: 2 0;
-               relative: 1.0 0.0;
-            }
-            rel2 { to: "media_player/info";
-               offset: 2 -1;
-               relative: 1.0 1.0;
-            }
+            rel1.to: "elm.swallow.media_player.forward";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.to: "elm.swallow.media_player.forward";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
          }
       }
-      part { name: "media_player/next"; type: SWALLOW; 
+      part { name: "elm.swallow.media_player.stop"; type: SWALLOW;
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: BSZ BSZ;
             align: 0.0 1.0;
-            rel1 { to: "media_player/stop";
-               offset: 2 0;
-               relative: 1.0 0.0;
-            }
-            rel2 { to: "media_player/stop";
-               offset: 2 -1;
-               relative: 1.0 1.0;
-            }
+            rel1.to: "elm.swallow.media_player.next";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.to: "elm.swallow.media_player.next";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
          }
       }
-      part { name: "media_player/forward"; type: SWALLOW; 
+      part { name: "elm.swallow.media_player.info"; type: SWALLOW; 
+         clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
+            fixed: 1 1;
             min: BSZ BSZ;
             align: 0.0 1.0;
-            rel1 { to: "media_player/next";
-               offset: 2 0;
-               relative: 1.0 0.0;
-            }
-            rel2.offset: -3 -3;
+            rel1.to: "elm.swallow.media_player.stop";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 0 0;
+            rel2.to: "elm.swallow.media_player.stop";
+            rel2.relative: 1.0 1.0;
+            rel2.offset: 0 -1;
+         }
+      }
+      part { name: "elm.swallow.media_player.slider"; type: SWALLOW; 
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            fixed: 0 1;
+            rel1.relative: 1.0 0.0;
+            rel1.to: "elm.swallow.media_player.info";
+            rel2.to_y: "elm.swallow.media_player.info";
+            rel2.offset: -2 -1;
+         }
+      }
+      
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "inset_shadow.png";
+            image.border: 5 5 7 3;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "inset"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "bevel_in.png";
+            image.border: 1 1 1 1;
+            image.middle: 0;
+            rel1.to: "bg";
+            rel1.offset: -1 -1;
+            rel2.to: "bg";
+            rel2.offset: 0 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "controls"; type: RECT; repeat_events: 1;
+         description { state: "default" 0.0;
+            min: BSZ BSZ;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 0.8;
+            color: 0 0 0 0;
          }
       }
    }
    programs {
       program {
-         signal: "show";
-         source: "";
+         signal: "mouse,in"; source: "controls";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 0.2;
+         target: "elm.swallow.media_player.prev";
+         target: "barshad";
+      }
+      program {
+         signal: "mouse,out"; source: "controls";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.5;
+         target: "elm.swallow.media_player.prev";
+         target: "barshad";
+      }
+      program {
+         signal: "load"; source: "";
          after: "pause/0";
       }
       program {
-         signal: "elm,player,play";
-         source: "elm";
+         signal: "elm,player,play"; source: "elm";
          after: "play/0";
       }
       program {
-         signal: "elm,player,pause";
-         source: "elm";
+         signal: "elm,player,pause"; source: "elm";
          after: "pause/0";
       }
-      program {
-         name: "play/0";
-
+      program { name: "play/0";
          action: STATE_SET "hidden" 0.0;
-         target: "media_player/play";
-
+         target: "elm.swallow.media_player.play";
          after: "play/1";
       }
-      program {
-         name: "play/1";
-
+      program { name: "play/1";
          action: STATE_SET "default" 0.0;
-         target: "media_player/pause";
+         target: "elm.swallow.media_player.pause";
       }
-      program {
-         name: "pause/0";
-
+      program { name: "pause/0";
          action: STATE_SET "hidden" 0.0;
-         target: "media_player/pause";
-
+         target: "elm.swallow.media_player.pause";
          after: "pause/1";
       }
-      program {
-         name: "pause/1";
-
+      program { name: "pause/1";
          action: STATE_SET "default" 0.0;
-         target: "media_player/play";
+         target: "elm.swallow.media_player.play";
       }
    }
 }
diff --git a/edje/edc/music_control.edc b/edje/edc/music_control.edc
index d23c134..f00d243 100644
--- a/edje/edc/music_control.edc
+++ b/edje/edc/music_control.edc
@@ -1,60 +1,44 @@
-group {
-   name: "modules/music-control/icon";
+group { name: "modules/music-control/icon";
    max: 24 24;
-   images {
-      image: "music_control_icon.png" COMP;
-   }
+   images.image: "music_control_icon.png" COMP;
    parts {
-      part {
-         name: "image";
-         mouse_events: 0;
-         type: IMAGE;
-         description {
-            state: "default" 0.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
+      part { name: "image"; mouse_events: 0;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "music_control_icon.png";
          }
       }
    }
 }
 
-group {
-   name: "modules/music-control/main";
-   images {
-      image: "music_control_icon.png" COMP;
-   }
+group { name: "modules/music-control/main";
+   images.image: "music_control_icon.png" COMP;
    parts {
-      part {
-         name: "icon";
-         type: IMAGE;
-         description {
-            state: "default" 0.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
-            rel1.relative: 0 0;
-            rel2.relative: 1 1;
+      part { name: "icon";
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "music_control_icon.png";
          }
       }
    }
 }
 
-group {
-   name: "modules/music-control/popup";
+group { name: "modules/music-control/popup";
    min: 150 50;
-   images {
-      image: "previous.png" COMP;
-      image: "next.png" COMP;
-      image: "pause.png" COMP;
-      image: "play.png" COMP;
+   images.image: "icon_prev.png" COMP;
+   images.image: "icon_next.png" COMP;
+   images.image: "icon_pause.png" COMP;
+   images.image: "icon_play.png" COMP;
+   script {
+      public message(Msg_Type:type, id, ...) {
+         new txt[128];
+         getsarg(2, txt, 128);
+         set_text(PART:"player_name", txt);
+      }
    }
    parts {
-      part {
-         name: "player_name";
-         type: TEXT;
-         description {
-            state: "default" 0;
+      part { name: "player_name"; type: TEXT;
+         description { state: "default" 0;
             text.size: 12;
             text.text: "Music player";
             text.font: FN;
@@ -63,99 +47,72 @@ group {
             rel2.offset: 0 16;
          }
       }
-      part {
-         type: IMAGE;
-         name: "previous_btn";
-         description {
-            state: "default" 0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
+      part { name: "previous_btn";
+         description { state: "default" 0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             rel1.to: "player_name";
             rel1.relative: 0.0 1.0;
             rel2.relative: 0.33 1.0;
-            image.normal: "previous.png";
+            image.normal: "icon_prev.png";
          }
       }
-      part {
-         type: IMAGE;
-         name: "play_btn";
-         description {
-            state: "default" 0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               rel1.to: "player_name";
-               rel1.relative: 0.33 1.0;
-               rel2.relative: 0.66 1.0;
-               image.normal: "pause.png";
+      part { name: "play_btn";
+         description { state: "default" 0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            rel1.to: "player_name";
+            rel1.relative: 0.33 1.0;
+            rel2.relative: 0.66 1.0;
+            image.normal: "icon_pause.png";
          }
-         description {
-             state: "play" 0.0;
-             inherit: "default" 0.0;
-             image.normal: "play.png";
+         description { state: "play" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "icon_play.png";
          }
       }
-      part {
-         type: IMAGE;
-         name: "next_btn";
-         description {
-            state: "default" 0;
-               aspect: 1.0 1.0;
-               aspect_preference: BOTH;
-               rel1.to: "player_name";
-               rel1.relative: 0.66 1.0;
-               rel2.relative: 1.0 1.0;
-               image.normal: "next.png";
+      part { name: "next_btn";
+         description { state: "default" 0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            rel1.to: "player_name";
+            rel1.relative: 0.66 1.0;
+            rel2.relative: 1.0 1.0;
+            image.normal: "icon_next.png";
          }
       }
    }
    programs {
       program {
-         signal: "mouse,clicked,*";
-         source: "previous_btn";
+         signal: "mouse,clicked,*"; source: "previous_btn";
          action: SIGNAL_EMIT "btn,clicked" "previous";
       }
       program {
-         signal: "mouse,clicked,*";
-         source: "play_btn";
+         signal: "mouse,clicked,*"; source: "play_btn";
          action: SIGNAL_EMIT "btn,clicked" "play";
       }
       program {
-         signal: "mouse,clicked,*";
-         source: "next_btn";
+         signal: "mouse,clicked,*"; source: "next_btn";
          action: SIGNAL_EMIT "btn,clicked" "next";
       }
       program {
-         signal: "btn,state,image,play";
-         source: "play";
+         signal: "btn,state,image,play"; source: "play";
          action: STATE_SET "play" 0.0;
          transition: LINEAR 0.1;
          target: "play_btn";
       }
       program {
-         signal: "btn,state,image,play,no_delay";
-         source: "play";
+         signal: "btn,state,image,play,no_delay"; source: "play";
          action: STATE_SET "play" 0.0;
          transition: LINEAR 0.0;
          target: "play_btn";
       }
       program {
-         signal: "btn,state,image,pause";
-         source: "play";
+         signal: "btn,state,image,pause"; source: "play";
          action: STATE_SET "default" 0.0;
          transition: LINEAR 0.1;
          target: "play_btn";
       }
       program {
-         signal: "mouse,clicked,*";
-         source: "player_name";
+         signal: "mouse,clicked,*"; source: "player_name";
          action: SIGNAL_EMIT "label,clicked" "player_name";
       }
    }
-   script {
-      public message(Msg_Type:type, id, ...) {
-         new txt[128];
-         getsarg (2, txt, 128);
-         set_text(PART:"player_name", txt);
-      }
-   }
 }
diff --git a/edje/img/icon_forward_mono.png b/edje/img/icon_forward_mono.png
new file mode 100644
index 0000000..e76f012
Binary files /dev/null and b/edje/img/icon_forward_mono.png differ
diff --git a/edje/img/icon_info_mono.png b/edje/img/icon_info_mono.png
new file mode 100644
index 0000000..10e8d1f
Binary files /dev/null and b/edje/img/icon_info_mono.png differ
diff --git a/edje/img/icon_next_mono.png b/edje/img/icon_next_mono.png
new file mode 100644
index 0000000..0b9aced
Binary files /dev/null and b/edje/img/icon_next_mono.png differ
diff --git a/edje/img/icon_pause_mono.png b/edje/img/icon_pause_mono.png
new file mode 100644
index 0000000..fc7b9f8
Binary files /dev/null and b/edje/img/icon_pause_mono.png differ
diff --git a/edje/img/icon_play_mono.png b/edje/img/icon_play_mono.png
new file mode 100644
index 0000000..7b2d591
Binary files /dev/null and b/edje/img/icon_play_mono.png differ
diff --git a/edje/img/icon_prev_mono.png b/edje/img/icon_prev_mono.png
new file mode 100644
index 0000000..582e709
Binary files /dev/null and b/edje/img/icon_prev_mono.png differ
diff --git a/edje/img/icon_rewind_mono.png b/edje/img/icon_rewind_mono.png
new file mode 100644
index 0000000..03ab759
Binary files /dev/null and b/edje/img/icon_rewind_mono.png differ
diff --git a/edje/img/icon_stop_mono.png b/edje/img/icon_stop_mono.png
new file mode 100644
index 0000000..d783e2e
Binary files /dev/null and b/edje/img/icon_stop_mono.png differ
diff --git a/edje/img/music_control_icon.png b/edje/img/music_control_icon.png
index 5217544..66834e4 100644
Binary files a/edje/img/music_control_icon.png and 
b/edje/img/music_control_icon.png differ
diff --git a/edje/img/next.png b/edje/img/next.png
deleted file mode 100644
index 86e313e..0000000
Binary files a/edje/img/next.png and /dev/null differ
diff --git a/edje/img/pause.png b/edje/img/pause.png
deleted file mode 100644
index c0a09bb..0000000
Binary files a/edje/img/pause.png and /dev/null differ
diff --git a/edje/img/play.png b/edje/img/play.png
deleted file mode 100644
index 35f3a23..0000000
Binary files a/edje/img/play.png and /dev/null differ
diff --git a/edje/img/previous.png b/edje/img/previous.png
deleted file mode 100644
index c07da8b..0000000
Binary files a/edje/img/previous.png and /dev/null differ
diff --git a/mock-18.xcf.gz b/mock-18.xcf.gz
index b3fef5e..f187cc2 100644
Binary files a/mock-18.xcf.gz and b/mock-18.xcf.gz differ
diff --git a/mock-20.xcf.gz b/mock-20.xcf.gz
new file mode 100644
index 0000000..8a73df4
Binary files /dev/null and b/mock-20.xcf.gz differ

-- 

------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk

Reply via email to