billiob pushed a commit to branch master.

commit 6be10294133d89530d21c9160a9ecc2886c42da1
Author: Boris Faure <[email protected]>
Date:   Wed Aug 28 14:34:42 2013 +0200

    themes: use default theme as base for solarized
---
 data/themes/Makefile.am   |   9 +-
 data/themes/default.edc   | 100 ++++-
 data/themes/solarized.edc | 981 ----------------------------------------------
 3 files changed, 102 insertions(+), 988 deletions(-)

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index a9bf1b9..803b094 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -34,15 +34,16 @@ black.edj: Makefile black.edc mild.edc
        $(top_srcdir)/data/themes/black.edc \
        $(top_builddir)/data/themes/black.edj
 
-solarized.edj: Makefile solarized.edc
+solarized.edj: Makefile default.edc
        $(EDJE_CC) $(EDJE_FLAGS) \
-       $(top_srcdir)/data/themes/solarized.edc \
+       -DSOLARIZED=1 \
+       $(top_srcdir)/data/themes/default.edc \
        $(top_builddir)/data/themes/solarized.edj
 
-solarized_light.edj: Makefile solarized.edc
+solarized_light.edj: Makefile default.edc
        $(EDJE_CC) $(EDJE_FLAGS) \
        -DSOLARIZED_LIGHT=1 \
-       $(top_srcdir)/data/themes/solarized.edc \
+       $(top_srcdir)/data/themes/default.edc \
        $(top_builddir)/data/themes/solarized_light.edj
 
 mustang.edj: Makefile mustang.edc
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 42e3f2a..16970ef 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1,3 +1,43 @@
+#ifdef SOLARIZED
+
+#define S_yellow  181 137   0 255
+#define S_orange  203  75  22 255
+#define S_red     220  50  47 255
+#define S_magenta 211  54 130 255
+#define S_violet  108 113 196 255
+#define S_blue     38 139 210 255
+#define S_cyan     42 161 152 255
+#define S_green   133 153   0 255
+
+#ifndef SOLARIZED_LIGHT
+/* Dark */
+
+#define S_base03   0  43  54 255
+#define S_base02   7  54  66 255
+#define S_base01  88 110 117 255
+#define S_base00 101 123 131 255
+#define S_base0  131 148 150 255
+#define S_base0_shine  141 148 150 128
+#define S_base1  147 161 161 255
+#define S_base2  238 232 213 255
+#define S_base3  253 246 227 255
+
+#else
+/* Light */
+
+#define S_base03 253 246 227 255
+#define S_base02 238 232 213 255
+#define S_base01 147 161 161 255
+#define S_base00 131 148 150 255
+#define S_base0  101 123 131 255
+#define S_base0_shine  111 123 131 128
+#define S_base1   88 110 117 255
+#define S_base2    7  54  66 255
+#define S_base3    0  43  54 255
+
+#endif
+#endif
+
 collections {
    
 //////////////////////////////////////////////////////////////////////////////
@@ -80,6 +120,56 @@ collections {
          
    //// the background and general container for the terminal
    group { name: "terminology/background";
+#ifdef SOLARIZED
+      color_classes {
+          color_class { name: "color-0";  color: S_base0; }
+          color_class { name: "color-1";  color: S_base02; }
+          color_class { name: "color-2";  color: S_red; }
+          color_class { name: "color-3";  color: S_green; }
+          color_class { name: "color-4";  color: S_yellow; }
+          color_class { name: "color-5";  color: S_blue; }
+          color_class { name: "color-6";  color: S_magenta; }
+          color_class { name: "color-7";  color: S_cyan; }
+          color_class { name: "color-8";  color: S_base2; }
+          color_class { name: "color-11"; color: S_base0; }
+
+          color_class { name: "color-13"; color: S_base03; }
+          color_class { name: "color-14"; color: S_orange; }
+          color_class { name: "color-15"; color: S_base01; }
+          color_class { name: "color-16"; color: S_base00; }
+          color_class { name: "color-17"; color: S_base0; }
+          color_class { name: "color-18"; color: S_violet; }
+          color_class { name: "color-19"; color: S_base1; }
+          color_class { name: "color-20"; color: S_base3; }
+
+          color_class { name: "color-25"; color: S_base03; }
+          color_class { name: "color-26"; color: S_orange; }
+          color_class { name: "color-27"; color: S_base01; }
+          color_class { name: "color-28"; color: S_base00; }
+          color_class { name: "color-29"; color: S_base0; }
+          color_class { name: "color-30"; color: S_violet; }
+          color_class { name: "color-31"; color: S_base1; }
+          color_class { name: "color-32"; color: S_base3; }
+
+          color_class { name: "256color-0";  color: S_base02; } // COL_BLACK
+          color_class { name: "256color-1";  color: S_red; } // COL_RED
+          color_class { name: "256color-2";  color: S_green; } // COL_GREEN
+          color_class { name: "256color-3";  color: S_yellow; } // COL_YELLOW
+          color_class { name: "256color-4";  color: S_blue; } // COL_BLUE
+          color_class { name: "256color-5";  color: S_magenta; } // COL_MAGENTA
+          color_class { name: "256color-6";  color: S_cyan; } // COL_CYAN
+          color_class { name: "256color-7";  color: S_base2; } // COL_WHITE
+
+          color_class { name: "256color-8";  color: S_base03; } // COL_BLACK
+          color_class { name: "256color-9";  color: S_orange; } // COL_RED
+          color_class { name: "256color-10"; color: S_base01; } // COL_GREEN
+          color_class { name: "256color-11"; color: S_base00; } // COL_YELLOW
+          color_class { name: "256color-12"; color: S_base0; } // COL_BLUE
+          color_class { name: "256color-13"; color: S_violet; } // COL_MAGENTA
+          color_class { name: "256color-14"; color: S_base1; } // COL_CYAN
+          color_class { name: "256color-15"; color: S_base3; } // COL_WHITE
+      }
+#endif
       images {
         image: "bg_bevel.png" COMP;
         image: "bg_shine.png" COMP;
@@ -118,10 +208,14 @@ collections {
          part { name: "base"; type: RECT;
             mouse_events: 1;
             description { state: "default" 0.0;
+#ifndef SOLARIZED
                color: 32 32 32 255;
-            }
-            description { state: "translucent" 0.0;
-               inherit: "default" 0.0;
+#else
+               color: S_base03;
+#endif
+         }
+         description { state: "translucent" 0.0;
+            inherit: "default" 0.0;
                visible: 0;
             }
          }
diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc
deleted file mode 100644
index f5d9fe3..0000000
--- a/data/themes/solarized.edc
+++ /dev/null
@@ -1,981 +0,0 @@
-
-
-
-#define S_yellow  181 137   0 255
-#define S_orange  203  75  22 255
-#define S_red     220  50  47 255
-#define S_magenta 211  54 130 255
-#define S_violet  108 113 196 255
-#define S_blue     38 139 210 255
-#define S_cyan     42 161 152 255
-#define S_green   133 153   0 255
-
-#ifndef SOLARIZED_LIGHT
-/* Dark */
-
-#define S_base03   0  43  54 255
-#define S_base02   7  54  66 255
-#define S_base01  88 110 117 255
-#define S_base00 101 123 131 255
-#define S_base0  131 148 150 255
-#define S_base0_shine  141 148 150 128
-#define S_base1  147 161 161 255
-#define S_base2  238 232 213 255
-#define S_base3  253 246 227 255
-
-#else
-/* Light */
-
-#define S_base03 253 246 227 255
-#define S_base02 238 232 213 255
-#define S_base01 147 161 161 255
-#define S_base00 131 148 150 255
-#define S_base0  101 123 131 255
-#define S_base0_shine  111 123 131 128
-#define S_base1   88 110 117 255
-#define S_base2    7  54  66 255
-#define S_base3    0  43  54 255
-
-#endif
-
-collections {
-
-//////////////////////////////////////////////////////////////////////////////
-   //// the background and general container for the terminal
-   group { name: "terminology/background";
-      color_classes {
-          color_class { name: "color-0";  color: S_base0; }
-          color_class { name: "color-1";  color: S_base02; }
-          color_class { name: "color-2";  color: S_red; }
-          color_class { name: "color-3";  color: S_green; }
-          color_class { name: "color-4";  color: S_yellow; }
-          color_class { name: "color-5";  color: S_blue; }
-          color_class { name: "color-6";  color: S_magenta; }
-          color_class { name: "color-7";  color: S_cyan; }
-          color_class { name: "color-8";  color: S_base2; }
-          color_class { name: "color-11"; color: S_base0; }
-
-          color_class { name: "color-13"; color: S_base03; }
-          color_class { name: "color-14"; color: S_orange; }
-          color_class { name: "color-15"; color: S_base01; }
-          color_class { name: "color-16"; color: S_base00; }
-          color_class { name: "color-17"; color: S_base0; }
-          color_class { name: "color-18"; color: S_violet; }
-          color_class { name: "color-19"; color: S_base1; }
-          color_class { name: "color-20"; color: S_base3; }
-
-          color_class { name: "color-25"; color: S_base03; }
-          color_class { name: "color-26"; color: S_orange; }
-          color_class { name: "color-27"; color: S_base01; }
-          color_class { name: "color-28"; color: S_base00; }
-          color_class { name: "color-29"; color: S_base0; }
-          color_class { name: "color-30"; color: S_violet; }
-          color_class { name: "color-31"; color: S_base1; }
-          color_class { name: "color-32"; color: S_base3; }
-
-          color_class { name: "256color-0";  color: S_base02; } // COL_BLACK
-          color_class { name: "256color-1";  color: S_red; } // COL_RED
-          color_class { name: "256color-2";  color: S_green; } // COL_GREEN
-          color_class { name: "256color-3";  color: S_yellow; } // COL_YELLOW
-          color_class { name: "256color-4";  color: S_blue; } // COL_BLUE
-          color_class { name: "256color-5";  color: S_magenta; } // COL_MAGENTA
-          color_class { name: "256color-6";  color: S_cyan; } // COL_CYAN
-          color_class { name: "256color-7";  color: S_base2; } // COL_WHITE
-
-          color_class { name: "256color-8";  color: S_base03; } // COL_BLACK
-          color_class { name: "256color-9";  color: S_orange; } // COL_RED
-          color_class { name: "256color-10"; color: S_base01; } // COL_GREEN
-          color_class { name: "256color-11"; color: S_base00; } // COL_YELLOW
-          color_class { name: "256color-12"; color: S_base0; } // COL_BLUE
-          color_class { name: "256color-13"; color: S_violet; } // COL_MAGENTA
-          color_class { name: "256color-14"; color: S_base1; } // COL_CYAN
-          color_class { name: "256color-15"; color: S_base3; } // COL_WHITE
-      }
-      images {
-        image: "bg_bevel.png" COMP;
-        image: "bg_shine.png" COMP;
-        image: "bg_glint.png" COMP;
-        image: "bg_shadow.png" COMP;
-        image: "bg_led_glow.png" COMP;
-        image: "bg_led_base.png" COMP;
-        image: "bg_led.png" COMP;
-        image: "bg_led_strobe.png" COMP;
-        image: "pm_shadow.png" COMP;
-        image: "pm_overlay.png" COMP;
-        image: "pm_fill.png" COMP;
-      }
-      parts {
-         ////////////////////////////////////////////////////////////////////
-         // background handling
-         part { name: "shadow";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               image.normal: "bg_shadow.png";
-               fill.smooth: 0;
-               visible: 0;
-            }
-            description { state: "translucent" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "base"; type: RECT;
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               color: S_base03;
-            }
-            description { state: "translucent" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "fade"; type: RECT;
-            description { state: "default" 0.0;
-            }
-            description { state: "translucent" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 128;
-            }
-         }
-         part { name: "terminology.background"; type: SWALLOW;
-            clip_to: "fade";
-            description { state: "default" 0.0;
-            }
-            description { state: "image" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "scale" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "edje" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "movie" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         program { name: "trans_on";
-            signal: "translucent,on";
-            source: "terminology";
-            action: STATE_SET "translucent" 0.0;
-            target: "base";
-            target: "shadow";
-            target: "fade";
-         }
-         program { name: "trans_off";
-            signal: "translucent,off";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            target: "base";
-            target: "shadow";
-             target: "fade";
-         }
-         program { name: "media_off";
-            signal: "media,off";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            target: "terminology.background";
-         }
-         program { name: "media_img";
-            signal: "media,image";
-            source: "terminology";
-            action: STATE_SET "image" 0.0;
-            target: "terminology.background";
-         }
-         program { name: "media_scale";
-            signal: "media,scale";
-            source: "terminology";
-            action: STATE_SET "scale" 0.0;
-            target: "terminology.background";
-         }
-         program { name: "media_edje";
-            signal: "media,edje";
-            source: "terminology";
-            action: STATE_SET "edje" 0.0;
-            target: "terminology.background";
-         }
-         program { name: "media_mov";
-            signal: "media,movie";
-            source: "terminology";
-            action: STATE_SET "movie" 0.0;
-            target: "terminology.background";
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // actual text grid for chars, cursors, selectiond etc. goes here
-         part { name: "terminology.content"; type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1.offset: 1 2;
-               rel2.offset: -2 -2;
-            }
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // overlayed prettiness
-         part { name: "bevel";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.offset: 0 0;
-               rel2.offset: -1 -1;
-               image.normal: "bg_bevel.png";
-               image.border: 3 3 5 3;
-               image.middle: 0;
-               fill.smooth: 0;
-               visible: 1;
-            }
-         }
-         part { name: "glintclip"; type: RECT;
-            mouse_events: 1;
-            description { state: "default" 0.0;
-            }
-         }
-         part { name: "glint";
-            mouse_events: 0;
-            clip_to: "glintclip";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 79 5;
-               max: 79 5;
-               rel1 {
-                  relative: 0.0 0.0;
-                  offset: 0 1;
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  offset: -1 1;
-               }
-               image.normal: "bg_glint.png";
-            }
-         }
-         part { name: "shine";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               rel1.offset: 0 1;
-               rel2.offset: -1 -1;
-               image.normal: "bg_shine.png";
-               fill.smooth: 0;
-               align: 0.5 0.0;
-               aspect: (255/120) (255/120);
-               aspect_preference: HORIZONTAL;
-               color: S_base0_shine;
-               visible: 0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         program { name: "focus_in";
-             signal: "focus,in";
-             source: "terminology";
-             action: STATE_SET "focused" 0.0;
-             target: "shine";
-         }
-         program { name: "focus_out";
-             signal: "focus,out";
-             source: "terminology";
-             action: STATE_SET "default" 0.0;
-             target: "shine";
-         }
-
-
-         ////////////////////////////////////////////////////////////////////
-         // a place terminology will place an entry box for internal commands
-         part { name: "cmdclip"; type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "terminology.cmdbox";
-               rel1.offset: -100 -100;
-               rel2.to: "terminology.cmdbox";
-               rel2.offset: 99 99;
-               color: 255 255 255 0;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               visible: 1;
-            }
-         }
-         part { name: "cmdback"; type: RECT;
-            clip_to: "cmdclip";
-            description { state: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.to: "terminology.cmdbox";
-               rel1.offset: -2 -2;
-               rel2.to: "terminology.cmdbox";
-               rel2.offset: 1 1;
-            }
-         }
-         part { name: "terminology.cmdbox"; type: SWALLOW;
-            clip_to: "cmdclip";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 8 8;
-               rel1.relative: 0.0 1.0;
-               rel1.offset: 8 9;
-               rel2.offset: -9 9;
-               align: 0.5 0.0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel1.offset: 8 -9;
-               rel2.offset: -9 -9;
-               align: 0.5 1.0;
-            }
-         }
-         program { name: "cmdshow0";
-            signal: "cmdbox,show";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.4;
-            target: "cmdclip";
-         }
-         program { name: "cmdshow";
-            signal: "cmdbox,show";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: SPRING 0.4 0.5 4;
-            target: "terminology.cmdbox";
-         }
-         program { name: "cmdhide";
-            signal: "cmdbox,hide";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.5;
-            target: "terminology.cmdbox";
-            target: "cmdclip";
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // visual bell - spinning red siren light
-         part { name: "bell_glow";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bell_base";
-               rel2.to: "bell_base";
-               min: 1600 1600;
-               fill.smooth: 0;
-               image.normal: "bg_led_glow.png";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-            description { state: "done" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               min: 0 0;
-            }
-         }
-         part { name: "bell_base";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               color: 255 255 255 0;
-               min: 32 32;
-               max: 32 32;
-               rel2.offset: -1 -1;
-               align: 1.0 1.0;
-               image.normal: "bg_led_base.png";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-         }
-         part { name: "bell";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bell_base";
-               rel2.to: "bell_base";
-               image.normal: "bg_led.png";
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-         }
-         part { name: "bell_strobe";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               color: 255 255 255 0;
-               rel1.to: "bell";
-               rel2.to: "bell";
-               image.normal: "bg_led_strobe.png";
-               map {
-                  on: 1;
-                  smooth: 1;
-                  rotation.center: "bell";
-               }
-            }
-            description { state: "spin" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-               map.rotation.z: 36.0;
-            }
-            description { state: "spin_done" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-               map.rotation.z: 684.0;
-            }
-         }
-         program { name: "bell0";
-            signal: "bell";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            target: "bell_base";
-            target: "bell";
-            target: "bell_strobe";
-            target: "bell_glow";
-            after: "bell";
-         }
-         program { name: "bell";
-            action: STATE_SET "visible" 0.0;
-            target: "bell_base";
-            target: "bell_glow";
-            after: "bell2";
-         }
-         program { name: "bell2";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.1;
-            target: "bell";
-            target: "bell_glow";
-            after: "bell3";
-            after: "bell3.1";
-         }
-         program { name: "bell3";
-            action: STATE_SET "spin" 0.0;
-            transition: LINEAR 0.1;
-            target: "bell_strobe";
-            after: "bell4.0";
-            after: "bell4.1";
-            after: "bell4.2";
-         }
-         program { name: "bell3.1";
-            action: STATE_SET "done" 0.0;
-            transition: DECELERATE 0.5;
-            target: "bell_glow";
-         }
-         program { name: "bell4.0";
-            action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 1.2;
-            target: "bell";
-         }
-         program { name: "bell4.1";
-            action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 1.6;
-            target: "bell_base";
-         }
-         program { name: "bell4.2";
-            action: STATE_SET "spin_done" 0.0;
-            transition: LINEAR 0.9;
-            target: "bell_strobe";
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // popup media over the terminal (until dismissed)
-         part { name: "popmedia_clip"; type: RECT;
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-               color: 255 255 255 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-         }
-         part { name: "popmedia_shadow";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  to: "terminology.popmedia";
-               }
-               rel2 {
-                  to: "terminology.popmedia";
-               }
-               image.normal: "pm_shadow.png";
-               image.border: 64 64 64 64;
-               image.border_scale_by: 0.1;
-               fill.smooth: 0;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               rel1.offset: -32 -32;
-               rel2.offset: 31 31;
-               image.border_scale_by: 1.0;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_fill";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "terminology.popmedia";
-               rel2.to: "terminology.popmedia";
-               image.normal: "pm_fill.png";
-               fill {
-                  size.relative: 0.0 0.0;
-                  size.offset: 64 64;
-               }
-            }
-         }
-         part { name: "terminology.popmedia"; type: SWALLOW;
-            clip_to: "popmedia_clip";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.relative: 0.5 0.5;
-               rel2.relative: 0.5 0.5;
-               visible: 0;
-            }
-            description { state: "image" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.1 0.1;
-               rel2.relative: 0.9 0.9;
-               visible: 1;
-            }
-            description { state: "scale" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.1 0.1;
-               rel2.relative: 0.9 0.9;
-               visible: 1;
-            }
-            description { state: "edje" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.1 0.1;
-               rel2.relative: 0.9 0.9;
-               visible: 1;
-            }
-            description { state: "movie" 0.0;
-               inherit: "default" 0.0;
-               rel1.relative: 0.1 0.1;
-               rel2.relative: 0.9 0.9;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_overlay";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "terminology.popmedia";
-               rel2.to: "terminology.popmedia";
-               image.normal: "pm_overlay.png";
-               fill.smooth: 0;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_bevel";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "terminology.popmedia";
-               rel2.to: "terminology.popmedia";
-               image.normal: "bg_bevel.png";
-               image.border: 3 3 5 3;
-               image.middle: 0;
-               fill.smooth: 0;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_glintclip"; type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_glint";
-            mouse_events: 0;
-            clip_to: "popmedia_glintclip";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 79 5;
-               max: 79 5;
-               rel1 {
-                  to: "terminology.popmedia";
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "terminology.popmedia";
-                  relative: 1.0 0.0;
-                  offset: -1 0;
-               }
-               image.normal: "bg_glint.png";
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_shine";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "terminology.popmedia";
-               rel2.to: "terminology.popmedia";
-               image.normal: "bg_shine.png";
-               fill.smooth: 0;
-               align: 0.5 0.0;
-               aspect: (255/120) (255/120);
-               aspect_preference: HORIZONTAL;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         part { name: "popmedia_dismiss"; type: RECT;
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-         program { name: "popmedia_dismiss";
-            signal: "mouse,clicked,*";
-            source: "popmedia_dismiss";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5;
-            target: "terminology.popmedia";
-            target: "popmedia_clip";
-            target: "popmedia_dismiss";
-            target: "popmedia_shadow";
-            target: "popmedia_fill";
-            target: "popmedia_overlay";
-            target: "popmedia_bevel";
-            target: "popmedia_glint";
-            target: "popmedia_glintclip";
-            target: "popmedia_shine";
-            after: "popmedia_dismiss2";
-         }
-         program { name: "popmedia_dismiss2";
-            action: SIGNAL_EMIT "popmedia,done" "terminology";
-         }
-         program { name: "popmedia_off";
-            signal: "popmedia,off";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.2;
-            target: "terminology.popmedia";
-            target: "popmedia_clip";
-            target: "popmedia_dismiss";
-            target: "popmedia_shadow";
-            target: "popmedia_fill";
-            target: "popmedia_overlay";
-            target: "popmedia_bevel";
-            target: "popmedia_glint";
-            target: "popmedia_glintclip";
-            target: "popmedia_shine";
-            after: "popmedia_dismiss2";
-         }
-         program { name: "popmedia_img";
-            signal: "popmedia,image";
-            source: "terminology";
-            action: STATE_SET "image" 0.0;
-            transition: DECELERATE 0.2;
-            target: "terminology.popmedia";
-         }
-         program { name: "popmedia_scale";
-            signal: "popmedia,scale";
-            source: "terminology";
-            action: STATE_SET "scale" 0.0;
-            transition: DECELERATE 0.2;
-            target: "terminology.popmedia";
-         }
-         program { name: "popmedia_edje";
-            signal: "popmedia,edje";
-            source: "terminology";
-            action: STATE_SET "edje" 0.0;
-            transition: DECELERATE 0.2;
-            target: "terminology.popmedia";
-         }
-         program { name: "popmedia_mov";
-            signal: "popmedia,movie";
-            source: "terminology";
-            action: STATE_SET "movie" 0.0;
-            transition: DECELERATE 0.2;
-            target: "terminology.popmedia";
-         }
-         program { name: "popmedia_img2";
-            signal: "popmedia,image";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.2;
-            target: "popmedia_clip";
-            target: "popmedia_dismiss";
-            target: "popmedia_shadow";
-            target: "popmedia_fill";
-            target: "popmedia_overlay";
-            target: "popmedia_bevel";
-            target: "popmedia_glint";
-            target: "popmedia_glintclip";
-            target: "popmedia_shine";
-         }
-         program { name: "popmedia_scale2";
-            signal: "popmedia,scale";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.2;
-            target: "popmedia_clip";
-            target: "popmedia_dismiss";
-            target: "popmedia_shadow";
-            target: "popmedia_fill";
-            target: "popmedia_overlay";
-            target: "popmedia_bevel";
-            target: "popmedia_glint";
-            target: "popmedia_glintclip";
-            target: "popmedia_shine";
-         }
-         program { name: "popmedia_edje2";
-            signal: "popmedia,edje";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.2;
-            target: "popmedia_clip";
-            target: "popmedia_dismiss";
-            target: "popmedia_shadow";
-            target: "popmedia_fill";
-            target: "popmedia_overlay";
-            target: "popmedia_bevel";
-            target: "popmedia_glint";
-            target: "popmedia_glintclip";
-            target: "popmedia_shine";
-         }
-         program { name: "popmedia_mov2";
-            signal: "popmedia,movie";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.2;
-            target: "popmedia_clip";
-            target: "popmedia_dismiss";
-            target: "popmedia_shadow";
-            target: "popmedia_fill";
-            target: "popmedia_overlay";
-            target: "popmedia_bevel";
-            target: "popmedia_glint";
-            target: "popmedia_glintclip";
-            target: "popmedia_shine";
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // overlayed options and controls
-         part { name: "terminology.about"; type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 198 198;
-               max: 198 198;
-               align: 0.5 0.0;
-               visible: 0;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               align: 0.5 0.5;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         program { name: "ab_show";
-            signal: "about,show";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: SPRING 1.2 2.0 6;
-            target: "terminology.about";
-         }
-         program { name: "ab_hide";
-            signal: "about,hide";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.6;
-            target: "terminology.about";
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // swallow to hold invisile rect to click on to dismiss things
-         part { name: "terminology.dismiss"; type: SWALLOW;
-            description { state: "default" 0.0;
-            }
-         }
-
-         ////////////////////////////////////////////////////////////////////
-         // overlayed options and controls
-         part { name: "terminology.optdetails"; type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 40 40;
-               align: 0.0 0.5;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.02;
-                  offset: 8 8;
-               }
-               rel2 {
-                  relative: 1.0 0.98;
-                  offset: 8 -9;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0.1 0.02;
-                  offset: 8 8;
-               }
-               rel2 {
-                  to_x: "terminology.options";
-                  relative: 0.0 0.98;
-                  offset: -9 -9;
-               }
-            }
-         }
-         program { name: "opdt_show";
-            signal: "optdetails,show";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.4;
-            target: "terminology.optdetails";
-         }
-         program { name: "opdt_hide";
-            signal: "optdetails,hide";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.2;
-            target: "terminology.optdetails";
-            after: "opdt_hide2";
-         }
-         program { name: "opdt_hide2";
-            action: SIGNAL_EMIT "optdetails,hide,done" "terminology";
-         }
-
-         part { name: "terminology.options"; type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.02;
-                  offset: 8 8;
-               }
-               rel2 {
-                  relative: 1.0 0.98;
-                  offset: 8 -9;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               align: 1.0 0.5;
-               rel1 {
-                  offset: -9 8;
-               }
-               rel2 {
-                  offset: -9 -9;
-               }
-            }
-         }
-         program { name: "op_show";
-            signal: "options,show";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.4;
-            target: "terminology.options";
-         }
-         program { name: "op_hide";
-            signal: "options,hide";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.6;
-            target: "terminology.options";
-         }
-
-         part { name: "terminology.controls"; type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 10 10;
-               align: 0.0 0.5;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.5;
-                  offset: 8 8;
-               }
-               rel2 {
-                  relative: 1.0 0.5;
-                  offset: 8 -9;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 1.0 0.5;
-                  offset: -9 8;
-               }
-               rel2 {
-                  offset: -9 -9;
-               }
-            }
-         }
-         program { name: "ct_show";
-            signal: "controls,show";
-            source: "terminology";
-            action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.3;
-            target: "terminology.controls";
-         }
-         program { name: "ct_hide";
-            signal: "controls,hide";
-            source: "terminology";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5;
-            target: "terminology.controls";
-         }
-      }
-   }
-}

-- 

------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk

Reply via email to