From 37e9d6c7570ef359f03fcc5652e311337e241e06 Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Thu, 18 Nov 2010 18:10:21 +0000 Subject: [PATCH] Use default theme for gengrid items. Some of the gengrid items from ephoto were merged into elm default theme. SVN revision: 54696 --- data/themes/default/ephoto.edc | 606 --------------------------------- src/bin/ephoto_thumb_browser.c | 5 +- 2 files changed, 2 insertions(+), 609 deletions(-) diff --git a/data/themes/default/ephoto.edc b/data/themes/default/ephoto.edc index fedefd6..6aa2aa5 100644 --- a/data/themes/default/ephoto.edc +++ b/data/themes/default/ephoto.edc @@ -3,612 +3,6 @@ externals { } collections { - images { - image: "thumb_shadow.png" COMP; - } - - group { name: "elm/gengrid/item/up/ephoto"; - data.item: "labels" "elm.text.label"; - images { - set { name: "up"; - image { - image: "up-128.png" COMP; - size: 1 1 128 128; - } - image { - image: "up-256.png" COMP; - size: 129 129 256 256; - } - image { - image: "up-512.png" COMP; - size: 257 257 512 512; - } - } - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - } - - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - - part { name: "bg"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { normal: "bt_sm_base1.png"; - border: 6 6 6 6; - } - image.middle: SOLID; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { name: "img"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - image.normal: "up"; - rel2 { to_y: "elm.text.label"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - - part { name: "elm.text.label"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - color: 0 0 0 255; - color3: 0 0 0 0; - align: 0.5 1.0; - rel1 { relative: 0.0 1.0; - offset: 20 -25; - } - rel2 { relative: 1.0 1.0; - offset: -21 -3; - } - text { font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 224 224 224 255; - color3: 0 0 0 64; - } - } - - part { name: "fg1"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { relative: 1.0 0.5; - offset: 2 -1; - } - image { normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { name: "fg2"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - programs { - program { - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text.label"; - } - program { - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text.label"; - transition: LINEAR 0.1; - } - } - } - } - - group { name: "elm/gengrid/item/file/ephoto"; - data { - item: "icons" "elm.swallow.icon"; - item: "labels" "elm.text.label"; - } - images { - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - } - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - - part { name: "bg"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { normal: "bt_sm_base1.png"; - border: 6 6 6 6; - } - image.middle: SOLID; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { name: "border-shadow"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { to: "elm.swallow.icon"; - offset: -18 -18; - } - rel2 { to_x: "elm.swallow.icon"; - to_y: "elm.text.label"; - offset: 17 17; - } - image { normal: "thumb_shadow.png"; - border: 17 17 17 17; - middle: NONE; - } - } - } - - part { name: "border"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { to: "border-shadow"; - offset: 16 16; - } - rel2 { to: "border-shadow"; - offset: -15 -15; - } - } - } - - part { name: "elm.swallow.icon"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - rel1.offset: 0 8; - rel2 { to_y: "elm.text.label"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - - part { name: "elm.text.label"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - color: 0 0 0 255; - color3: 0 0 0 0; - align: 0.5 1.0; - rel1 { relative: 0.0 1.0; - offset: 20 -30; - } - rel2 { relative: 1.0 1.0; - offset: -21 -15; - } - text { font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - } - } - } - - part { name: "fg1"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { relative: 1.0 0.5; - offset: 2 -1; - } - image { normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { name: "fg2"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - programs { - program { - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - } - program { - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - transition: LINEAR 0.1; - } - } - } - } - - group { name: "elm/gengrid/item/dir/ephoto"; - data { - item: "icons" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3 elm.swallow.icon.4"; - item: "labels" "elm.text.label"; - item: "states" "have_files"; - } - images { - set { name: "directory"; - image { - image: "directory-128.png" COMP; - size: 1 1 128 128; - } - image { - image: "directory-256.png" COMP; - size: 129 129 256 256; - } - image { - image: "directory-512.png" COMP; - size: 257 257 512 512; - } - } - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - } - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - - part { name: "bg"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { normal: "bt_sm_base1.png"; - border: 6 6 6 6; - } - image.middle: SOLID; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { name: "img"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - image.normal: "directory"; - rel2 { to_y: "elm.text.label"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - - part { name: "have-files-clipper"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } - - part { name: "icon_box_margin"; - type: RECT; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { - state: "default" 0.0; - color: 0 0 0 255; - rel1 { to: "icon_box"; - offset: -1 -1; - } - rel2 { to: "icon_box"; - offset: 0 0; - } - } - } - - part { name: "icon_box"; - type: RECT; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { - state: "default" 0.0; - color: 255 255 255 255; - align: 1.0 1.0; - min: 32 32; - rel1 { - relative: 0.25 0.25; - offset: 0 0; - } - rel2 { - relative: 1.0 0.0; - offset: -11 -4; - to_y: "elm.text.label"; - } - } - } - - part { name: "elm.swallow.icon.1"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - to: "icon_box"; - } - rel2 { - relative: 0.5 0.5; - offset: -1 -1; - to: "icon_box"; - } - } - } - - part { name: "elm.swallow.icon.2"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.0; - to: "icon_box"; - } - rel2 { - relative: 1.0 0.5; - offset: -1 -1; - to: "icon_box"; - } - } - } - - part { name: "elm.swallow.icon.3"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.5; - to: "icon_box"; - } - rel2 { - relative: 0.5 1.0; - offset: -1 -1; - to: "icon_box"; - } - } - } - - part { name: "elm.swallow.icon.4"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.5; - to: "icon_box"; - } - rel2 { - relative: 1.0 1.0; - offset: -1 -1; - to: "icon_box"; - } - } - } - - part { name: "elm.text.label"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - color: 0 0 0 255; - color3: 0 0 0 0; - align: 0.5 1.0; - rel1 { relative: 0.0 1.0; - offset: 20 -30; - } - rel2 { relative: 1.0 1.0; - offset: -21 -15; - } - text { font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - } - } - } - - part { name: "fg1"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { relative: 1.0 0.5; - offset: 2 -1; - } - image { normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { name: "fg2"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - programs { - program { - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - } - program { - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - transition: LINEAR 0.1; - } - - program { - signal: "elm,state,have_files,active"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "have-files-clipper"; - } - } - } - } - group { name: "elm/layout/ephoto/orient"; parts { part { name: "elm.swallow.content"; diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index 1ea3003..457807a 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -127,7 +127,7 @@ _ephoto_thumb_item_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) } static const Elm_Gengrid_Item_Class _ephoto_thumb_dir_class = { - "dir", + "album-preview", { _ephoto_thumb_item_label_get, _ephoto_thumb_dir_icon_get, @@ -147,7 +147,7 @@ static const Elm_Gengrid_Item_Class _ephoto_thumb_up_class = { }; static const Elm_Gengrid_Item_Class _ephoto_thumb_file_class = { - "file", + "thumb", { _ephoto_thumb_item_label_get, _ephoto_thumb_file_icon_get, @@ -563,7 +563,6 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_size_hint_weight_set (tb->grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tb->grid, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_style_set(tb->grid, "ephoto"); elm_gengrid_align_set(tb->grid, 0.5, 0.5); elm_gengrid_bounce_set(tb->grid, EINA_FALSE, EINA_TRUE);