hermet pushed a commit to branch master.
commit 7095a5d9719ce8ea90da7f0f36fa62184ae2b7b9
Author: ChunEon Park <[email protected]>
Date: Tue Jul 23 21:11:21 2013 +0900
theme/dark - +dayselector
---
edje/dark.edc | 2 +-
edje/edc/elm/button.edc | 6 +-
edje/edc/elm/ctxpopup.edc | 4 +-
edje/edc/elm/dayselector.edc | 474 +++++++++++++++++++++++++++++++++++++++++
edje/img/day_left_normal.png | Bin 0 -> 235 bytes
edje/img/day_left_press.png | Bin 0 -> 612 bytes
edje/img/day_middle_normal.png | Bin 0 -> 212 bytes
edje/img/day_middle_press.png | Bin 0 -> 532 bytes
edje/img/day_right_normal.png | Bin 0 -> 228 bytes
edje/img/day_right_press.png | Bin 0 -> 624 bytes
10 files changed, 480 insertions(+), 6 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index d4f2328..0f8761d 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -37,7 +37,7 @@ collections {
#include "edc/elm/diskselector.edc"
#include "edc/elm/ctxpopup.edc"
//#include "edc/elm/multibuttonentry.edc"
-//#include "edc/elm/daysel.edc"
+#include "edc/elm/dayselector.edc"
//#include "edc/elm/actionslider.edc"
//#include "edc/elm/photocam.edc"
//#include "edc/elm/tooltip.edc"
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index de42348..0ed55a6 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -3,7 +3,7 @@ group { name: "elm/button/base/default";
images.image: "button_clicked.png" COMP;
#define ICON 1
#define LABEL 2
-#define MASK 3
+#define MASK 3
#define DISABLE 4
script {
public btmode;
@@ -112,7 +112,7 @@ group { name: "elm/button/base/default";
visible: 1;
}
}
- part { name: "sizer.content"; type: TEXT; mouse_events: 0;
+ part { name: "sizer.content"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
@@ -294,7 +294,7 @@ group { name: "elm/button/base/anchor";
images.image: "horizontal_separated_bar_small_glow.png" COMP;
#define ICON 1
#define LABEL 2
-#define MASK 3
+#define MASK 3
#define DISABLE 4
script {
public btmode;
diff --git a/edje/edc/elm/ctxpopup.edc b/edje/edc/elm/ctxpopup.edc
index 026e1ed..c9c73c4 100644
--- a/edje/edc/elm/ctxpopup.edc
+++ b/edje/edc/elm/ctxpopup.edc
@@ -46,7 +46,7 @@ group { name: "elm/ctxpopup/bg/default";
}
}
}
-///////////////////////////////////////////////////////////////////////////////
+
group { name: "elm/ctxpopup/base/default";
images {
image: "vgrad_med_darker.png" COMP;
@@ -367,7 +367,7 @@ group { name: "elm/ctxpopup/base/default";
}
}
-///////////////////////////////////////////////////////////////////////////////
+
group { name: "elm/ctxpopup/arrow/default";
images {
image: "ctxpopup_arrow_left.png" COMP;
diff --git a/edje/edc/elm/dayselector.edc b/edje/edc/elm/dayselector.edc
new file mode 100644
index 0000000..18e3a1d
--- /dev/null
+++ b/edje/edc/elm/dayselector.edc
@@ -0,0 +1,474 @@
+#define DAYSELECOR_DAY_POS_LEFT 1
+#define DAYSELECOR_DAY_POS_RIGHT 2
+#define DAYSELECOR_DAY_POS_MIDDLE 3
+#define DAYSELECOR_DAY_TYPE_WEEKDAY 1
+#define DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT 2
+#define DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1 3
+#define DAYSELECOR_DAY_STATE_DEFAULT 1
+#define DAYSELECOR_DAY_STATE_PRESSED 2
+#define DAYSELECOR_DAY_STATE_SELECTED 3
+
+#define DAYSELECTOR_DAY(_pos, _after)\
+ part {\
+ name: "day"#_pos;\
+ type: SWALLOW;\
+ scale: 1;\
+ clip_to: "clipper";\
+ description { state: "default" 0.0;\
+ visible: 0;\
+ min: 0 0;\
+ align: 0.0 0.5;\
+ fixed: 1 0;\
+ rel1 {\
+ relative: 1.0 0.0;\
+ to: "day"#_after;\
+ offset: 0 0;\
+ }\
+ rel2 {\
+ relative: 1.0 1.0;\
+ to: "day"#_after;\
+ }\
+ }\
+ description { state: "visible" 0.0;\
+ inherit: "default" 0.0;\
+ visible: 1;\
+ min: 48 32;\
+ }\
+ }\
+ programs{\
+ program {\
+ name: "day"#_pos"visible";\
+ signal: "day"#_pos",visible";\
+ source: "elm";\
+ action: STATE_SET "visible" 0.0;\
+ target: "day"#_pos;\
+ }\
+ program {\
+ name: "day"#_pos"notvisible";\
+ signal: "day"#_pos",default";\
+ source: "elm";\
+ action: STATE_SET "default" 0.0;\
+ target: "day"#_pos;\
+ }\
+ }
+
+group { name: "elm/dayselector/base/default";
+ parts {
+ part {
+ name: "day0";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ visible: 0;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ rel2.relative: 0.0 1.0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ min: 48 32;
+ }
+ }
+ DAYSELECTOR_DAY(1, 0)
+ DAYSELECTOR_DAY(2, 1)
+ DAYSELECTOR_DAY(3, 2)
+ DAYSELECTOR_DAY(4, 3)
+ DAYSELECTOR_DAY(5, 4)
+ DAYSELECTOR_DAY(6, 5)
+ part {
+ name: "clipper";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ rel1.to: "day0";
+ rel2.to: "day6";
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 200 200 200 255;
+ }
+ }
+ part {
+ name: "disabler";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ color: 0 0 0 0;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ }
+ programs {
+ program {
+ name: "disble_dayselector";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "disabler";
+ target: "clipper";
+ }
+ program {
+ name: "enable_dayselector";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "disabler";
+ target: "clipper";
+ }
+ program {
+ name: "day0_visible";
+ signal: "day0,visible";
+ source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "day0";
+ }
+ program {
+ name: "day0_default";
+ signal: "day0,default";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "day0";
+ }
+ }
+}
+
+group { name: "elm/check/base/dayselector/default";
+ images {
+ image: "day_middle_normal.png" COMP;
+ image: "day_left_normal.png" COMP;
+ image: "day_right_normal.png" COMP;
+ image: "day_middle_press.png" COMP;
+ image: "day_left_press.png" COMP;
+ image: "day_right_press.png" COMP;
+ }
+ script {
+ public check_pos; // Left, Right, Middle.
+ public check_type; // Weekday, Weekend.
+ public check_state = DAYSELECOR_DAY_STATE_DEFAULT; // Default, Pressed,
Selected.
+
+ public check_bg_show() {
+ if(get_int(check_pos) == DAYSELECOR_DAY_POS_LEFT) {
+ if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+ set_state(PART:"bg", "default_left", 0.0);
+ else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+ set_state(PART:"bg", "pressed_left", 0.0);
+ else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ set_state(PART:"bg", "selected_left", 0.0);
+ }
+ else if(get_int(check_pos) == DAYSELECOR_DAY_POS_RIGHT) {
+ if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+ set_state(PART:"bg", "default_right", 0.0);
+ else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+ set_state(PART:"bg", "pressed_right", 0.0);
+ else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ set_state(PART:"bg", "selected_right", 0.0);
+ }
+ else if(get_int(check_pos) == DAYSELECOR_DAY_POS_MIDDLE) {
+ if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+ set_state(PART:"bg", "default_middle", 0.0);
+ else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+ set_state(PART:"bg", "pressed_middle", 0.0);
+ else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ set_state(PART:"bg", "selected_middle", 0.0);
+ }
+ }
+ public check_text_show() {
+ if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ set_state(PART:"elm.text", "selected", 0.0);
+ else {
+ if(get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKDAY)
+ set_state(PART:"elm.text", "default", 0.0);
+ else if (get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT)
+ set_state(PART:"elm.text", "weekend_default", 0.0);
+ else if (get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1)
+ set_state(PART:"elm.text", "weekend_style1", 0.0);
+ }
+ }
+ }
+ parts {
+ part {
+ name: "bg";
+ mouse_events: 0;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ }
+ description { state: "default_left" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_left_normal.png";
+ border: 2 1 3 5;
+ }
+ }
+ description { state: "default_right" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_right_normal.png";
+ border: 1 2 3 5;
+ }
+ }
+ description { state: "default_middle" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_middle_normal.png";
+ border: 1 1 2 4;
+ }
+ }
+ description { state: "pressed_left" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_left_press.png";
+ border: 4 0 4 5;
+ }
+ }
+ description { state: "pressed_right" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_right_press.png";
+ border: 1 4 4 5;
+ }
+ }
+ description { state: "pressed_middle" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_middle_press.png";
+ border: 1 0 2 3;
+ }
+ }
+ description { state: "selected_left" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_left_press.png";
+ border: 4 0 4 5;
+ }
+ }
+ description { state: "selected_right" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_right_press.png";
+ border: 1 4 4 5;
+ }
+ }
+ description { state: "selected_middle" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "day_middle_press.png";
+ border: 1 0 2 3;
+ }
+ }
+ }
+ part {
+ name: "left_padding";
+ type: RECT;
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 5 0;
+ visible: 0;
+ fixed: 1 0;
+ align: 0.0 0.5;
+ rel2.relative: 0.0 1.0;
+ }
+ }
+ part {
+ name: "right_padding";
+ type: RECT;
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ visible: 0;
+ min: 5 0;
+ fixed: 1 0;
+ align: 1.0 0.5;
+ rel1.relative: 1.0 0.0;
+ }
+ }
+ part {
+ name: "elm.text";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
+ effect: GLOW;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ to: "left_padding";
+ relative: 1.0 0.0;
+ }
+ rel2 {
+ to: "right_padding";
+ relative: 0.0 1.0;
+ }
+ text {
+ font: FN;
+ size: 10;
+ min: 1 1;
+ }
+ color: 255 255 255 255;
+ color2: 255 255 255 0;
+ color3: 255 255 255 0;
+ }
+ description {
+ state: "weekend_default" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ color2: 51 153 255 24;
+ color3: 51 153 255 18;
+ }
+ description {
+ state: "weekend_style1" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ color2: 51 153 255 24;
+ color3: 51 153 255 18;
+ }
+ description {
+ state: "selected" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ color2: 255 255 255 24;
+ color3: 255 255 255 18;
+ }
+ }
+ part {
+ name: "text2";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
+ effect: SHADOW BOTTOM;
+ description {
+ state: "default" 0.0;
+ rel1 {
+ to: "left_padding";
+ relative: 1.0 0.0;
+ }
+ rel2 {
+ to: "right_padding";
+ relative: 0.0 1.0;
+ }
+ text {
+ font: FN;
+ size: 10;
+ min: 1 1;
+ }
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ }
+ }
+ part {
+ name: "events";
+ type: RECT;
+ ignore_flags: ON_HOLD;
+ description {
+ state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ color: 0 0 0 0;
+ }
+ }
+ }
+ programs {
+ program {
+ name: "check,pressed";
+ signal: "mouse,down,1";
+ source: "events";
+ script {
+ set_int(check_state, DAYSELECOR_DAY_STATE_PRESSED);
+ check_bg_show();
+ }
+ }
+ program {
+ name: "check,toggle";
+ signal: "mouse,up,1";
+ source: "events";
+ action: SIGNAL_EMIT "elm,action,check,toggle" "";
+ }
+ program {
+ name: "check,on";
+ signal: "elm,state,check,on";
+ source: "elm";
+ script {
+ set_int(check_state, DAYSELECOR_DAY_STATE_SELECTED);
+ check_bg_show();
+ check_text_show();
+ }
+ }
+ program {
+ name: "check,off";
+ signal: "elm,state,check,off";
+ source: "elm";
+ script {
+ set_int(check_state, DAYSELECOR_DAY_STATE_DEFAULT);
+ check_bg_show();
+ check_text_show();
+ }
+ }
+ program { name: "check,left";
+ signal: "elm,pos,check,left";
+ source: "elm";
+ script {
+ set_int(check_pos, DAYSELECOR_DAY_POS_LEFT);
+ check_bg_show();
+ }
+ }
+ program { name: "check,right";
+ signal: "elm,pos,check,right";
+ source: "elm";
+ script {
+ set_int(check_pos, DAYSELECOR_DAY_POS_RIGHT);
+ check_bg_show();
+ }
+ }
+ program { name: "check,middle";
+ signal: "elm,pos,check,middle";
+ source: "elm";
+ script {
+ set_int(check_pos, DAYSELECOR_DAY_POS_MIDDLE);
+ check_bg_show();
+ }
+ }
+ program { name: "check,weekday";
+ signal: "elm,type,weekday,default";
+ source: "";
+ script {
+ set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKDAY);
+ check_text_show();
+ }
+ }
+ program { name: "check,weekend,default";
+ signal: "elm,type,weekend,default";
+ source: "";
+ script {
+ set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT);
+ check_text_show();
+ }
+ }
+ program { name: "check,weekend,style1";
+ signal: "elm,type,weekend,style1";
+ source: "";
+ script {
+ set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1);
+ check_text_show();
+ }
+ }
+ }
+}
+
+#undef DAYSELECOR_DAY_POS_LEFT
+#undef DAYSELECOR_DAY_POS_RIGHT
+#undef DAYSELECOR_DAY_POS_MIDDLE
+#undef DAYSELECOR_DAY_TYPE_WEEKDAY
+#undef DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT
+#undef DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1
+#undef DAYSELECOR_DAY_STATE_DEFAULT
+#undef DAYSELECOR_DAY_STATE_PRESSED
+#undef DAYSELECOR_DAY_STATE_SELECTED
+#undef DAYSELECTOR_DAY
diff --git a/edje/img/day_left_normal.png b/edje/img/day_left_normal.png
new file mode 100644
index 0000000..02f7742
Binary files /dev/null and b/edje/img/day_left_normal.png differ
diff --git a/edje/img/day_left_press.png b/edje/img/day_left_press.png
new file mode 100644
index 0000000..c0219ee
Binary files /dev/null and b/edje/img/day_left_press.png differ
diff --git a/edje/img/day_middle_normal.png b/edje/img/day_middle_normal.png
new file mode 100644
index 0000000..3436314
Binary files /dev/null and b/edje/img/day_middle_normal.png differ
diff --git a/edje/img/day_middle_press.png b/edje/img/day_middle_press.png
new file mode 100644
index 0000000..4c40737
Binary files /dev/null and b/edje/img/day_middle_press.png differ
diff --git a/edje/img/day_right_normal.png b/edje/img/day_right_normal.png
new file mode 100644
index 0000000..8434b97
Binary files /dev/null and b/edje/img/day_right_normal.png differ
diff --git a/edje/img/day_right_press.png b/edje/img/day_right_press.png
new file mode 100644
index 0000000..911cfba
Binary files /dev/null and b/edje/img/day_right_press.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
