X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_photo.c;h=5346b2e3197f9d8cd2cdefc7150827735eb5435c;hb=HEAD;hp=2f543664f7568fa097e9b1987b09d584eca4978d;hpb=ff9656b3c88f5b108e3fe38bb5fd72622b6bb178;p=framework%2Fuifw%2Felementary.git

diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c
index 2f54366..5346b2e 100644
--- a/src/bin/test_photo.c
+++ b/src/bin/test_photo.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 static void drop_cb(void *mydata, Evas_Object *obj, void *evdata);
@@ -11,30 +11,26 @@ static void drag_start_cb(void *mydata, Evas_Object *obj, void *evdata);
 void
 test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *sc, *tb, *ph;
+   Evas_Object *win, *sc, *tb, *ph;
    int i, j, n;
    char buf[PATH_MAX];
    const char *img[9] =
      {
         "panel_01.jpg",
-          "mystrale.jpg",
-          "mystrale_2.jpg",
-          "rock_02.jpg",
-          "sky_01.jpg",
-          "sky_02.jpg",
-          "sky_03.jpg",
-          "sky_04.jpg",
-          "wood_01.jpg"
+        "mystrale.jpg",
+        "mystrale_2.jpg",
+        "rock_02.jpg",
+        "sky_01.jpg",
+        "sky_02.jpg",
+        "sky_03.jpg",
+        "sky_04.jpg",
+        "wood_01.jpg"
      };
 
-   win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Photo");
-   elm_win_autodel_set(win, 1);
+   elm_need_ethumb();
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
+   win = elm_win_util_standard_add("photo", "Photo");
+   elm_win_autodel_set(win, EINA_TRUE);
 
    tb = elm_table_add(win);
    evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -46,27 +42,32 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
           {
              ph = elm_photo_add(win);
              snprintf(buf, sizeof(buf), "%s/images/%s",
-                      PACKAGE_DATA_DIR, img[n]);
+                      elm_app_data_dir_get(), img[n]);
              n++;
              if (n >= 9) n = 0;
+             elm_photo_aspect_fixed_set(ph, EINA_FALSE);
              elm_photo_size_set(ph, 80);
-             elm_photo_file_set(ph, buf);
-	     elm_photo_editable_set(ph, 1);
+             if (n == 8)
+               elm_photo_thumb_set(ph, buf, NULL);
+             else
+               elm_photo_file_set(ph, buf);
+             elm_photo_editable_set(ph, EINA_TRUE);
              evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND,
                                               EVAS_HINT_EXPAND);
              evas_object_size_hint_align_set(ph, EVAS_HINT_FILL,
                                              EVAS_HINT_FILL);
-	     evas_object_smart_callback_add(ph, "drop",
+             evas_object_smart_callback_add(ph, "drop",
                                             drop_cb, NULL);
              evas_object_smart_callback_add(ph, "drag,start",
                                             drag_start_cb, NULL);
              evas_object_smart_callback_add(ph, "drag,stop",
                                             drag_stop_cb, NULL);
 
-             if((n == 2) || (n == 3)) {
-            	 elm_photo_fill_inside_set(ph, EINA_TRUE);
-            	 elm_object_style_set(ph, "shadow");
-             }
+             if ((n == 2) || (n == 3))
+               {
+                  elm_photo_fill_inside_set(ph, EINA_TRUE);
+                  elm_object_style_set(ph, "shadow");
+               }
              elm_table_pack(tb, ph, i, j, 1, 1);
              evas_object_show(ph);
           }
@@ -76,7 +77,7 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, sc);
 
-   elm_scroller_content_set(sc, tb);
+   elm_object_content_set(sc, tb);
    evas_object_show(tb);
    evas_object_show(sc);
 
@@ -86,17 +87,20 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
 /* Never called, elm_photo never call "drop" smart cb */
 static void
-drop_cb(void *mydata __UNUSED__, Evas_Object *obj, void *evdata __UNUSED__){
+drop_cb(void *mydata __UNUSED__, Evas_Object *obj, void *evdata __UNUSED__)
+{
    printf("Drop on obj %p\n", obj);
 }
 
 static void
-drag_start_cb(void *mydata __UNUSED__, Evas_Object *obj __UNUSED__, void *evdata __UNUSED__){
+drag_start_cb(void *mydata __UNUSED__, Evas_Object *obj __UNUSED__, void *evdata __UNUSED__)
+{
 
 }
 
 static void
-drag_stop_cb(void *mydata __UNUSED__, Evas_Object *obj __UNUSED__, void *evdata __UNUSED__){
+drag_stop_cb(void *mydata __UNUSED__, Evas_Object *obj __UNUSED__, void *evdata __UNUSED__)
+{
 
 }