From b8e248f29c53f85153db3cd54210155bfb530c68 Mon Sep 17 00:00:00 2001
From: Jonathan Atton <jonathan.atton@gmail.com>
Date: Wed, 14 Jul 2010 09:07:43 +0000
Subject: [PATCH] Add a list of "layout" to elm_slideshow. A layout is like a
 "sub-style". For example the content can take all the slideshow widget
 (~fullscreen) or not. I do not have finish to work on it.

SVN revision: 50247
---
 legacy/elementary/data/themes/default.edc    |  35 ++++++++++
 legacy/elementary/data/themes/map_item_1.png | Bin 0 -> 2669 bytes
 legacy/elementary/data/themes/map_item_2.png | Bin 2957 -> 2578 bytes
 legacy/elementary/src/bin/test_slideshow.c   |  29 ++++++--
 legacy/elementary/src/lib/Elementary.h.in    |   3 +
 legacy/elementary/src/lib/elm_slideshow.c    |  68 ++++++++++++++++++-
 6 files changed, 129 insertions(+), 6 deletions(-)
 create mode 100644 legacy/elementary/data/themes/map_item_1.png

diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc
index 38d1a6515d..bdf069a119 100644
--- a/legacy/elementary/data/themes/default.edc
+++ b/legacy/elementary/data/themes/default.edc
@@ -8428,6 +8428,7 @@ collections {
    group { name: "elm/slideshow/base/default";
       data {
          item: transitions "fade black_fade horizontal vertical square";
+         item: layouts "fullscreen not_fullscreen";
       }
       parts {
          part { name: "whole";
@@ -8591,6 +8592,14 @@ collections {
                rel2.to: "image_1_whole";
                color: 255 255 255 255;
             }
+            description {
+               state: "not_fullscreen" 0.0;
+               rel1.relative: 0.1 0.1;
+               rel1.to: "image_1_whole";
+               rel2.relative: 0.9 0.9;
+               rel2.to: "image_1_whole";
+               color: 255 255 255 255;
+            }
          }
          part { name: "elm.swallow.2";
             type: SWALLOW;
@@ -8601,6 +8610,14 @@ collections {
                rel1.to: "image_2_whole";
                rel2.to: "image_2_whole";
             }
+            description {
+               state: "not_fullscreen" 0.0;
+               color: 255 255 255 255;
+               rel1.relative: 0.1 0.1;
+               rel1.to: "image_2_whole";
+               rel2.relative: 0.9 0.9;
+               rel2.to: "image_2_whole";
+            }
          }
          part { name: "events_catcher";
             type: RECT;
@@ -8613,6 +8630,24 @@ collections {
          }
       }
       programs {
+      	//Substyle
+      	program { name: "layout_fullscreen";
+            signal: "layout,fullscreen";
+            source: "slideshow";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.1";
+            target: "elm.swallow.2";
+            transition: SINUSOIDAL 1.0;
+        }
+        program { name: "layout_not_fullscreen";
+            signal: "layout,not_fullscreen";
+            source: "slideshow";
+            action: STATE_SET "not_fullscreen" 0.0;
+            target: "elm.swallow.1";
+            target: "elm.swallow.2";
+            transition: SINUSOIDAL 1.0;
+         } 
+      	 //
          program { name: "fade_next";
             signal: "fade,next";
             source: "slideshow";
diff --git a/legacy/elementary/data/themes/map_item_1.png b/legacy/elementary/data/themes/map_item_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..da9b580c3776a388808cca2229a719fb6360a2b8
GIT binary patch
literal 2669
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
bZ@~WmP+WDwGsb#y00000NkvXXu0mjff-vdX

literal 0
HcmV?d00001

diff --git a/legacy/elementary/data/themes/map_item_2.png b/legacy/elementary/data/themes/map_item_2.png
index baae8f4ed9a0d61a85db73eecd44de0cf006cfe9..f92ebfac5d9f657a0b5a76b53d8345cbcd5800d2 100644
GIT binary patch
delta 2495
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
JPDHLkV1jY-wDtf1

delta 2877
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
ba>D-skGkl#Nb_x^00000NkvXXu0mjfubqO>

diff --git a/legacy/elementary/src/bin/test_slideshow.c b/legacy/elementary/src/bin/test_slideshow.c
index 123feccd5a..21a78f8128 100644
--- a/legacy/elementary/src/bin/test_slideshow.c
+++ b/legacy/elementary/src/bin/test_slideshow.c
@@ -53,6 +53,13 @@ _hv_select(void *data, Evas_Object *obj, void *event_info)
    elm_hoversel_label_set(obj, data);
 }
 
+static void
+_layout_select(void *data, Evas_Object *obj, void *event_info)
+{
+   elm_slideshow_layout_set(slideshow, data);
+   elm_hoversel_label_set(obj, data);
+}
+
 static void
 _start(void *data, Evas_Object *obj, void *event_info)
 {
@@ -80,9 +87,13 @@ _spin(void *data, Evas_Object *obj, void *event_info)
 static Evas_Object *
 _get(void *data, Evas_Object *obj)
 {
-   Evas_Object *photo = elm_photocam_add(obj);
-   elm_photocam_file_set(photo, data);
-   elm_photocam_zoom_mode_set(photo, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT);
+   //Evas_Object *photo = elm_photocam_add(obj);
+   //elm_photocam_file_set(photo, data);
+   //elm_photocam_zoom_mode_set(photo, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT);
+
+   Evas_Object *photo = elm_photo_add(obj);
+   elm_photo_file_set(photo, data);
+
    return photo;
 }
 
@@ -93,7 +104,7 @@ test_slideshow(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *notify, *bx, *bt, *hv, *spin;
    const Eina_List *l;
-   const char *transition;
+   const char *transition, *layout;
 
    win = elm_win_add(NULL, "Slideshow", ELM_WIN_BASIC);
    elm_win_title_set(win, "Slideshow");
@@ -154,6 +165,14 @@ test_slideshow(void *data, Evas_Object *obj, void *event_info)
    elm_hoversel_label_set(hv, eina_list_data_get(elm_slideshow_transitions_get(slideshow)));
    evas_object_show(hv);
 
+   hv = elm_hoversel_add(win);
+   elm_box_pack_end(bx, hv);
+   elm_hoversel_hover_parent_set(hv, win);
+   EINA_LIST_FOREACH(elm_slideshow_layouts_get(slideshow), l, layout)
+       elm_hoversel_item_add(hv, layout, NULL, 0, _layout_select, layout);
+   elm_hoversel_label_set(hv, elm_slideshow_layout_get(slideshow));
+   evas_object_show(hv);
+
    spin = elm_spinner_add(win);
    elm_spinner_label_format_set(spin, "%2.0f secs.");
    evas_object_smart_callback_add(spin, "changed", _spin, spin);
@@ -182,7 +201,7 @@ test_slideshow(void *data, Evas_Object *obj, void *event_info)
    evas_object_event_callback_add(slideshow, EVAS_CALLBACK_MOUSE_UP, _notify_show, notify);
    evas_object_event_callback_add(slideshow, EVAS_CALLBACK_MOUSE_MOVE, _notify_show, notify);
 
-   evas_object_resize(win, 350, 200);
+   evas_object_resize(win, 500, 400);
    evas_object_show(win);
 }
 
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index bfe21d34c9..5d27399950 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -1232,6 +1232,9 @@ extern "C" {
    EAPI void *		elm_slideshow_item_data_get(Elm_Slideshow_Item *item);
    EAPI Elm_Slideshow_Item* elm_slideshow_item_current_get(const Evas_Object *obj);
    EAPI Evas_Object*	elm_slideshow_item_object_get(Elm_Slideshow_Item* item);
+   EAPI const char * 	elm_slideshow_layout_get(const Evas_Object *obj);
+   EAPI void 			elm_slideshow_layout_set(Evas_Object *obj, const char *layout);
+   EAPI const Eina_List *elm_slideshow_layouts_get(const Evas_Object *obj);
 
 
    EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent);
diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c
index b60b4ee480..0e8971ea68 100644
--- a/legacy/elementary/src/lib/elm_slideshow.c
+++ b/legacy/elementary/src/lib/elm_slideshow.c
@@ -49,6 +49,11 @@ struct _Widget_Data
    Ecore_Timer *timer;
    int timeout;
    Eina_Bool loop:1;
+
+   struct {
+	   const char *current;
+	   Eina_List *list; //list of const char *
+   } layout;
 };
 
 static const char *widtype = NULL;
@@ -66,6 +71,7 @@ _del_hook(Evas_Object *obj)
    elm_slideshow_clear(obj);
    _elm_stringlist_free(wd->transitions);
    if (wd->timer) ecore_timer_del(wd->timer);
+   _elm_stringlist_free(wd->layout.list);
    free(wd);
 }
 
@@ -241,6 +247,10 @@ elm_slideshow_add(Evas_Object *parent)
    if (eina_list_count(wd->transitions) > 0)
      wd->transition = eina_stringshare_add(eina_list_data_get(wd->transitions));
 
+   wd->layout.list = _elm_stringlist_get(edje_object_data_get(wd->slideshow, "layouts"));
+      if (eina_list_count(wd->layout.list) > 0)
+        wd->layout.current = eina_stringshare_add(eina_list_data_get(wd->layout.list));
+
    edje_object_signal_callback_add(wd->slideshow, "end", "slideshow", _end, obj);
 
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
@@ -399,7 +409,7 @@ elm_slideshow_previous(Evas_Object *obj)
  * Returns the list of transitions available.
  *
  * @param obj The slideshow object
- * @return Returns the list of transitions (list of char*)
+ * @return Returns the list of transitions (list of const char*)
  *
  * @ingroup Slideshow
  */
@@ -412,6 +422,23 @@ elm_slideshow_transitions_get(const Evas_Object *obj)
    return wd->transitions;
 }
 
+/**
+ * Returns the list of layouts available.
+ *
+ * @param obj The slideshow object
+ * @return Returns the list of layout (list of const char*)
+ *
+ * @ingroup Slideshow
+ */
+const Eina_List *
+elm_slideshow_layouts_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   return wd->layout.list;
+}
+
 /**
  * Set the transition to use
  *
@@ -502,6 +529,44 @@ elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop)
    wd->loop = loop;
 }
 
+/**
+ * Returns the current layout name
+ *
+ * @param obj The slideshow object
+ * @returns Returns the layout name
+ *
+ * @ingroup Slideshow
+ */
+EAPI const char *
+elm_slideshow_layout_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return EINA_FALSE;
+   return wd->layout.current;
+}
+
+/**
+ * Set the layout
+ *
+ * @param obj The slideshow object
+ * @param layout the new layout
+ *
+ * @ingroup Slideshow
+ */
+EAPI void
+elm_slideshow_layout_set(Evas_Object *obj, const char *layout)
+{
+   char buf[PATH_MAX];
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->layout.current = eina_stringshare_add(layout);
+
+   snprintf(buf, sizeof(buf), "layout,%s", wd->layout.current);
+   edje_object_signal_emit(wd->slideshow, buf, "slideshow");
+}
+
 /**
  * Return if the first item should follow the last and vice versa
  *
@@ -649,3 +714,4 @@ elm_slideshow_item_data_get(Elm_Slideshow_Item * item)
    return (void *)item->data;
 }
 
+