woohyun pushed a commit to branch master.
commit 58e900a195f1e04ae27477be3742360b59890b44
Author: WooHyun Jung <[email protected]>
Date: Tue Jul 23 11:46:47 2013 +0900
theme/dark : +colorsel
---
edje/dark.edc | 2 +-
edje/edc/elm/button.edc | 50 ++-
edje/edc/elm/colorsel.edc | 501 ++++++++++++++++++++++++++++++
edje/img/color_picker_alpha.png | Bin 0 -> 3156 bytes
edje/img/color_picker_alpha_bg.png | Bin 0 -> 974 bytes
edje/img/color_picker_brightness.png | Bin 0 -> 657 bytes
edje/img/color_picker_color.png | Bin 0 -> 1947 bytes
edje/img/color_picker_opacity.png | Bin 0 -> 1048 bytes
edje/img/icon_color_picker_arrow_down.png | Bin 0 -> 866 bytes
edje/img/icon_color_sel_arrow_down.png | Bin 0 -> 866 bytes
edje/img/sp_bt_l.png | Bin 0 -> 440 bytes
edje/img/sp_bt_r.png | Bin 0 -> 369 bytes
12 files changed, 546 insertions(+), 7 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index d681461..567ce99 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -41,7 +41,7 @@ collections {
//#include "edc/elm/actionslider.edc"
//#include "edc/elm/photocam.edc"
//#include "edc/elm/tooltip.edc"
-//#include "edc/elm/colorsel.edc"
+#include "edc/elm/colorsel.edc"
//#include "edc/elm/segmentcontrol.edc"
//#include "edc/elm/flipsel.edc"
//#include "edc/elm/notification.edc"
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index 8af07a8..cdbe632 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -253,7 +253,7 @@ group { name: "elm/button/base/default";
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "elm,action,click" "";
}
- program {
+ program { name: "button_text_visible";
signal: "elm,state,text,visible"; source: "elm";
script {
new m = get_int(btmode);
@@ -261,7 +261,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program {
+ program { name: "button_text_hidden";
signal: "elm,state,text,hidden"; source: "elm";
script {
new m = get_int(btmode);
@@ -269,7 +269,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program {
+ program { name: "button_icon_visible";
signal: "elm,state,icon,visible"; source: "elm";
script {
new m = get_int(btmode);
@@ -277,7 +277,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program {
+ program { name: "button_icon_hidden";
signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
script {
@@ -286,7 +286,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program {
+ program { name: "button_state_disabled";
signal: "elm,state,disabled"; source: "elm";
script {
new m = get_int(btmode);
@@ -294,7 +294,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program {
+ program { name: "button_state_enabled";
signal: "elm,state,enabled"; source: "elm";
script {
new m = get_int(btmode);
@@ -679,3 +679,41 @@ group { name: "elm/button/base/anchor";
#undef MASK
#undef DISABLE
}
+
+group { name: "elm/button/base/colorselector/left/default";
+ inherit: "elm/button/base/default";
+ images.image: "sp_bt_l.png" COMP;
+ parts {
+ part { name: "prev_image";
+ type: IMAGE;
+ scale: 1;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ min: 16 16;
+ max: 16 16;
+ fixed: 1 1;
+ align: 0.5 0.5;
+ image.normal: "sp_bt_l.png";
+ }
+ }
+ }
+}
+
+group { name: "elm/button/base/colorselector/right/default";
+ inherit: "elm/button/base/default";
+ images.image: "sp_bt_r.png" COMP;
+ parts {
+ part { name: "prev_image";
+ type: IMAGE;
+ scale: 1;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ min: 16 16;
+ max: 16 16;
+ fixed: 1 1;
+ align: 0.5 0.5;
+ image.normal: "sp_bt_r.png";
+ }
+ }
+ }
+}
diff --git a/edje/edc/elm/colorsel.edc b/edje/edc/elm/colorsel.edc
new file mode 100644
index 0000000..d7e0d5f
--- /dev/null
+++ b/edje/edc/elm/colorsel.edc
@@ -0,0 +1,501 @@
+group { name: "elm/colorselector/palette/default";
+ data.item: "horizontal_pad" "10";
+ data.item: "vertical_pad" "10";
+ parts {
+ part { name: "picker";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.0 0.0;
+ fixed: 0 1;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ }
+ }
+ part { name: "top_padding";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 20;
+ fixed: 0 1;
+ rel1.relative: 0.0 1.0;
+ rel1.to: "picker";
+ rel2.to: "picker";
+ align: 0.0 0.0;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ }
+ }
+ part { name: "palette";
+ type: SWALLOW;
+ scale: 1;
+ 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";
+ }
+ }
+ }
+ part{ name: "bottom_padding";
+ type: SPACER;
+ scale: 1;
+ 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;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ }
+ }
+ part { name: "selector";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.0 1.0;
+ fixed: 0 1;
+ rel1 {
+ relative: 0.0 1.0;
+ to: "bottom_padding";
+ }
+ }
+ }
+ }
+ 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";
+ 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";
+ action: STATE_SET "default" 0.0;
+ target: "bottom_padding";
+ target: "top_padding";
+ }
+ }
+}
+
+group { name: "elm/colorselector/picker/default";
+ parts {
+ part { name: "background";
+ type: IMAGE;
+ description { state: "default" 0.0;
+ 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;
+ }
+ }
+ }
+ part { name: "elm.picker";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 20 20;
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/bg/default";
+ parts {
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ 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;
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/base/default";
+ parts {
+ 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;
+ }
+ }
+ }
+ 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;
+ description { state: "default" 0.0;
+ rel1 {
+ relative: 1.0 0.17;
+ offset: 3 0;
+ to_x: "elm.l_button";
+ }
+ rel2 {
+ relative: 0.0 0.83;
+ offset: -4 0;
+ to_x: "elm.r_button";
+ }
+ }
+ }
+ part { name: "elm.arrow";
+ type: RECT;
+ scale: 1;
+ 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;
+ visible: 0;
+ }
+ dragable {
+ confine: "elm.arrow_bg";
+ x: 1 1 0;
+ y: 0 0 0;
+ }
+ }
+ part { name: "elm.arrow_icon";
+ type: SWALLOW;
+ mouse_events: 0;
+ 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";
+ }
+ }
+ }
+ part { name: "event";
+ type: RECT;
+ 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;
+ }
+ 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";
+ rel2.to: "elm.arrow_bg";
+ color: 0 0 0 0;
+ }
+ }
+ 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";
+ }
+ align: 0.0 0.5;
+ }
+ }
+ 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";
+ }
+ align: 1.0 0.5;
+ }
+ }
+ }
+}
+
+group{ name: "elm/colorselector/image/colorbar_0/default";
+ images {
+ image: "color_picker_color.png" COMP;
+ }
+ parts {
+ part { name: "colorbar_0_image";
+ type: IMAGE;
+ description { state: "default" 0.0;
+ rel2.offset: -1 -1;
+ image.normal: "color_picker_color.png";
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/image/colorbar_1/default";
+ 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";
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/image/colorbar_2/default";
+ 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";
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/image/colorbar_3/default";
+ 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";
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/bg_image/colorbar_3/default";
+ images {
+ image: "color_picker_alpha_bg.png" COMP;
+ }
+ parts {
+ part { name: "colorbar_3_image";
+ type: IMAGE;
+ description { state: "default" 0.0;
+ rel2.offset: -1 -1;
+ image.normal: "color_picker_alpha_bg.png";
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/arrow/default";
+ images {
+ image: "icon_color_sel_arrow_down.png" COMP;
+ }
+ parts {
+ part { name: "bg";
+ type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "arrow_image";
+ type: IMAGE;
+ description { state: "default" 0.0;
+ image.normal: "icon_color_sel_arrow_down.png";
+ }
+ }
+ }
+}
+
+group { name: "elm/colorselector/item/default";
+ parts {
+ part { name: "color_bg";
+ type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 40 40;
+ }
+ }
+ part { name: "color_obj";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.to: "color_bg";
+ rel2.to: "color_bg";
+ }
+ }
+ part { name: "focus_color";
+ scale: 1;
+ type: RECT;
+ description { state: "default" 0.0;
+ visible: 0;
+ min: 38 38;
+ rel1.to: "color_bg";
+ rel2.to: "color_bg";
+ color: 255 255 255 80;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ }
+ programs {
+ program { name: "item_focus";
+ source: "elm";
+ signal: "elm,state,selected";
+ action: STATE_SET "focused" 0.0;
+ target: "focus_color";
+ }
+ program { name: "item_unfocus";
+ source: "elm";
+ signal: "elm,state,unselected";
+ action: STATE_SET "default" 0.0;
+ target: "focus_color";
+ }
+ program {
+ name: "item_pressed_anim";
+ signal: "elm,anim,activate";
+ source: "elm";
+ action: STATE_SET "focused" 0.0;
+ target: "focus_color";
+ after: "item_unpressed_anim";
+ }
+ program {
+ name: "item_unpressed_anim";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.2;
+ target: "focus_color";
+ }
+ }
+}
+
+group { name: "elm/colorselector/item/color/default";
+ parts {
+ part { name: "color_rect";
+ type: RECT;
+ scale: 1;
+ description{ state: "default" 0.0;
+ }
+ }
+ }
+}
diff --git a/edje/img/color_picker_alpha.png b/edje/img/color_picker_alpha.png
new file mode 100644
index 0000000..09cbe77
Binary files /dev/null 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
new file mode 100644
index 0000000..6d144d7
Binary files /dev/null and b/edje/img/color_picker_alpha_bg.png differ
diff --git a/edje/img/color_picker_brightness.png
b/edje/img/color_picker_brightness.png
new file mode 100644
index 0000000..b2bbf5d
Binary files /dev/null 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
new file mode 100644
index 0000000..5074fa6
Binary files /dev/null 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
new file mode 100644
index 0000000..a97f7bb
Binary files /dev/null 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
new file mode 100644
index 0000000..899373f
Binary files /dev/null and b/edje/img/icon_color_picker_arrow_down.png differ
diff --git a/edje/img/icon_color_sel_arrow_down.png
b/edje/img/icon_color_sel_arrow_down.png
new file mode 100644
index 0000000..899373f
Binary files /dev/null and b/edje/img/icon_color_sel_arrow_down.png differ
diff --git a/edje/img/sp_bt_l.png b/edje/img/sp_bt_l.png
new file mode 100644
index 0000000..31d0d94
Binary files /dev/null and b/edje/img/sp_bt_l.png differ
diff --git a/edje/img/sp_bt_r.png b/edje/img/sp_bt_r.png
new file mode 100644
index 0000000..bef2c54
Binary files /dev/null and b/edje/img/sp_bt_r.png 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
