summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJehun Lim <jehun.lim@samsung.com>2015-09-03 14:34:11 +0900
committerJehun Lim <jehun.lim@samsung.com>2015-09-03 14:46:33 +0900
commit33c1470958670638d0b0c05ac5c3c67d3292e8d1 (patch)
treee665cbda93fd39c0dbe853d394d14a8efd5530db
parent2593f71d1089f11c8c4c437f177654a762d54cd9 (diff)
downloadair_mediahub-33c1470958670638d0b0c05ac5c3c67d3292e8d1.tar.gz
air_mediahub-33c1470958670638d0b0c05ac5c3c67d3292e8d1.tar.bz2
air_mediahub-33c1470958670638d0b0c05ac5c3c67d3292e8d1.zip
action_menu: add unfavorite images
Change-Id: I519d969f8d85ccbd1e402077bbe29cefea3cb601 Signed-off-by: Jehun Lim <jehun.lim@samsung.com>
-rw-r--r--include/view/action_menu.h5
-rw-r--r--res/edc/images/btn_menu_del_sel.pngbin447 -> 0 bytes
-rw-r--r--res/edc/images/btn_menu_favorite_sel.pngbin1051 -> 0 bytes
-rw-r--r--res/edc/images/btn_menu_remote_favorite_dis.pngbin0 -> 711 bytes
-rw-r--r--res/edc/images/btn_menu_remote_favorite_foc.pngbin0 -> 707 bytes
-rw-r--r--res/edc/images/btn_menu_remote_favorite_nor.pngbin0 -> 755 bytes
-rw-r--r--res/edc/widgets/button.edc34
7 files changed, 9 insertions, 30 deletions
diff --git a/include/view/action_menu.h b/include/view/action_menu.h
index ee4b687..f4730d8 100644
--- a/include/view/action_menu.h
+++ b/include/view/action_menu.h
@@ -52,12 +52,13 @@
/* image */
#define IMAGE_ACTION_FAVORITE_NOR "/btn_menu_favorite_nor.png"
#define IMAGE_ACTION_FAVORITE_FOC "/btn_menu_favorite_foc.png"
-#define IMAGE_ACTION_FAVORITE_SEL "/btn_menu_favorite_sel.png"
#define IMAGE_ACTION_FAVORITE_DIS "/btn_menu_favorite_dis.png"
+#define IMAGE_ACTION_UNFAVORITE_NOR "/btn_menu_remote_favorite_nor.png"
+#define IMAGE_ACTION_UNFAVORITE_FOC "/btn_menu_remote_favorite_foc.png"
+#define IMAGE_ACTION_UNFAVORITE_DIS "/btn_menu_remote_favorite_dis.png"
#define IMAGE_ACTION_DELETE_NOR "/btn_menu_del_nor.png"
#define IMAGE_ACTION_DELETE_FOC "/btn_menu_del_foc.png"
-#define IMAGE_ACTION_DELETE_SEL "/btn_menu_del_sel.png"
#define IMAGE_ACTION_DELETE_DIS "/btn_menu_del_dis.png"
#define GRID_ITEM_X_MOVIE 440
diff --git a/res/edc/images/btn_menu_del_sel.png b/res/edc/images/btn_menu_del_sel.png
deleted file mode 100644
index d7660dd..0000000
--- a/res/edc/images/btn_menu_del_sel.png
+++ /dev/null
Binary files differ
diff --git a/res/edc/images/btn_menu_favorite_sel.png b/res/edc/images/btn_menu_favorite_sel.png
deleted file mode 100644
index 3a3131e..0000000
--- a/res/edc/images/btn_menu_favorite_sel.png
+++ /dev/null
Binary files differ
diff --git a/res/edc/images/btn_menu_remote_favorite_dis.png b/res/edc/images/btn_menu_remote_favorite_dis.png
new file mode 100644
index 0000000..c57ad76
--- /dev/null
+++ b/res/edc/images/btn_menu_remote_favorite_dis.png
Binary files differ
diff --git a/res/edc/images/btn_menu_remote_favorite_foc.png b/res/edc/images/btn_menu_remote_favorite_foc.png
new file mode 100644
index 0000000..f5a0925
--- /dev/null
+++ b/res/edc/images/btn_menu_remote_favorite_foc.png
Binary files differ
diff --git a/res/edc/images/btn_menu_remote_favorite_nor.png b/res/edc/images/btn_menu_remote_favorite_nor.png
new file mode 100644
index 0000000..f1f8250
--- /dev/null
+++ b/res/edc/images/btn_menu_remote_favorite_nor.png
Binary files differ
diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc
index c796b32..bc0d876 100644
--- a/res/edc/widgets/button.edc
+++ b/res/edc/widgets/button.edc
@@ -3493,8 +3493,10 @@ group {
images {
image: IMAGE_ACTION_FAVORITE_NOR COMP;
image: IMAGE_ACTION_FAVORITE_FOC COMP;
- image: IMAGE_ACTION_FAVORITE_SEL COMP;
image: IMAGE_ACTION_FAVORITE_DIS COMP;
+ image: IMAGE_ACTION_UNFAVORITE_NOR COMP;
+ image: IMAGE_ACTION_UNFAVORITE_FOC COMP;
+ image: IMAGE_ACTION_UNFAVORITE_DIS COMP;
}
script {
public cur_state;
@@ -3522,10 +3524,6 @@ group {
inherit: "focused" 0.0;
}
description {
- state: "selected" 0.0;
- inherit: "default" 0.0;
- }
- description {
state: "disabled" 0.0;
inherit: "default" 0.0;
}
@@ -3609,7 +3607,7 @@ group {
to: "bg_menu_icon";
relative: 0.5 0.5;
}
- image.normal: IMAGE_ACTION_FAVORITE_NOR;
+ image.normal: IMAGE_ACTION_UNFAVORITE_NOR;
min: 60 60;
align: 0.5 0.5;
fixed: 1 1;
@@ -3617,7 +3615,7 @@ group {
description {
state: "focused" 0.0;
inherit: "default" 0.0;
- image.normal: IMAGE_ACTION_FAVORITE_FOC;
+ image.normal: IMAGE_ACTION_UNFAVORITE_FOC;
}
description {
state: "default_toggle" 0.0;
@@ -3630,14 +3628,9 @@ group {
image.normal: IMAGE_ACTION_FAVORITE_FOC;
}
description {
- state: "selected" 0.0;
- inherit: "default" 0.0;
- image.normal: IMAGE_ACTION_FAVORITE_SEL;
- }
- description {
state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: IMAGE_ACTION_FAVORITE_DIS;
+ image.normal: IMAGE_ACTION_UNFAVORITE_DIS;
}
}
part {
@@ -3817,15 +3810,6 @@ group {
}
}
program {
- name: SIG_ITEM_SELECTED;
- signal: SIG_ITEM_SELECTED;
- source: SIG_SOURCE_SRC;
- action: STATE_SET "selected" 0.0;
- target: "bg";
- target: "menu_icon";
- target: "elm.text";
- }
- program {
name: SIG_ELM_DISABLED;
signal: SIG_ELM_DISABLED;
source: SIG_SOURCE_ELM;
@@ -3843,7 +3827,6 @@ group {
images {
image: IMAGE_ACTION_DELETE_NOR COMP;
image: IMAGE_ACTION_DELETE_FOC COMP;
- image: IMAGE_ACTION_DELETE_SEL COMP;
image: IMAGE_ACTION_DELETE_DIS COMP;
}
parts {
@@ -3869,11 +3852,6 @@ group {
image.normal: IMAGE_ACTION_DELETE_FOC;
}
description {
- state: "selected" 0.0;
- inherit: "default" 0.0;
- image.normal: IMAGE_ACTION_DELETE_SEL;
- }
- description {
state: "disabled" 0.0;
inherit: "default" 0.0;
image.normal: IMAGE_ACTION_DELETE_DIS;