add texthistory background image

diff --git a/data/themes/cbhmdrawer.edc b/data/themes/cbhmdrawer.edc
index f8d446e..cde7d67 100644 (file)
--- a/data/themes/cbhmdrawer.edc
+++ b/data/themes/cbhmdrawer.edc
@@ -59,7 +59,7 @@ collections
                        part
                        {
                                // width: 35, height: 335
-                               name: "cbhmdrawer/closebtn_bg";
+                               name: "closebutton/bg";
                                type: IMAGE;
                                scale: 1;
                                ignore_flags: ON_HOLD;
@@ -80,7 +80,7 @@ collections
                        part
                        {
                                // width: 35, height: 335
-                               name: "cbhmdrawer/closebtn_arrow";
+                               name: "closebutton/arrow";
                                type: IMAGE;
                                scale: 1;
                                ignore_flags: ON_HOLD;
@@ -88,8 +88,8 @@ collections
                                description
                                {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "cbhmdrawer/closebtn_bg"; }
-                                       rel2 { relative: 1.0 1.0; to: "cbhmdrawer/closebtn_bg"; }
+                                       rel1 { relative: 0.0 0.0; to: "closebutton/bg"; }
+                                       rel2 { relative: 1.0 1.0; to: "closebutton/bg"; }
                                        align: 0.5 0.5;
                                        min: 35 39;
                                        max: 35 39;
@@ -103,8 +103,8 @@ collections
                        part 
                        {
                                // width: 436, height: 155
-                               name: "cbhmdrawer/imglist";
-                               type: SWALLOW;
+                               name: "imagehistory/bg";
+                               type: RECT;
                                scale: 1;
                                mouse_events: 1;
                                description
@@ -112,20 +112,55 @@ collections
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0916666666 0.0537313432; to: background; }
                                        rel2 { relative: 1.0 0.3641791044; to: background; }
+                                       color: 0 0 0 0;
+                               }
+                       }
+                       part 
+                       {
+                               // width: 436, height: 155
+                               name: "imagehistory/list";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               description
+                               {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0 0.0; to: "imagehistory/bg"; }
+                                       rel2 { relative: 1.0 1.0; to: "imagehistory/bg"; }
+                               }
+                       }
+
+                       part 
+                       {
+                               // width: 427, height: 180
+                               name: "texthistory/bg";
+                               type: IMAGE;
+                               scale: 1;
+                               mouse_events: 1;
+                               description
+                               {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0916666666 0.4626865672; to: "background"; }
+                                       rel2 { relative: 0.98125 1.0; to: "background"; }
+                                       image 
+                                       {
+                                               normal: "clipboard_panel_list_bg.png";
+                                               border: 15 15 30 0;
+                                       }
                                }
                        }
                        part 
                        {
                                // width: 427, height: 180
-                               name: "cbhmdrawer/txtlist";
+                               name: "texthistory/list";
                                type: SWALLOW;
                                scale: 1;
                                mouse_events: 1;
                                description
                                {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0916666666 0.4626865672; to: background; }
-                                       rel2 { relative: 0.98125 1.0; to: background; }
+                                       rel1 { relative: 0.005 0.006; to: "texthistory/bg"; }
+                                       rel2 { relative: 0.995 1.0; to: "texthistory/bg"; }
                                }
                        }
                } // parts
@@ -133,9 +168,16 @@ collections
                {
                                program 
                                {
-                                               name:   "mouse_up";
+                                               name:   "mouse_up_closebtn_bg";
+                                               signal: "mouse,up,1";
+                                               source: "closebutton/bg";
+                                               action: SIGNAL_EMIT "elm,action,click" "";
+                               }
+                               program 
+                               {
+                                               name:   "mouse_up_closebtn_arrow";
                                                signal: "mouse,up,1";
-                                               source: "cbhmdrawer/closebtn_bg";
+                                               source: "closebutton/arrow";
                                                action: SIGNAL_EMIT "elm,action,click" "";
                                }
                } //programs

diff --git a/src/clipdrawer.c b/src/clipdrawer.c
index 53c39c2..123032b 100644 (file)
--- a/src/clipdrawer.c
+++ b/src/clipdrawer.c
@@ -154,7 +154,8 @@ clipdrawer_ly_clicked(void *data, Evas_Object *obj, const char *emission, const
 {
        struct appdata *ad = data;
 
-       if (!strncmp(source, "cbhmdrawer/closebtn_", 20))
+       #define EDJE_CLOSE_PART_PREFIX "closebutton/"
+       if (!strncmp(source, EDJE_CLOSE_PART_PREFIX, strlen(EDJE_CLOSE_PART_PREFIX)))
        {
                clipdrawer_lower_view(ad);
        }
@@ -174,7 +175,7 @@ int clipdrawer_init(void *data)
 
        ad->imggrid = NULL;
        ad->imggrid = elm_gengrid_add(ad->win_main);
-       elm_layout_content_set(ad->ly_main, "cbhmdrawer/imglist", ad->imggrid);
+       elm_layout_content_set(ad->ly_main, "imagehistory/list", ad->imggrid);
        elm_gengrid_item_size_set(ad->imggrid, 100, 100+3);
        elm_gengrid_align_set(ad->imggrid, 0.5, 0.0);
        elm_gengrid_horizontal_set(ad->imggrid, EINA_TRUE);
@@ -205,7 +206,7 @@ int clipdrawer_init(void *data)
        evas_object_show (ad->imggrid);
 
        ad->txtlist = elm_list_add(ad->win_main);
-       elm_layout_content_set(ad->ly_main, "cbhmdrawer/txtlist", ad->txtlist);
+       elm_layout_content_set(ad->ly_main, "texthistory/list", ad->txtlist);
        elm_list_horizontal_mode_set(ad->txtlist, ELM_LIST_COMPRESS);
        evas_object_smart_callback_add(ad->txtlist, "selected", _list_click, ad);
        elm_list_item_append(ad->txtlist, "default", NULL, NULL, NULL, ad);