From: gastal Date: Wed, 21 Mar 2012 17:57:34 +0000 (+0000) Subject: Fix bugs in Elementary examples and documentation. X-Git-Tag: sbs/armel/slp2-target~36^2~177 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95285eb62b725b17e396352056f0b5f2c0280742;p=framework%2Fuifw%2Felementary.git Fix bugs in Elementary examples and documentation. Patch by: Joao Paulo Fernandes Ventura git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69544 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/doc/examples.dox b/doc/examples.dox index 05ccc83..04ac729 100644 --- a/doc/examples.dox +++ b/doc/examples.dox @@ -53,6 +53,8 @@ * * @ref diskselector_example_02 * + * @ref entry_example + * * @ref list_example_01 * * @ref list_example_02 @@ -81,8 +83,6 @@ * * @ref gengrid_example * - * @ref glview_example_01_page - * * @ref genlist_example_01 * * @ref genlist_example_02 @@ -93,6 +93,8 @@ * * @ref genlist_example_05 * + * @ref glview_example_01_page + * * @ref thumb_example_01 * * @ref progressbar_example @@ -2235,13 +2237,13 @@ * is enough to call elm_diskselector_display_item_num_set(), as you can * see here: * @skipline elm_diskselector_add - * @until evas_object_show + * @until elm_diskselector_display_item_num_set * * @note You can't set less than 3 items to be displayed. * * You can get the number of items in the diskselector by calling * elm_diskselector_display_item_num_get(), as you can see here: - * @skipline elm_diskselector_add + * @skipline elm_diskselector_display_item_num_get * * Finally, if a bounce effect is required, or you would like to see * scrollbars, it is possible. But, for default theme, diskselector @@ -2343,8 +2345,7 @@ * * Deleting an item: * @dontinclude diskselector_example_02.c - * @skip _del_cb - * @skipline _del_cb + * @skipline _del_cb(void * @until } * * To delete an item we simple need to call elm_object_item_del() with @@ -2894,7 +2895,8 @@ * events occur, and they will just print something to @c stdout: * @dontinclude flipselector_example.c * @skip underflow callback - * @until static void + * @until } + * @until } * Flip the sheets on the widget while looking at the items list, in * the source code, and you'll get the idea of those events. * @@ -2906,7 +2908,8 @@ * * @dontinclude flipselector_example.c * @skip unselect the item - * @until underflow + * @until } + * @until } * * Click on them to exercise those flip selector API calls. To * interact with the other parts of this API, there's a command line @@ -4145,66 +4148,6 @@ */ /** - * @page tutorial_toggle Toggle example - * @dontinclude toggle_example_01.c - * - * In this example we'll create 2 toggle widgets. The first will have an icon - * and the state names will be the default "on"/"off", it will also change the - * value of a variable directly. The second won't have a icon, the state names - * will be "Enabled"/"Disabled", it will start "Enabled" and it won't set the - * value of a variable. - * - * We start with the usual includes and prototype for callback which will be - * implemented and detailed later on: - * @until _cb2 - * - * We then declare a static global variable(the one whose value will be changed - * by the first toggle): - * @until static - * - * We now have to create our window and all that usual stuff: - * @until show(bx) - * - * The creation of a toggle is no more complicated than that of any other - * widget: - * @until add - * - * For our first toggle we don't set the states labels so they will stay the - * default, however we do set a label for the toggle, an icon and the variable - * whose value it should change: - * @until show - * - * We also set the callback that will be called when the check value changes: - * @until smart_callback - * - * For our second toggle it important to note that we set the states labels, - * don't set an icon or variable, but set the initial state to - * EINA_TRUE("Enabled"): - * @until show - * - * For the second toggle we will use a different callback: - * @until smart_callback - * - * We then ask the main loop to start: - * @until ELM_MAIN - * - * The callback for our first toggle will look the value of @p val and print it: - * @until } - * - * For our second callback we need to do a little bit more, since the second - * toggle doesn't change the value of a variable we have to ask it what its - * state is: - * @until } - * - * This example will look like this: - * - * @image html screenshots/toggle_example_01.png - * @image latex screenshots/toggle_example_01.eps width=\textwidth - * - * @example toggle_example_01.c - */ - -/** * @page tutorial_panel Panel example * @dontinclude panel_example_01.c * @@ -4490,7 +4433,7 @@ * @example gengrid_example.c */ /** - * @page entry_example_01 Entry - Example of simple editing + * @page entry_example Entry - Example of simple editing * * As a general overview of @ref Entry we are going to write an, albeit simple, * functional editor. Although intended to show how elm_entry works, this @@ -4580,7 +4523,7 @@ * and the entry itself doesn't, yet, support all the needed capabilities to * make this simpler. We begin by getting the format we are using in our * function from the button pressed. - * @skip aid->naviframe = naviframe; + * @skip _format_change_cb(void *data, Evas_Object *obj, void *event __UNUSED__) * @until sizeof(fmt_close) * * Next we need to find out if we need to insert an opening or a closing tag. @@ -5729,14 +5672,17 @@ * the photocam to go in to a zoom mode that makes the image fit inside the * photocam. Tough this has no effect on the image we also print what region was * being viewed before setting the zoom mode: + * @skip static * @until } * @note When in fit mode our slider(explained below) won't work. * * The second button("Unfit") will bring the photocam back into manual zoom * mode: + * @skip static * @until } * * Our slider controls the level of zoom of the photocam: + * @skip static * @until } * @note It is important to note that this only works when in manual zoom mode. * @@ -6151,6 +6097,7 @@ * new window, so we have to handle them by setting a callback function that * will ultimately call this very same function to add a new tab. * + * @skip td->tab = NULL * @skip Tab_Data * @until } * diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 3687d99..b4265c8 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -35,6 +35,7 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) SRCS = \ actionslider_example_01.c \ bubble_example_01.c \ + button_example_00.c \ button_example_01.c \ check_example_01.c \ colorselector_example_01.c \ @@ -148,6 +149,7 @@ clean-local: examples_PROGRAMS += \ actionslider_example_01 \ bubble_example_01 \ + button_example_00 \ button_example_01 \ check_example_01 \ colorselector_example_01 \ @@ -246,6 +248,7 @@ SCREENSHOTS = \ bg_example_02:bg_01.png:0.0 \ box_example_02:box_example_02.png:1.3 \ bubble_example_01:bubble_example_01.png:0.0 \ + button_example_00:button_00.png:0.0 \ button_example_01:button_01.png:0.0 \ check_example_01:check_example_01.png:0.0 \ colorselector_example_01:colorselector_example_01.png:0.0 \