raster pushed a commit to branch master.
commit 03fa9d8a7e3580e6ce2c923e819520a9227ce605
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Wed Jul 31 18:15:38 2013 +0900
slideshow - black bg and compact formatting.
---
edje/dark.edc | 1 -
edje/edc/elm/slideshow.edc | 195 ++++++++++++++++-----------------------------
2 files changed, 68 insertions(+), 128 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index db652bf..cf50df7 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -33,7 +33,6 @@ collections {
#include "edc/elm/fileselector.edc"
#include "edc/elm/win.edc"
#include "edc/elm/inwin.edc"
-// XXX: stay black - dont use dark grey
#include "edc/elm/slideshow.edc"
// XXX: fix gfx for diskselector - unknown
#include "edc/elm/diskselector.edc"
diff --git a/edje/edc/elm/slideshow.edc b/edje/edc/elm/slideshow.edc
index 9581403..632b5d1 100644
--- a/edje/edc/elm/slideshow.edc
+++ b/edje/edc/elm/slideshow.edc
@@ -4,230 +4,183 @@ group { name: "elm/slideshow/base/default";
item: layouts "fullscreen not_fullscreen";
}
parts {
- part { name: "whole";
- type: RECT;
- description {
- state: "default" 0.0;
- visible: 1;
- color: 20 20 20 255;
+ part { name: "whole"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 255;
}
}
- part { name: "image_1_whole";
- type: RECT;
- description {
- state: "default" 0.0;
- color: 255 255 255 255;
+ part { name: "image_1_whole"; type: RECT;
+ description { state: "default" 0.0;
}
- description {
- state: "fade_prev_next" 0.0;
+ description { state: "fade_prev_next" 0.0;
inherit: "default" 0.0;
color: 255 255 255 0;
}
- description {
- state: "black_fade_prev_next_init" 0.0;
+ description { state: "black_fade_prev_next_init" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "black_fade_prev_next" 0.0;
+ description { state: "black_fade_prev_next" 0.0;
inherit: "default" 0.0;
color: 0 0 0 255;
}
- description {
- state: "horizontal_next_init" 0.0;
+ description { state: "horizontal_next_init" 0.0;
inherit: "default" 0.0;
}
- description {
- state: "horizontal_next" 0.0;
+ description { state: "horizontal_next" 0.0;
inherit: "default" 0.0;
rel1.relative: -1.0 0.0;
rel2.relative: 0.0 1.0;
}
- description {
- state: "horizontal_prev_init" 0.0;
+ description { state: "horizontal_prev_init" 0.0;
inherit: "default" 0.0;
}
- description {
- state: "horizontal_prev" 0.0;
+ description { state: "horizontal_prev" 0.0;
inherit: "default" 0.0;
rel1.relative: 1.0 0.0;
rel2.relative: 2.0 1.0;
}
- description {
- state: "vertical_next_init" 0.0;
+ description { state: "vertical_next_init" 0.0;
inherit: "default" 0.0;
}
- description {
- state: "vertical_next" 0.0;
+ description { state: "vertical_next" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 -1.0;
rel2.relative: 1.0 0.0;
}
- description {
- state: "vertical_prev_init" 0.0;
+ description { state: "vertical_prev_init" 0.0;
inherit: "default" 0.0;
}
- description {
- state: "vertical_prev" 0.0;
+ description { state: "vertical_prev" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 1.0;
rel2.relative: 1.0 2.0;
}
- description {
- state: "square_prev_next" 0.0;
+ description { state: "square_prev_next" 0.0;
inherit: "default" 0.0;
color: 255 255 255 0;
}
}
- part { name: "image_2_whole";
- type: RECT;
- description {
- state: "default" 0.0;
- visible: 1;
+ part { name: "image_2_whole"; type: RECT;
+ description { state: "default" 0.0;
color: 255 255 255 0;
}
- description {
- state: "fade_prev_next" 0.0;
+ description { state: "fade_prev_next" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "black_fade_prev_next_init" 0.0;
+ description { state: "black_fade_prev_next_init" 0.0;
inherit: "default" 0.0;
color: 0 0 0 0;
}
- description {
- state: "black_fade_prev_next" 0.0;
+ description { state: "black_fade_prev_next" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "horizontal_next_init" 0.0;
+ description { state: "horizontal_next_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 1.0 0.0;
rel2.relative: 2.0 1.0;
color: 255 255 255 255;
}
- description {
- state: "horizontal_next" 0.0;
+ description { state: "horizontal_next" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "horizontal_prev_init" 0.0;
+ description { state: "horizontal_prev_init" 0.0;
inherit: "default" 0.0;
rel1.relative: -1.0 0.0;
rel2.relative: 0.0 1.0;
color: 255 255 255 255;
}
- description {
- state: "horizontal_prev" 0.0;
+ description { state: "horizontal_prev" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "vertical_next_init" 0.0;
+ description { state: "vertical_next_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 1.0;
rel2.relative: 1.0 2.0;
color: 255 255 255 255;
}
- description {
- state: "vertical_next" 0.0;
+ description { state: "vertical_next" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "vertical_prev_init" 0.0;
+ description { state: "vertical_prev_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 -1.0;
rel2.relative: 1.0 0.0;
color: 255 255 255 255;
}
- description {
- state: "vertical_prev" 0.0;
+ description { state: "vertical_prev" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
- description {
- state: "square_prev_next_init" 0.0;
+ description { state: "square_prev_next_init" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
color: 255 255 255 255;
}
- description {
- state: "square_prev_next" 0.0;
+ description { state: "square_prev_next" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
color: 255 255 255 255;
}
}
- part { name: "elm.swallow.1";
- type: SWALLOW;
+ part { name: "elm.swallow.1"; type: SWALLOW;
clip_to: "image_1_whole";
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
rel1.to: "image_1_whole";
rel2.to: "image_1_whole";
}
- description {
- state: "not_fullscreen" 0.0;
+ description { state: "not_fullscreen" 0.0;
rel1.relative: 0.1 0.1;
rel1.to: "image_1_whole";
rel2.relative: 0.9 0.9;
rel2.to: "image_1_whole";
}
}
- part { name: "elm.swallow.2";
- type: SWALLOW;
+ part { name: "elm.swallow.2"; type: SWALLOW;
clip_to: "image_2_whole";
description {
state: "default" 0.0;
rel1.to: "image_2_whole";
rel2.to: "image_2_whole";
}
- description {
- state: "not_fullscreen" 0.0;
+ description { state: "not_fullscreen" 0.0;
rel1.relative: 0.1 0.1;
rel1.to: "image_2_whole";
rel2.relative: 0.9 0.9;
rel2.to: "image_2_whole";
}
}
- part { name: "events_catcher";
- type: RECT;
- repeat_events: 1;
- description {
- state: "default" 0.0;
- visible: 1;
+ part { name: "events_catcher"; type: RECT; repeat_events: 1;
+ description { state: "default" 0.0;
color: 0 0 0 0;
}
}
}
programs {
- //Substyle
- program { name: "layout_fullscreen";
- signal: "layout,fullscreen";
- source: "slideshow";
+ program {
+ signal: "layout,fullscreen"; source: "slideshow";
action: STATE_SET "default" 0.0;
target: "elm.swallow.1";
target: "elm.swallow.2";
transition: SINUSOIDAL 1.0;
}
- program { name: "layout_not_fullscreen";
- signal: "layout,not_fullscreen";
- source: "slideshow";
+ program {
+ signal: "layout,not_fullscreen"; source: "slideshow";
action: STATE_SET "not_fullscreen" 0.0;
target: "elm.swallow.1";
target: "elm.swallow.2";
transition: SINUSOIDAL 1.0;
}
//
- program { name: "fade_next";
- signal: "fade,next";
- source: "slideshow";
+ program {
+ signal: "fade,next"; source: "slideshow";
action: STATE_SET "default" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -240,9 +193,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program { name: "fade_previous";
- signal: "fade,previous";
- source: "slideshow";
+ program {
+ signal: "fade,previous"; source: "slideshow";
action: STATE_SET "default" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -255,9 +207,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program { name: "black_fade_next";
- signal: "black_fade,next";
- source: "slideshow";
+ program {
+ signal: "black_fade,next"; source: "slideshow";
action: STATE_SET "black_fade_prev_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -275,9 +226,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 0.75;
after: "end";
}
- program { name: "black_fade_previous";
- signal: "black_fade,previous";
- source: "slideshow";
+ program {
+ signal: "black_fade,previous"; source: "slideshow";
action: STATE_SET "black_fade_prev_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -295,9 +245,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 0.75;
after: "end";
}
- program { name: "horizontal_next";
- signal: "horizontal,next";
- source: "slideshow";
+ program {
+ signal: "horizontal,next"; source: "slideshow";
action: STATE_SET "horizontal_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -311,8 +260,7 @@ group { name: "elm/slideshow/base/default";
after: "end";
}
program { name: "horizontal_previous";
- signal: "horizontal,previous";
- source: "slideshow";
+ signal: "horizontal,previous"; source: "slideshow";
action: STATE_SET "horizontal_prev_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -325,9 +273,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program { name: "vertical_next";
- signal: "vertical,next";
- source: "slideshow";
+ program {
+ signal: "vertical,next"; source: "slideshow";
action: STATE_SET "vertical_next_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -340,9 +287,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program { name: "vertical_previous";
- signal: "vertical,previous";
- source: "slideshow";
+ program {
+ signal: "vertical,previous"; source: "slideshow";
action: STATE_SET "vertical_prev_init" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -355,9 +301,8 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program { name: "square_next";
- signal: "square,next";
- source: "slideshow";
+ program {
+ signal: "square,next"; source: "slideshow";
action: STATE_SET "square_prev_next_init" 0.0;
target: "image_2_whole";
after: "square_next_2";
@@ -369,24 +314,21 @@ group { name: "elm/slideshow/base/default";
transition: SINUSOIDAL 1.5;
after: "end";
}
- program { name: "square_previous";
- signal: "square,previous";
- source: "slideshow";
+ program {
+ signal: "square,previous"; source: "slideshow";
action: STATE_SET "square_prev_next_init" 0.0;
target: "image_2_whole";
after: "square_next_2";
}
- program { name: "next";
- signal: "none,next";
- source: "slideshow";
+ program {
+ signal: "none,next"; source: "slideshow";
action: STATE_SET "fade_prev_next" 0.0;
target: "image_1_whole";
target: "image_2_whole";
after: "end";
}
- program { name: "previous";
- signal: "none,previous";
- source: "slideshow";
+ program {
+ signal: "none,previous"; source: "slideshow";
action: STATE_SET "fade_prev_next" 0.0;
target: "image_1_whole";
target: "image_2_whole";
@@ -395,9 +337,8 @@ group { name: "elm/slideshow/base/default";
program { name: "end";
action: SIGNAL_EMIT "end" "slideshow";
}
- program { name: "end_signal";
- signal: "anim,end";
- source: "slideshow";
+ program {
+ signal: "anim,end"; source: "slideshow";
action: STATE_SET "default" 0.0;
target: "image_1_whole";
target: "image_2_whole";
--
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
