raster pushed a commit to branch master.
commit 5adca3fd025b87f4cf0d6fa420befa5596791e8f
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Thu Aug 1 20:54:53 2013 +0900
colorsel - make it vaguely acceptable look-wise!
---
edje/dark.edc | 1 -
edje/edc/elm/button.edc | 28 +-
edje/edc/elm/colorsel.edc | 698 ++++++++++++++++++------------
edje/img/color_picker_alpha.png | Bin 3156 -> 477 bytes
edje/img/color_picker_alpha_bg.png | Bin 974 -> 0 bytes
edje/img/color_picker_brightness.png | Bin 657 -> 300 bytes
edje/img/color_picker_color.png | Bin 1947 -> 512 bytes
edje/img/color_picker_opacity.png | Bin 1048 -> 399 bytes
edje/img/icon_color_picker_arrow_down.png | Bin 866 -> 0 bytes
edje/img/icon_color_sel_arrow_down.png | Bin 866 -> 0 bytes
edje/img/ring_shadow.png | Bin 0 -> 619 bytes
edje/img/ring_white_blue_glow.png | Bin 0 -> 1299 bytes
edje/img/ring_white_middle.png | Bin 0 -> 348 bytes
edje/img/sp_bt_l.png | Bin 440 -> 0 bytes
edje/img/sp_bt_r.png | Bin 369 -> 0 bytes
mock-21.xcf.gz | Bin 0 -> 2377 bytes
16 files changed, 423 insertions(+), 304 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 7c28b40..b3d9bbc 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -44,7 +44,6 @@ collections {
#include "edc/elm/actionslider.edc"
//#include "edc/elm/photocam.edc"
#include "edc/elm/tooltip.edc"
-// XXX: fix gfx for colorsel - too much to talk about here. just look at it.
#include "edc/elm/colorsel.edc"
#include "edc/elm/segment_control.edc"
//#include "edc/elm/flipsel.edc"
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index e604c76..0698b43 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -644,18 +644,14 @@ group { name: "elm/button/base/anchor";
group { name: "elm/button/base/colorselector/left/default";
inherit: "elm/button/base/default";
- images.image: "sp_bt_l.png" COMP;
+ images.image: "sym_left_light_normal.png" COMP;
parts {
- part { name: "prev_image";
- type: IMAGE;
- scale: 1;
- mouse_events: 0;
+ part { name: "ic"; mouse_events: 0;
description { state: "default" 0.0;
- min: 16 16;
- max: 16 16;
+ min: 15 15;
+ max: 15 15;
fixed: 1 1;
- align: 0.5 0.5;
- image.normal: "sp_bt_l.png";
+ image.normal: "sym_left_light_normal.png";
}
}
}
@@ -663,18 +659,14 @@ group { name:
"elm/button/base/colorselector/left/default";
group { name: "elm/button/base/colorselector/right/default";
inherit: "elm/button/base/default";
- images.image: "sp_bt_r.png" COMP;
+ images.image: "sym_right_light_normal.png" COMP;
parts {
- part { name: "prev_image";
- type: IMAGE;
- scale: 1;
- mouse_events: 0;
+ part { name: "ic"; mouse_events: 0;
description { state: "default" 0.0;
- min: 16 16;
- max: 16 16;
+ min: 15 15;
+ max: 15 15;
fixed: 1 1;
- align: 0.5 0.5;
- image.normal: "sp_bt_r.png";
+ image.normal: "sym_right_light_normal.png";
}
}
}
diff --git a/edje/edc/elm/colorsel.edc b/edje/edc/elm/colorsel.edc
index d7e0d5f..4a01c2d 100644
--- a/edje/edc/elm/colorsel.edc
+++ b/edje/edc/elm/colorsel.edc
@@ -1,147 +1,188 @@
group { name: "elm/colorselector/palette/default";
- data.item: "horizontal_pad" "10";
- data.item: "vertical_pad" "10";
+ data.item: "horizontal_pad" 0;
+ data.item: "vertical_pad" 0;
+ images.image: "bevel_dark_in.png" COMP;
parts {
- part { name: "picker";
- type: SWALLOW;
- scale: 1;
+ part { name: "picker"; type: SWALLOW;
description { state: "default" 0.0;
- align: 0.0 0.0;
fixed: 0 1;
- rel1.relative: 0.0 0.0;
+ align: 0.5 0.0;
rel2.relative: 1.0 0.0;
}
}
- part { name: "top_padding";
- type: SPACER;
- scale: 1;
+ part { name: "sep1";
description { state: "default" 0.0;
- min: 0 20;
- fixed: 0 1;
+ fixed: 1 1;
+ rel1.to_y: "picker";
+ rel1.offset: 4 4;
rel1.relative: 0.0 1.0;
- rel1.to: "picker";
- rel2.to: "picker";
- align: 0.0 0.0;
- }
- description { state: "disabled" 0.0;
+ rel2.to_y: "picker";
+ rel2.offset: -5 5;
+ min: 2 2;
+ max: 99999 2;
+ image.normal: "bevel_dark_in.png";
+ image.border: 2 2 2 2;
+ fill.smooth: 0;
+ }
+ description { state: "off" 0.0;
inherit: "default" 0.0;
- min: 0 0;
+ rel1.offset: 4 -2;
+ rel2.offset: -5 -1;
+ visible: 0;
}
}
- part { name: "palette";
- type: SWALLOW;
- scale: 1;
+ part { name: "palette"; type: SWALLOW;
description { state: "default" 0.0;
- align: 0.0 0.0;
- fixed: 0 1;
- rel1 {
- relative: 0.0 1.0;
- to: "top_padding";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "top_padding";
- }
+ align: 0.5 0.0;
+ rel1.to_y: "sep1";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 4;
+ rel2.to_y: "sep2";
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -1 -5;
+ }
+ description { state: "off" 0.0;
+ inherit: "default" 0.0;
+ rel1.offset: 0 0;
+ rel2.offset: -1 -1;
}
}
- part{ name: "bottom_padding";
- type: SPACER;
- scale: 1;
+ part { name: "sep2";
description { state: "default" 0.0;
- min: 0 20;
- fixed: 0 1;
- rel1.relative: 0.0 1.0;
- rel1.to: "palette";
- rel2.to: "palette";
- align: 0.0 0.0;
+ fixed: 1 1;
+ rel1.to_y: "selector";
+ rel1.offset: 4 -6;
+ rel2.to_y: "selector";
+ rel2.offset: -5 -5;
+ rel2.relative: 1.0 0.0;
+ min: 2 2;
+ max: 99999 2;
+ image.normal: "bevel_dark_in.png";
+ image.border: 2 2 2 2;
+ fill.smooth: 0;
}
- description { state: "disabled" 0.0;
+ description { state: "off" 0.0;
inherit: "default" 0.0;
- min: 0 0;
+ rel1.offset: 4 0;
+ rel2.offset: -5 1;
+ visible: 0;
}
}
- part { name: "selector";
- type: SWALLOW;
- scale: 1;
+ part { name: "selector"; type: SWALLOW;
description { state: "default" 0.0;
- align: 0.0 1.0;
fixed: 0 1;
- rel1 {
- relative: 0.0 1.0;
- to: "bottom_padding";
- }
+ align: 0.0 1.0;
+ rel1.relative: 0.0 1.0;
}
}
}
programs {
- program { name: "init";
- source: "";
- signal: "load";
- action: STATE_SET "disabled" 0.0;
- target: "top_padding";
- }
- program { name: "palette";
- source: "elm";
- signal: "elm,state,palette";
- action: STATE_SET "disabled" 0.0;
- target: "bottom_padding";
- target: "top_padding";
- }
- program { name: "components";
- source: "elm";
- signal: "elm,state,components";
- action: STATE_SET "disabled" 0.0;
- target: "bottom_padding";
- target: "top_padding";
- }
- program { name: "both";
- source: "elm";
- signal: "elm,state,both";
+ program {
+ source: "elm"; signal: "elm,state,palette";
+ action: STATE_SET "off" 0.0;
+ target: "sep1";
+ target: "sep2";
+ }
+ program {
+ source: "elm"; signal: "elm,state,palette";
+ action: STATE_SET "default" 0.0;
+ target: "palette";
+ }
+
+ program {
+ source: "elm"; signal: "elm,state,components";
+ action: STATE_SET "off" 0.0;
+ target: "sep1";
+ target: "sep2";
+ target: "palette";
+ }
+
+ program {
+ source: "elm"; signal: "elm,state,both";
+ action: STATE_SET "off" 0.0;
+ target: "sep1";
+ }
+ program {
+ source: "elm"; signal: "elm,state,both";
action: STATE_SET "default" 0.0;
- target: "bottom_padding";
- after: "notop";
- }
- program { name: "notop";
- action: STATE_SET "disabled" 0.0;
- target: "top_padding";
- }
- program { name: "picker";
- source: "elm";
- signal: "elm,state,picker";
- action: STATE_SET "disabled" 0.0;
- target: "bottom_padding";
- target: "top_padding";
- }
- program { name: "all";
- source: "elm";
- signal: "elm,state,all";
+ target: "palette";
+ target: "sep2";
+ }
+
+ program {
+ source: "elm"; signal: "elm,state,picker";
+ action: STATE_SET "off" 0.0;
+ target: "sep1";
+ target: "sep2";
+ target: "palette";
+ }
+
+ program {
+ source: "elm"; signal: "elm,state,all";
action: STATE_SET "default" 0.0;
- target: "bottom_padding";
- target: "top_padding";
+ target: "sep1";
+ target: "sep2";
+ target: "palette";
}
}
}
group { name: "elm/colorselector/picker/default";
+ images.image: "inset_shadow.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "dot_pattern.png" COMP;
parts {
- part { name: "background";
- type: IMAGE;
+ part { name: "bg"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
+ min: 20 20;
rel1.to: "elm.picker";
rel2.to: "elm.picker";
- image.normal: "color_picker_alpha_bg.png";
- fill {
- type: TILE;
- origin.offset: 0 0;
- size.offset: 33 33;
- }
+ color: 48 48 48 255;
}
}
- part { name: "elm.picker";
- type: SWALLOW;
- scale: 1;
+ part { name: "pat";
description { state: "default" 0.0;
- min: 20 20;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ image.normal: "dot_pattern.png";
+ TILED_PATTERN(256, 256)
+ }
+ }
+ part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "elm.picker";
+ rel2.to: "elm.picker";
+ }
+ }
+ part { name: "elm.picker"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
+ }
+ }
+ 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;
}
}
}
@@ -149,99 +190,115 @@ group { name: "elm/colorselector/picker/default";
group { name: "elm/colorselector/bg/default";
parts {
- part { name: "elm.colorbar_0";
- type: SWALLOW;
+ part { name: "elm.colorbar_0"; type: SWALLOW;
description { state: "default" 0.0;
- min: 120 30;
- rel1.relative: 0.0 0.00653594771;
- rel2.relative: 1.0 0.254901961;
+ rel2.relative: 1.0 0.0;
+ align: 0.5 0.0;
+ fixed: 0 1;
}
}
- part { name: "elm.colorbar_1";
- type: SWALLOW;
+ part { name: "elm.colorbar_1"; type: SWALLOW;
description { state: "default" 0.0;
- min: 120 30;
- rel1.relative: 0.0 0.254901961;
- rel2.relative: 1.0 0.503267974;
+ rel1.to_y: "elm.colorbar_0";
+ rel1.relative: 0.0 1.0;
+ rel2.to_y: "elm.colorbar_0";
+ rel2.relative: 1.0 1.0;
+ align: 0.5 0.0;
+ fixed: 0 1;
}
}
- part { name: "elm.colorbar_2";
- type: SWALLOW;
+ part { name: "elm.colorbar_2"; type: SWALLOW;
description { state: "default" 0.0;
- min: 120 30;
- rel1.relative: 0.0 0.503267974;
- rel2.relative: 1.0 0.751633987;
+ rel1.to_y: "elm.colorbar_1";
+ rel1.relative: 0.0 1.0;
+ rel2.to_y: "elm.colorbar_1";
+ rel2.relative: 1.0 1.0;
+ align: 0.5 0.0;
+ fixed: 0 1;
}
}
- part { name: "elm.colorbar_3";
- type: SWALLOW;
+ part { name: "elm.colorbar_3"; type: SWALLOW;
description { state: "default" 0.0;
- min: 120 30;
- rel1.relative: 0.0 0.751633987;
- rel2.relative: 1.0 1.0;
+ rel1.to_y: "elm.colorbar_2";
+ rel1.relative: 0.0 1.0;
+ align: 0.5 0.0;
}
}
}
}
group { name: "elm/colorselector/base/default";
+ images.image: "inset_shadow.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "ring_shadow.png" COMP;
+ images.image: "ring_white_blue_glow.png" COMP;
+ images.image: "col_sel_end_bottom.png" COMP;
+ images.image: "col_sel_end_top.png" COMP;
parts {
- part { name: "elm.bar_bg";
- type: SWALLOW;
- mouse_events: 0;
+ part { name: "elm.bar_bg"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- min: 60 22;
- rel1 {
- relative: 0.0 0.8;
- to_x: "elm.arrow_bg";
- to_y: "elm.arrow_icon";
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 0.83;
- to_x: "elm.arrow_bg";
- offset: 0 0;
- }
+ min: 32 15;
+ rel1.offset: 0 10;
+ rel1.to_x: "elm.arrow_bg";
+ rel2.offset: -1 -11;
+ rel2.to_x: "elm.arrow_bg";
}
}
- part { name: "elm.bar";
- type: SWALLOW;
- mouse_events: 0;
+ part { name: "elm.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "elm.bar_bg";
rel2.to: "elm.bar_bg";
}
}
- part { name: "elm.arrow_bg";
- type: SWALLOW;
+ part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "shadow";
+ rel2.to: "shadow";
+ }
+ }
+ 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: "elm.bar_bg";
+ rel2.to: "elm.bar_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: "shadow";
+ rel1.offset: -1 -1;
+ rel2.to: "shadow";
+ rel2.offset: 0 0;
+ fill.smooth: 0;
+ }
+ }
+ part { name: "elm.arrow_bg"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
- relative: 1.0 0.17;
+ relative: 1.0 0.0;
offset: 3 0;
to_x: "elm.l_button";
}
rel2 {
- relative: 0.0 0.83;
+ relative: 0.0 1.0;
offset: -4 0;
to_x: "elm.r_button";
}
}
}
- part { name: "elm.arrow";
- type: RECT;
- scale: 1;
+ part { name: "elm.arrow"; type: RECT;
description { state: "default" 0.0;
- min: 1 1;
fixed: 1 1;
- align: 0 0;
- rel1 {
- to_x: "elm.arrow_bg";
- }
- rel2 {
- relative: 0.0 0.17;
- to_x: "elm.arrow_bg";
- }
- color: 0 0 0 0;
+ min: 1 1;
+ rel1.to_x: "elm.arrow_bg";
+ rel2.to_x: "elm.arrow_bg";
visible: 0;
}
dragable {
@@ -250,43 +307,83 @@ group { name: "elm/colorselector/base/default";
y: 0 0 0;
}
}
- part { name: "elm.arrow_icon";
- type: SWALLOW;
- mouse_events: 0;
+ part { name: "event"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "elm.arrow_icon";
+ rel2.to_x: "elm.arrow_icon";
+ rel2.to_y: "elm.arrow_bg";
+ color: 0 0 0 0;
+ }
+ dragable.events: "elm.arrow";
+ }
+ part { name: "arrow_under"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "ring_shadow.png";
+ rel1.to: "elm.arrow_icon";
+ rel2.to: "elm.arrow_icon";
+ }
+ }
+ part { name: "elm.arrow_icon"; type: SWALLOW; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- min: 25 15;
- max: 25 15;
fixed: 1 1;
- align: 0.5 0;
- rel1 {
- to_x: "elm.arrow";
- }
- rel2 {
- relative: 1.0 0.0;
- offset: 0 10;
- to_x: "elm.arrow";
- }
+ min: 16 16;
+ max: 16 16;
+ align: 0.5 (28/32);
+ rel1.to_x: "elm.arrow";
+ rel1.to_y: "shadow";
+ rel2.relative: 1.0 0.0;
+ rel2.to_x: "elm.arrow";
+ rel2.to_y: "shadow";
}
}
- part { name: "event";
- type: RECT;
+ part { name: "end1"; mouse_events: 0;
+ clip_to: "clipper";
description { state: "default" 0.0;
- rel1 {
- to: "elm.arrow_icon";
- }
- rel2 {
- to_x: "elm.arrow_icon";
- to_y: "elm.arrow_bg";
- offset: 0 0;
- }
- color: 0 0 0 0;
+ image.normal: "col_sel_end_top.png";
+ FIXED_SIZE(11, 8)
+ align: 0.5 0.0;
+ rel1.to_x: "cursor";
+ rel2.to_x: "cursor";
+ rel1.to_y: "shadow";
+ rel2.to_y: "shadow";
}
- dragable {
- events: "elm.arrow";
+ }
+ part { name: "end2"; mouse_events: 0;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ image.normal: "col_sel_end_bottom.png";
+ FIXED_SIZE(11, 8)
+ align: 0.5 1.0;
+ rel1.to_x: "cursor";
+ rel2.to_x: "cursor";
+ rel1.to_y: "shadow";
+ rel2.to_y: "shadow";
+ }
+ }
+ part { name: "arrow_over"; mouse_events: 0;
+ description { state: "default" 0.0;
+ image.normal: "ring_white_blue_glow.png";
+ rel1.to: "elm.arrow_icon";
+ rel2.to: "elm.arrow_icon";
}
}
- part { name: "elm.arrow_bg_access";
- type: RECT;
+ part { name: "cursor"; type: RECT;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 1 1;
+ rel1.to_x: "elm.arrow_icon";
+ rel1.to_y: "shadow";
+ rel1.relative: 0.5 0.0;
+ rel2.to_x: "elm.arrow_icon";
+ rel2.to_y: "shadow";
+ rel2.relative: 0.5 1.0;
+ rel2.offset: 0 -1;
+ color: 255 255 255 255;
+ }
+ dragable.events: "elm.arrow";
+ }
+ part { name: "elm.arrow_bg_access"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
rel1.to: "elm.arrow_bg";
@@ -294,43 +391,45 @@ group { name: "elm/colorselector/base/default";
color: 0 0 0 0;
}
}
- part { name: "elm.l_button";
- type: SWALLOW;
+ part { name: "elm.l_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- min: 24 24;
fixed: 1 1;
- rel1 {
- relative: 0.0 0.0;
- to_y: "elm.bar_bg";
- }
- rel2 {
- relative: 0.0 1.0;
- to_y: "elm.bar_bg";
- }
+ min: 17 17;
+ rel1.relative: 0.0 0.0;
+ rel1.to_y: "elm.bar_bg";
+ rel2.relative: 0.0 1.0;
+ rel2.to_y: "elm.bar_bg";
align: 0.0 0.5;
}
}
- part { name: "elm.r_button";
- type: SWALLOW;
+ part { name: "elm.r_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- min: 24 24;
fixed: 1 1;
- rel1 {
- relative: 1.0 0.0;
- to_y: "elm.bar_bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to_y: "elm.bar_bg";
- }
+ min: 17 17;
+ rel1.relative: 1.0 0.0;
+ rel1.to_y: "elm.bar_bg";
+ rel2.relative: 1.0 1.0;
+ rel2.to_y: "elm.bar_bg";
align: 1.0 0.5;
}
}
}
}
+group { name: "elm/colorselector/arrow/default";
+ images.image: "ring_white_middle.png" COMP;
+ parts {
+ part { name: "base";
+ description { state: "default" 0.0;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "ring_white_middle.png";
+ }
+ }
+ }
+}
+
group{ name: "elm/colorselector/image/colorbar_0/default";
images {
image: "color_picker_color.png" COMP;
@@ -347,14 +446,10 @@ group{ name: "elm/colorselector/image/colorbar_0/default";
}
group { name: "elm/colorselector/image/colorbar_1/default";
- images {
- image: "color_picker_opacity.png" COMP;
- }
+ images.image: "color_picker_opacity.png" COMP;
parts {
part { name: "colorbar_1_image";
- type: IMAGE;
description { state: "default" 0.0;
- rel2.offset: -1 -1;
image.normal: "color_picker_opacity.png";
}
}
@@ -362,14 +457,10 @@ group { name:
"elm/colorselector/image/colorbar_1/default";
}
group { name: "elm/colorselector/image/colorbar_2/default";
- images {
- image: "color_picker_brightness.png" COMP;
- }
+ images.image: "color_picker_brightness.png" COMP;
parts {
part { name: "colorbar_2_image";
- type: IMAGE;
description { state: "default" 0.0;
- rel2.offset: -1 -1;
image.normal: "color_picker_brightness.png";
}
}
@@ -377,14 +468,10 @@ group { name:
"elm/colorselector/image/colorbar_2/default";
}
group { name: "elm/colorselector/image/colorbar_3/default";
- images {
- image: "color_picker_alpha.png" COMP;
- }
+ images.image: "color_picker_alpha.png" COMP;
parts {
part { name: "colorbar_3_image";
- type: IMAGE;
description { state: "default" 0.0;
- rel2.offset: -1 -1;
image.normal: "color_picker_alpha.png";
}
}
@@ -392,108 +479,149 @@ group { name:
"elm/colorselector/image/colorbar_3/default";
}
group { name: "elm/colorselector/bg_image/colorbar_3/default";
- images {
- image: "color_picker_alpha_bg.png" COMP;
- }
+ images.image: "dot_pattern.png" COMP;
parts {
- part { name: "colorbar_3_image";
- type: IMAGE;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel2.offset: -1 -1;
- image.normal: "color_picker_alpha_bg.png";
+ color: 48 48 48 255;
+ }
+ }
+ part { name: "pat";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ image.normal: "dot_pattern.png";
+ TILED_PATTERN(256, 256)
}
}
}
}
-group { name: "elm/colorselector/arrow/default";
- images {
- image: "icon_color_sel_arrow_down.png" COMP;
- }
+group { name: "elm/colorselector/item/default";
+ images.image: "inset_shadow.png" COMP;
+ images.image: "bevel_in.png" COMP;
+ images.image: "dot_pattern.png" COMP;
+ images.image: "bg_glow_in.png" COMP;
parts {
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ min: 20 20;
+ rel1.to: "color_obj";
+ rel2.to: "color_obj";
+ color: 48 48 48 255;
}
}
- part { name: "arrow_image";
- type: IMAGE;
+ part { name: "pat";
description { state: "default" 0.0;
- image.normal: "icon_color_sel_arrow_down.png";
+ rel1.to: "bg";
+ rel2.to: "bg";
+ image.normal: "dot_pattern.png";
+ TILED_PATTERN(256, 256)
}
}
- }
-}
-
-group { name: "elm/colorselector/item/default";
- parts {
- part { name: "color_bg";
- type: RECT;
- scale: 1;
+ part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- min: 40 40;
+ rel1.to: "color_obj";
+ rel2.to: "color_obj";
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 64;
}
}
- part { name: "color_obj";
- type: SWALLOW;
- scale: 1;
+ part { name: "color_obj"; type: SWALLOW;
+ clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "color_bg";
- rel2.to: "color_bg";
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
}
}
- part { name: "focus_color";
- scale: 1;
- type: RECT;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- visible: 0;
- min: 38 38;
- rel1.to: "color_bg";
- rel2.to: "color_bg";
- color: 255 255 255 80;
+ 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: "dim"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ color: 0 0 0 0;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ color: 0 0 0 128;
+ }
+ }
+ part { name: "glow"; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ image.normal: "bg_glow_in.png";
+ image.border: 7 7 7 7;
+ image.middle: 0;
+ fill.smooth: 0;
+ color: 255 255 255 0;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ 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;
}
}
}
programs {
- program { name: "item_focus";
- source: "elm";
- signal: "elm,state,selected";
+ program {
+ source: "elm"; signal: "elm,state,selected";
action: STATE_SET "focused" 0.0;
- target: "focus_color";
+ transition: DECELERATE 0.1;
+ target: "glow";
+ target: "dim";
}
- program { name: "item_unfocus";
- source: "elm";
- signal: "elm,state,unselected";
+ program {
+ source: "elm"; signal: "elm,state,unselected";
action: STATE_SET "default" 0.0;
- target: "focus_color";
+ transition: DECELERATE 0.5;
+ target: "glow";
+ target: "dim";
}
program {
- name: "item_pressed_anim";
- signal: "elm,anim,activate";
- source: "elm";
+ signal: "elm,anim,activate"; source: "elm";
action: STATE_SET "focused" 0.0;
- target: "focus_color";
- after: "item_unpressed_anim";
+ transition: DECELERATE 0.1;
+ target: "glow";
+ target: "dim";
+ after: "active2";
}
- program {
- name: "item_unpressed_anim";
+ program { name: "active2";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2;
- target: "focus_color";
+ transition: DECELERATE 0.8;
+ target: "glow";
+ target: "dim";
}
}
}
group { name: "elm/colorselector/item/color/default";
parts {
- part { name: "color_rect";
- type: RECT;
- scale: 1;
+ part { name: "color_rect"; type: RECT;
description{ state: "default" 0.0;
}
}
diff --git a/edje/img/color_picker_alpha.png b/edje/img/color_picker_alpha.png
index 09cbe77..ca666ad 100644
Binary files a/edje/img/color_picker_alpha.png and
b/edje/img/color_picker_alpha.png differ
diff --git a/edje/img/color_picker_alpha_bg.png
b/edje/img/color_picker_alpha_bg.png
deleted file mode 100644
index 6d144d7..0000000
Binary files a/edje/img/color_picker_alpha_bg.png and /dev/null differ
diff --git a/edje/img/color_picker_brightness.png
b/edje/img/color_picker_brightness.png
index b2bbf5d..125683c 100644
Binary files a/edje/img/color_picker_brightness.png and
b/edje/img/color_picker_brightness.png differ
diff --git a/edje/img/color_picker_color.png b/edje/img/color_picker_color.png
index 5074fa6..4cc5d65 100644
Binary files a/edje/img/color_picker_color.png and
b/edje/img/color_picker_color.png differ
diff --git a/edje/img/color_picker_opacity.png
b/edje/img/color_picker_opacity.png
index a97f7bb..82ca1fa 100644
Binary files a/edje/img/color_picker_opacity.png and
b/edje/img/color_picker_opacity.png differ
diff --git a/edje/img/icon_color_picker_arrow_down.png
b/edje/img/icon_color_picker_arrow_down.png
deleted file mode 100644
index 899373f..0000000
Binary files a/edje/img/icon_color_picker_arrow_down.png and /dev/null differ
diff --git a/edje/img/icon_color_sel_arrow_down.png
b/edje/img/icon_color_sel_arrow_down.png
deleted file mode 100644
index 899373f..0000000
Binary files a/edje/img/icon_color_sel_arrow_down.png and /dev/null differ
diff --git a/edje/img/ring_shadow.png b/edje/img/ring_shadow.png
new file mode 100644
index 0000000..b0cd5ca
Binary files /dev/null and b/edje/img/ring_shadow.png differ
diff --git a/edje/img/ring_white_blue_glow.png
b/edje/img/ring_white_blue_glow.png
new file mode 100644
index 0000000..58c697e
Binary files /dev/null and b/edje/img/ring_white_blue_glow.png differ
diff --git a/edje/img/ring_white_middle.png b/edje/img/ring_white_middle.png
new file mode 100644
index 0000000..9fcdede
Binary files /dev/null and b/edje/img/ring_white_middle.png differ
diff --git a/edje/img/sp_bt_l.png b/edje/img/sp_bt_l.png
deleted file mode 100644
index 31d0d94..0000000
Binary files a/edje/img/sp_bt_l.png and /dev/null differ
diff --git a/edje/img/sp_bt_r.png b/edje/img/sp_bt_r.png
deleted file mode 100644
index bef2c54..0000000
Binary files a/edje/img/sp_bt_r.png and /dev/null differ
diff --git a/mock-21.xcf.gz b/mock-21.xcf.gz
new file mode 100644
index 0000000..55546e1
Binary files /dev/null and b/mock-21.xcf.gz differ
--
------------------------------------------------------------------------------
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
