From d858890c57d66d0cde749c1ddbd0e13f02463fc8 Mon Sep 17 00:00:00 2001 From: titan Date: Thu, 1 Oct 2009 18:04:55 +0000 Subject: [PATCH] Minor cleanups. SVN revision: 42839 --- data/themes/default/ephoto.edc | 243 +++++++++++---------------------- src/bin/ephoto_flow.c | 6 +- src/bin/ephoto_table.c | 4 +- 3 files changed, 85 insertions(+), 168 deletions(-) diff --git a/data/themes/default/ephoto.edc b/data/themes/default/ephoto.edc index f9a95bd..8b7e50a 100644 --- a/data/themes/default/ephoto.edc +++ b/data/themes/default/ephoto.edc @@ -11,8 +11,7 @@ collections image: "move_left.png" COMP; image: "move_right.png" COMP; image: "thumb_shadow.png" COMP; - image: "left_arrow.png" COMP; - //image: "thumb_shadow_selected.png" COMP; + image: "left_arrow.png" COMP; } group { @@ -84,22 +83,6 @@ collections } parts { - part - { - name: "thumb_area"; - type: RECT; - mouse_events: 1; - description - { - state: "default" 0.0; - visible: 1; - rel1.relative: 0.0 0.0; - rel1.offset: 27 0; - rel2.relative: 1.0 1.0; - rel2.offset: -27 -1; - color: 255 255 255 255; - } - } part { name: "ephoto.text.object"; @@ -124,32 +107,7 @@ collections } part { - name: "ephoto.swallow.content"; - type: SWALLOW; - clip_to: "thumb_area"; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1.to: "thumb_area"; - rel1.relative: 0.0 0.0; - rel1.offset: 0 0; - rel2.to: "thumb_area"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -1; - color: 255 255 255 255; - } - description - { - state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part - { - name: "move_left"; + name: "ephoto.move.left"; type: IMAGE; mouse_events: 1; description @@ -166,7 +124,7 @@ collections } part { - name: "move_right"; + name: "ephoto.move.right"; type: IMAGE; mouse_events: 1; description @@ -182,34 +140,20 @@ collections } } } - programs { - program { - name: "hidden"; - signal: "ephoto.browser.hidden"; - source: "ephoto"; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.6; - target: "ephoto.swallow.content"; - } - program { - name: "visible"; - signal: "ephoto.browser.visible"; - source: "ephoto"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.6; - target: "ephoto.swallow.content"; - } - } } - group { + group + { name: "/ephoto/thumb/shadow"; min: 198 136; - parts { - part { + parts + { + part + { name: "ephoto.swallow.content"; type: SWALLOW; mouse_events: 1; - description { + description + { state: "default" 0.0; min: 1 1; max: 176 117; @@ -218,23 +162,27 @@ collections rel2.relative: 1.0 1.0; color: 255 255 255 255; } - description { + description + { state: "selected" 0.0; inherit: "default" 0.0; color: 255 255 255 255; } - description { + description + { state: "hidden" 0.0; inherit: "default" 0.0; color: 255 255 255 0; visible: 0; } } - part { + part + { name: "background"; type: IMAGE; mouse_events: 1; - description { + description + { state: "default" 0.0; visible: 1; min: 198 136; @@ -246,14 +194,14 @@ collections image.normal: "thumb_shadow.png"; image.border: 12 12 7 13; } - description { + description + { state: "selected" 0.0; inherit: "default" 0.0; color: 255 255 255 255; - //image.normal: "thumb_shadow_selected.png"; - //image.border: 12 12 7 13; } - description { + description + { state: "hidden" 0.0; inherit: "default" 0.0; color: 255 255 255 0; @@ -261,8 +209,10 @@ collections } } } - programs { - program { + programs + { + program + { name: "selected"; signal: "ephoto.thumb.selected"; source: "ephoto"; @@ -270,7 +220,8 @@ collections transition: LINEAR 0.3; target: "background"; } - program { + program + { name: "deselected"; signal: "ephoto.thumb.deselected"; source: "ephoto"; @@ -278,7 +229,8 @@ collections transition: LINEAR 0.3; target: "background"; } - program { + program + { name: "hidden"; signal: "ephoto.thumb.hidden"; source: "ephoto"; @@ -287,7 +239,8 @@ collections target: "background"; target: "ephoto.swallow.content"; } - program { + program + { name: "visible"; signal: "ephoto.thumb.visible"; source: "ephoto"; @@ -298,29 +251,35 @@ collections } } } - group { + group + { name: "/ephoto/thumb/image"; min: 176 117; - parts { - part { + parts + { + part + { name: "clipper"; type: RECT; mouse_events: 0; - description { + description + { state: "default" 0.0; visible: 1; min: 1 1; max: 176 117; color: 255 255 255 255; } - description { + description + { state: "hidden" 0.0; inherit: "default" 0.0; visible: 0; color: 255 255 255 0; } } - part { + part + { name: "ephoto.swallow.content"; type: SWALLOW; mouse_events: 1; @@ -336,14 +295,16 @@ collections rel2.relative: 1.0 1.0; color: 255 255 255 255; } - description { + description + { state: "hidden" 0.0; inherit: "default" 0.0; visible: 0; color: 255 255 255 0; } } - part { + part + { name: "event_area"; type: RECT; mouse_events: 1; @@ -360,51 +321,12 @@ collections } } } - programs { - program { - name: "hidden"; - signal: "ephoto.thumb.hidden"; - source: "ephoto"; - action: STATE_SET "hidden" 0.0; - transition: DECELERATE 0.3; - target: "ephoto.swallow.content"; - target: "clipper"; - } - program { - name: "visible"; - signal: "ephoto.thumb.visible"; - source: "ephoto"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.3; - target: "ephoto.swallow.content"; - target: "clipper"; - } - } } group { name: "/ephoto/flow/view"; parts { - part - { - name: "back"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - visible: 1; - min: 32 32; - max: 32 32; - rel1.relative: 0.0 0.0; - rel1.offset: 50 50; - rel2.relative: 0.0 0.0; - rel2.offset: -1 -1; - color: 255 255 255 255; - image.normal: "left_arrow.png"; - } - } part { name: "image_area"; @@ -425,30 +347,43 @@ collections { name: "ephoto.swallow.content"; type: SWALLOW; - clip_to: "image_area"; mouse_events: 1; - description - { - state: "default" 0.0; - rel1.to: "image_area"; - rel1.relative: 0.5 0.5; - rel1.offset: 0 0; - rel2.to: "image_area"; - rel2.relative: 0.5 0.5; - rel2.offset: 0 0; - color: 255 255 255 255; - } + clip_to: "image_area"; description { - state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - color: 255 255 255 0; + state: "default" 0.0; + visible: 1; + rel1.to: "image_area"; + rel1.relative: 0.5 0.5; + rel1.offset: 0 0; + rel2.to: "image_area"; + rel2.relative: 0.5 0.5; + rel2.offset: 0 0; + color: 255 255 255 255; } } part { - name: "move_left"; + name: "ephoto.move.back"; + type: IMAGE; + mouse_events: 1; + description + { + state: "default" 0.0; + visible: 1; + min: 32 32; + max: 32 32; + rel1.relative: 0.0 0.0; + rel1.offset: 50 50; + rel2.relative: 0.0 0.0; + rel2.offset: -1 -1; + color: 255 255 255 255; + image.normal: "left_arrow.png"; + } + } + part + { + name: "ephoto.move.left"; type: IMAGE; mouse_events: 1; description @@ -465,7 +400,7 @@ collections } part { - name: "move_right"; + name: "ephoto.move.right"; type: IMAGE; mouse_events: 1; description @@ -481,24 +416,6 @@ collections } } } - programs { - program { - name: "hidden"; - signal: "ephoto.browser.hidden"; - source: "ephoto"; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.6; - target: "ephoto.swallow.content"; - } - program { - name: "visible"; - signal: "ephoto.browser.visible"; - source: "ephoto"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.6; - target: "ephoto.swallow.content"; - } - } } } diff --git a/src/bin/ephoto_flow.c b/src/bin/ephoto_flow.c index c01e455..e3e721c 100644 --- a/src/bin/ephoto_flow.c +++ b/src/bin/ephoto_flow.c @@ -158,11 +158,11 @@ static void _flow_smart_add(Evas_Object *obj) edje_object_file_set(sd->obj, PACKAGE_DATA_DIR "/themes/default/ephoto.edj", "/ephoto/flow/view"); evas_object_smart_data_set(obj, sd); - edje_object_signal_callback_add(sd->obj, "mouse,up,1", "move_left", move_left, sd); + edje_object_signal_callback_add(sd->obj, "mouse,up,1", "ephoto.move.left", move_left, sd); - edje_object_signal_callback_add(sd->obj, "mouse,up,1", "move_right", move_right, sd); + edje_object_signal_callback_add(sd->obj, "mouse,up,1", "ephoto.move.right", move_right, sd); - edje_object_signal_callback_add(sd->obj, "mouse,up,1", "back", go_back, sd); + edje_object_signal_callback_add(sd->obj, "mouse,up,1", "ephoto.move.back", go_back, sd); sd->center_image = ephoto_image_add(); edje_object_part_swallow(sd->obj, "ephoto.swallow.content", sd->center_image); diff --git a/src/bin/ephoto_table.c b/src/bin/ephoto_table.c index 0e692c6..fe7938a 100644 --- a/src/bin/ephoto_table.c +++ b/src/bin/ephoto_table.c @@ -625,9 +625,9 @@ static void _table_smart_add(Evas_Object *obj) edje_object_file_set(sd->obj, PACKAGE_DATA_DIR "/themes/default/ephoto.edj", "/ephoto/image/browser"); evas_object_smart_data_set(obj, sd); - edje_object_signal_callback_add(sd->obj, "mouse,up,1", "move_left", move_left, NULL); + edje_object_signal_callback_add(sd->obj, "mouse,up,1", "ephoto.move.left", move_left, NULL); - edje_object_signal_callback_add(sd->obj, "mouse,up,1", "move_right", move_right, NULL); + edje_object_signal_callback_add(sd->obj, "mouse,up,1", "ephoto.move.right", move_right, NULL); img = edje_object_add(em->e); edje_object_file_set(img, PACKAGE_DATA_DIR "/themes/default/ephoto.edj", "/ephoto/thumb/shadow");