From 8a60baeef80d99eb24f83e33ddd48ded43ee31ff Mon Sep 17 00:00:00 2001
From: hermet <hermet@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Mon, 2 Apr 2012 00:50:57 +0000
Subject: [PATCH] elementary/colorselector - removed unnecesary layout

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69830 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 data/objects/Makefile.am      |   4 +---
 data/objects/colorpreview.edc |  22 ----------------------
 data/objects/grid_bg.png      | Bin 1146 -> 0 bytes
 src/bin/test_colorselector.c  |  13 ++-----------
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 data/objects/colorpreview.edc
 delete mode 100644 data/objects/grid_bg.png

diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am
index 887160a..cbdd478 100644
--- a/data/objects/Makefile.am
+++ b/data/objects/Makefile.am
@@ -9,17 +9,15 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)
 
 filesdir = $(datadir)/elementary/objects
 
-files_DATA = test.edj multip.edj colorpreview.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj
+files_DATA = test.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj
 
 EXTRA_DIST = \
 test.edc \
 multip.edc \
-colorpreview.edc \
 cursors.edc \
 font_preview.edc \
 postit_ent.edc \
 multibuttonentry.edc \
-grid_bg.png \
 over.png \
 under.png \
 sky.jpg \
diff --git a/data/objects/colorpreview.edc b/data/objects/colorpreview.edc
deleted file mode 100644
index 77d1441..0000000
--- a/data/objects/colorpreview.edc
+++ /dev/null
@@ -1,22 +0,0 @@
-images {
-   image: "grid_bg.png" COMP;
-}
-
-collections {
-   group { name: "main";
-      parts {
-         part { name: "Grid";
-            type: IMAGE;
-            description { state: "default" 0;
-               image.normal: "grid_bg.png";
-            }
-         }
-         part { name: "ColorPreview";
-            type: SWALLOW;
-            mouse_events: 0;
-            description { state: "default" 0;
-            }
-         }
-      }
-   }
-}
diff --git a/data/objects/grid_bg.png b/data/objects/grid_bg.png
deleted file mode 100644
index 7141658b45f5812e7c207d5ac335777ccadf918b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgg4E)F3v*$JN9+Zh;`e|fq%hE&{o
zJI6Nfvz36W{z}G6E@fRMkzwB^=cZa}21~Ee+?UnzG2&mGxTp;qi)z;+<D(7r;ucR|
zzs{Z#RI)cN)GJWa_4Fo>Nm*+rZL$Bn|9Vtt_SIeMe*O6qlI^?JwAaw&*oAGmzeBw)
zZp-CAe_SGK?aSZ4qd%N~9IfdpFE77p>#8YAo>9|M+bbA%Zirf~H@!P5``6#USGVO(
zT5|7qoX7iG{R8@*zt68VJ!n5Y|N86F_T%rmSY0dL90}@*%C2_*dhb2MPUXk%|JnU1
z{%Kk_Q(R!Tp514qB*o+&*;n6hH1bU;VgGIol$&OKzI{f7LyZ{s$A?cPHN?xVO#N{F
zY4p7OM;|upbRU!WU-K+pVtvGf@=Uq9KYagV_EoAsU3dC(&>I{1x@oC9U$5afcX!6Y
zjn)t6AK!i>ws5QDZe6j7_s=_b$Mf|c_HX%qZ)@)C2lLN-=lkLx6LCcUvp?IBO0D~k
ztv6nt|5yIc{^z$ZW*L{?y!hzI{m#3kCU2$$eS3TI|JtU9|84JoDtO#IiDR0I@osHB
zJ*Q7H!q%qioc0RLUtRUSsb25?r#X}T=RTU4^5(z}Udvg{G7`JLWUOWay6|XinoY`y
z^otv{|Gry&Ve!MKH$6l2#QyE9IeomZQlo42g_^9X?X!4Jq+hPAI8`0<qyGH%3J$^N
zGt=Fte9T|Je*LSx_HXR_4|Q1l|1qaz_uVg_J~91w*|+xfs?$$DF?6S&{i)(L>00U4
z+qY-e)zw{z+8rHnWN*6P;ypWVzg>21*1h}pAI?9apWNd(&rbjTiObKQNmu^5^T%tR
zojIIWqwGI_cK(x>#h<l-atL0pO>N%3iObKQHUIQw=TCn1Mxc_9XBT^X`eON$)t;e_
z;Zw;Uh9@t7FrK*lk$J-M$LtFJ$N3%R^~pEb$l5bhT9KpRJjjH8pb7Fo6YPK{)Bvsc
z3AExf(2D0kE67&x;4ynczdQrb%pX4(2a-c<(0t+i@t@JU+{^E0arhx%!NB0@>gTe~
HDWM4frr9*~

diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c
index 5aa1f72..14f6884 100644
--- a/src/bin/test_colorselector.c
+++ b/src/bin/test_colorselector.c
@@ -42,8 +42,7 @@ _colorpalette_longpressed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
 void
 test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *cs, *fr, *ly, *re;
-   char buf[PATH_MAX];
+   Evas_Object *win, *bg, *bx, *cs, *fr, *re;
    int r, g, b, a;
 
    win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
@@ -68,17 +67,9 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 
-   ly = elm_layout_add(win);
-   snprintf(buf, sizeof(buf), "%s/objects/colorpreview.edj", elm_app_data_dir_get());
-   elm_layout_file_set(ly, buf, "main");
-   evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_object_content_set(fr, ly);
-   evas_object_show(ly);
-
    re = evas_object_rectangle_add(evas_object_evas_get(win));
    evas_object_show(re);
-   elm_object_part_content_set(ly, "ColorPreview", re);
+   elm_object_content_set(fr, re);
 
    fr = elm_frame_add(win);
    evas_object_size_hint_weight_set(fr, 1.0, 0);
-- 
2.7.4