Elementary: Adding screenshots to widget groups.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61509 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4e7b264..a20708b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,22 +31,37 @@ endif
 noinst_PROGRAMS = \
 widget_preview_button1 \
 widget_preview_button2 \
-widget_preview_button3
+widget_preview_button3 \
+widget_preview_check1 \
+widget_preview_check2 \
+widget_preview_check3 \
+widget_preview_bubble1 \
+widget_preview_bubble2 \
+widget_preview_bubble3 \
+widget_preview_fileselector_button1 \
+widget_preview_fileselector_button2 \
+widget_preview_fileselector_button3 \
+widget_preview_colorselector
 
-widget_preview_button1_SOURCES = widget_preview_button1.c
-widget_preview_button1_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
-widget_preview_button2_SOURCES = widget_preview_button2.c
-widget_preview_button2_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
-widget_preview_button3_SOURCES = widget_preview_button3.c
-widget_preview_button3_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
+LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
 
 doc-clean:
        rm -rf img/widget html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
 doc: all doc-clean
-       $(top_srcdir)/doc/shot.sh ./img/widget/button preview-00.png $(top_builddir)/doc/widget_preview_button1 160 50
-       $(top_srcdir)/doc/shot.sh ./img/widget/button preview-01.png $(top_builddir)/doc/widget_preview_button2 160 50
-       $(top_srcdir)/doc/shot.sh ./img/widget/button preview-02.png $(top_builddir)/doc/widget_preview_button3 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/button preview-00.png $(top_builddir)/doc/widget_preview_button1 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/button preview-01.png $(top_builddir)/doc/widget_preview_button2 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/button preview-02.png $(top_builddir)/doc/widget_preview_button3 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/fileselector_button preview-00.png $(top_builddir)/doc/widget_preview_fileselector_button1 200 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/fileselector_button preview-01.png $(top_builddir)/doc/widget_preview_fileselector_button2 200 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/fileselector_button preview-02.png $(top_builddir)/doc/widget_preview_fileselector_button3 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/check preview-00.png $(top_builddir)/doc/widget_preview_check1 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/check preview-01.png $(top_builddir)/doc/widget_preview_check2 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/check preview-02.png $(top_builddir)/doc/widget_preview_check3 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/bubble preview-00.png $(top_builddir)/doc/widget_preview_bubble1 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/bubble preview-01.png $(top_builddir)/doc/widget_preview_bubble2 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/bubble preview-02.png $(top_builddir)/doc/widget_preview_bubble3 160 50
+       $(top_srcdir)/doc/shot.sh $(top_builddir)/doc/html/img/widget/colorselector preview-00.png $(top_builddir)/doc/widget_preview_colorselector 160 200
        $(efl_doxygen)
        cp -r $(srcdir)/img/* html/
        cp -r $(srcdir)/img/* latex/

diff --git a/doc/widget_preview_bubble1.c b/doc/widget_preview_bubble1.c
new file mode 100644 (file)
index 0000000..cf7232f
--- /dev/null
+++ b/doc/widget_preview_bubble1.c
@@ -0,0 +1,10 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_bubble_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "Bubble");
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_bubble2.c b/doc/widget_preview_bubble2.c
new file mode 100644 (file)
index 0000000..03748d9
--- /dev/null
+++ b/doc/widget_preview_bubble2.c
@@ -0,0 +1,15 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_bubble_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "Bubble");
+
+Evas_Object *o2 = elm_icon_add(win);
+elm_icon_standard_set(o2, "home");
+elm_bubble_icon_set(o, o2);
+evas_object_show(o2);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_bubble3.c b/doc/widget_preview_bubble3.c
new file mode 100644 (file)
index 0000000..9b390f3
--- /dev/null
+++ b/doc/widget_preview_bubble3.c
@@ -0,0 +1,13 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_bubble_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+Evas_Object *o2 = elm_icon_add(win);
+elm_icon_standard_set(o2, "home");
+elm_bubble_icon_set(o, o2);
+evas_object_show(o2);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_button2.c b/doc/widget_preview_button2.c
index cc15394..d19c094 100644 (file)
--- a/doc/widget_preview_button2.c
+++ b/doc/widget_preview_button2.c
@@ -8,7 +8,7 @@ evas_object_show(o);
 elm_object_text_set(o, "Button");
 
 Evas_Object *o2 = elm_icon_add(win);
-elm_icon_file_set(o2, "img/elementary.png", NULL);
+elm_icon_standard_set(o2, "home");
 elm_button_icon_set(o, o2);
 evas_object_show(o2);
 

diff --git a/doc/widget_preview_button3.c b/doc/widget_preview_button3.c
index 743c0d3..3e1f9d6 100644 (file)
--- a/doc/widget_preview_button3.c
+++ b/doc/widget_preview_button3.c
@@ -6,7 +6,7 @@ elm_win_resize_object_add(win, o);
 evas_object_show(o);
 
 Evas_Object *o2 = elm_icon_add(win);
-elm_icon_file_set(o2, "img/elementary.png", NULL);
+elm_icon_standard_set(o2, "home");
 elm_button_icon_set(o, o2);
 evas_object_show(o2);
 

diff --git a/doc/widget_preview_check1.c b/doc/widget_preview_check1.c
new file mode 100644 (file)
index 0000000..be3f69b
--- /dev/null
+++ b/doc/widget_preview_check1.c
@@ -0,0 +1,10 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_check_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "Check");
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_check2.c b/doc/widget_preview_check2.c
new file mode 100644 (file)
index 0000000..84e4c66
--- /dev/null
+++ b/doc/widget_preview_check2.c
@@ -0,0 +1,15 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_check_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "Check");
+
+Evas_Object *o2 = elm_icon_add(win);
+elm_icon_standard_set(o2, "home");
+elm_check_icon_set(o, o2);
+evas_object_show(o2);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_check3.c b/doc/widget_preview_check3.c
new file mode 100644 (file)
index 0000000..b027770
--- /dev/null
+++ b/doc/widget_preview_check3.c
@@ -0,0 +1,13 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_check_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+Evas_Object *o2 = elm_icon_add(win);
+elm_icon_standard_set(o2, "home");
+elm_check_icon_set(o, o2);
+evas_object_show(o2);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_colorselector.c b/doc/widget_preview_colorselector.c
new file mode 100644 (file)
index 0000000..f737039
--- /dev/null
+++ b/doc/widget_preview_colorselector.c
@@ -0,0 +1,8 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_colorselector_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_fileselector_button1.c b/doc/widget_preview_fileselector_button1.c
new file mode 100644 (file)
index 0000000..1c65b85
--- /dev/null
+++ b/doc/widget_preview_fileselector_button1.c
@@ -0,0 +1,10 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_fileselector_button_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "FS Button");
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_fileselector_button2.c b/doc/widget_preview_fileselector_button2.c
new file mode 100644 (file)
index 0000000..2952576
--- /dev/null
+++ b/doc/widget_preview_fileselector_button2.c
@@ -0,0 +1,15 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_fileselector_button_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+elm_object_text_set(o, "FS Button");
+
+Evas_Object *o2 = elm_icon_add(win);
+elm_icon_standard_set(o2, "home");
+elm_fileselector_button_icon_set(o, o2);
+evas_object_show(o2);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/doc/widget_preview_fileselector_button3.c b/doc/widget_preview_fileselector_button3.c
new file mode 100644 (file)
index 0000000..fad9dd7
--- /dev/null
+++ b/doc/widget_preview_fileselector_button3.c
@@ -0,0 +1,13 @@
+#include "widget_preview_tmpl_head.c"
+
+Evas_Object *o = elm_fileselector_button_add(win);
+evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+elm_win_resize_object_add(win, o);
+evas_object_show(o);
+
+Evas_Object *o2 = elm_icon_add(win);
+elm_icon_standard_set(o2, "home");
+elm_fileselector_button_icon_set(o, o2);
+evas_object_show(o2);
+
+#include "widget_preview_tmpl_foot.c"

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 2ef3bdb..7ab5788 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -3023,9 +3023,9 @@ extern "C" {
    /**
     * @defgroup Button Button
     *
-    * @image html  widget/button/preview-00.png
-    * @image html  widget/button/preview-01.png
-    * @image html  widget/button/preview-02.png
+    * @image html img/widget/button/preview-00.png
+    * @image html img/widget/button/preview-01.png
+    * @image html img/widget/button/preview-02.png
     *
     * This is a push-button. Press it and run some function. It can contain
     * a simple label and icon object and it also has an autorepeat feature.
@@ -3193,6 +3193,10 @@ extern "C" {
    /**
     * @defgroup File_Selector_Button File Selector Button
     *
+    * @image html img/widget/fileselector_button/preview-00.png
+    * @image html img/widget/fileselector_button/preview-01.png
+    * @image html img/widget/fileselector_button/preview-02.png
+    *
     * This is a button that, when clicked, creates an Elementary
     * window (or inner window) <b> with a @ref Fileselector "file
     * selector widget" within</b>. When a file is chosen, the (inner)
@@ -5683,6 +5687,10 @@ extern "C" {
    /**
     * @defgroup Bubble Bubble
     *
+    * @image html img/widget/bubble/preview-00.png
+    * @image html img/widget/bubble/preview-01.png
+    * @image html img/widget/bubble/preview-02.png
+    *
     * @brief The Bubble is a widget to show text similarly to how speech is
     * represented in comics.
     *
@@ -7067,6 +7075,10 @@ extern "C" {
    /**
     * @defgroup Check Check
     *
+    * @image html img/widget/button/preview-00.png
+    * @image html img/widget/button/preview-01.png
+    * @image html img/widget/button/preview-02.png
+    *
     * @brief The check widget allows for toggling a value between true and
     * false.
     *
@@ -10220,6 +10232,8 @@ extern "C" {
     *
     * @{
     *
+    * @image html img/widget/colorselector/preview-00.png
+    *
     * @brief Widget for user to select a color.
     *
     * Signals that you can add callbacks for are: