xartigas pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=458d593c3bf1b9cffb36c6570b3f8377cefc6faa
commit 458d593c3bf1b9cffb36c6570b3f8377cefc6faa Author: Xavi Artigas <[email protected]> Date: Wed Jul 24 12:28:06 2019 +0200 tutorials: Use Legacy and Unified everywhere Also, updated tutorial code to latest version. --- pages/develop/navigation.txt | 18 +++++++++--------- pages/develop/tutorials/c/eo-classes.md.txt | 2 -- pages/develop/tutorials/c/eo-inherit.md.txt | 1 - pages/develop/tutorials/c/eo-intro.md.txt | 3 --- pages/develop/tutorials/c/eo-refcount.md.txt | 3 --- pages/develop/tutorials/c/hello-world-gui.md.txt | 5 ----- pages/develop/tutorials/c/hello-world.md.txt | 3 +-- pages/develop/tutorials/c/lifecycle.md.txt | 2 -- pages/develop/tutorials/c/start.md.txt | 2 +- pages/develop/tutorials/csharp/start.md.txt | 4 ++-- pages/develop/tutorials/start.md.txt | 4 ++-- 11 files changed, 15 insertions(+), 32 deletions(-) diff --git a/pages/develop/navigation.txt b/pages/develop/navigation.txt index 086213b2f..16aaa3388 100644 --- a/pages/develop/navigation.txt +++ b/pages/develop/navigation.txt @@ -1,5 +1,5 @@ * [[/develop/start.md] | Developing with EFL]] - * [[/develop/unified-and-legacy.md | Using Stable and Beta together]] + * [[/develop/unified-and-legacy.md | Using Legacy and Unified together]] * [[/develop/debug/start.md | Debugging EFL Apps]] * [[/develop/debug/debug-symbols.md | Recompiling with Debug Symbols]] * [[/develop/debug/log-levels.md | Log Levels]] @@ -11,8 +11,8 @@ * [[/develop/setup/start.md | Setting Up EFL]] * [[/develop/setup/c/start.md | C Dev Environment]] * [[/develop/setup/csharp/start.md | C# Dev Environment]] - * [[/develop/legacy/tutorial/ | Tutorials: Stable API]] - * [[/develop/tutorials/c/start.md | Tutorials: Beta C API]] + * [[/develop/legacy/tutorial/ | Tutorials: Legacy API]] + * [[/develop/tutorials/c/start.md | Tutorials: Unified C API]] * [[/develop/tutorials/c/hello-world.md | Hello World]] * [[/develop/tutorials/c/hello-world-gui.md | Hello World GUI]] * [[/develop/tutorials/c/eo-intro.md | EO Objects]] @@ -21,12 +21,12 @@ * [[/develop/tutorials/c/eo-inherit.md | EO Inheritance]] * [[/develop/tutorials/c/eo-multiinherit.md | EO Multiple Inheritance]] * [[/develop/tutorials/c/lifecycle.md | Lifecycle Management]] - * [[/develop/tutorials/csharp/start.md | Tutorials: Beta C# API]] + * [[/develop/tutorials/csharp/start.md | Tutorials: Unified C# API]] * [[/develop/tutorials/csharp/hello-world-cs.md | Hello World C#]] * [[/develop/tutorials/csharp/hello-world-gui-cs.md | Graphical Hello World C#]] * [[/develop/tutorials/csharp/texteditor-cs.md | Simple Text Editor C#]] - * [[/develop/legacy/program_guide/start | Programming Guides: Stable API]] - * [[/develop/guides/c/start.md | Programming Guides: Beta C API]] + * [[/develop/legacy/program_guide/start | Programming Guides: Legacy API]] + * [[/develop/guides/c/start.md | Programming Guides: Unified C API]] * [[/develop/guides/c/eina/start.md | Eina]] * [[/develop/guides/c/eina/iterator-functions.md]] * [[/develop/guides/c/eina/strings.md]] @@ -46,11 +46,11 @@ * [[/develop/guides/c/ui/sizing.md | UI Sizing]] * [[/develop/guides/c/ui/focus.md | UI Focus]] * [[/develop/guides/c/porting-guide.md | Legacy Porting Guide]] - * [[/develop/guides/csharp/start.md | Programming Guides: Beta C# API]] + * [[/develop/guides/csharp/start.md | Programming Guides: Unified C# API]] * [[/develop/guides/csharp/core/main-loop.md | Main Loop]] * [[/develop/guides/csharp/core/events.md | Events]] * [[/develop/guides/csharp/eina/generic-value.md | Eina Values]] * [[/develop/guides/csharp/ui/sizing.md | UI Sizing]] * [[/develop/guides/csharp/ui/focus.md | UI Focus]] - * [[/develop/legacy/api/c/ | Reference Guide: Stable API ]] - * [[/develop/api/ | Reference Guide: Beta C API]] \ No newline at end of file + * [[/develop/legacy/api/c/ | Reference Guide: Legacy API ]] + * [[/develop/api/ | Reference Guide: Unified C API]] \ No newline at end of file diff --git a/pages/develop/tutorials/c/eo-classes.md.txt b/pages/develop/tutorials/c/eo-classes.md.txt index 97cbdd796..f7b6b4325 100644 --- a/pages/develop/tutorials/c/eo-classes.md.txt +++ b/pages/develop/tutorials/c/eo-classes.md.txt @@ -230,7 +230,6 @@ Your class is now complete, but you can't test it until you write some code whic Create a new file (for example ``eo_classes_main.c``) and add the basic EFL application from the [Hello World tutorial](hello-world.md): ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -304,7 +303,6 @@ In ``efl_main()``, right after calling ``_rect_create()`` add: Your ``eo_classes_main.c`` file should now look something like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> diff --git a/pages/develop/tutorials/c/eo-inherit.md.txt b/pages/develop/tutorials/c/eo-inherit.md.txt index c13b65764..383e5ea7e 100644 --- a/pages/develop/tutorials/c/eo-inherit.md.txt +++ b/pages/develop/tutorials/c/eo-inherit.md.txt @@ -144,7 +144,6 @@ Remember to dispose of your objects using ``efl_unref()``. Alternatively, you co The main program (``eo_inherit_main.c``) should now look like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> diff --git a/pages/develop/tutorials/c/eo-intro.md.txt b/pages/develop/tutorials/c/eo-intro.md.txt index 9df289b75..206ef0c5c 100644 --- a/pages/develop/tutorials/c/eo-intro.md.txt +++ b/pages/develop/tutorials/c/eo-intro.md.txt @@ -21,7 +21,6 @@ This tutorial is more theoretical than practical however the concepts being expl Start with the basic EFL application skeleton from the [Hello World tutorial](hello-world.md) and add some placeholder methods that will be filled later on: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -125,7 +124,6 @@ The first step of the tutorial is now complete. You may not have seen much on sc See below the complete listing, which you can build and run yourself: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -229,7 +227,6 @@ Note how you are **not** returning the reference to ``_child1``. This is because If you compile and run the complete code below you will only see messages about objects being deleted but in so doing you've learned about the very important topic of object creation and destruction, as well as how to avoid memory leaks. ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> diff --git a/pages/develop/tutorials/c/eo-refcount.md.txt b/pages/develop/tutorials/c/eo-refcount.md.txt index bd28fde50..b3f272bf4 100644 --- a/pages/develop/tutorials/c/eo-refcount.md.txt +++ b/pages/develop/tutorials/c/eo-refcount.md.txt @@ -21,7 +21,6 @@ Without further ado: the method to retrieve the reference count of an object is This tutorial starts where the previous one left off, so here's the final listing from the [Introduction to Eo](eo-intro.md) tutorial: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -263,7 +262,6 @@ Finally, the method returns the name of the parent obtained with ``efl_name_get( This step of the tutorial is now complete. The whole program should look like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -451,7 +449,6 @@ In this case, you are interested in the object that is about to be deleted, and This tutorial is now complete. It should look like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> diff --git a/pages/develop/tutorials/c/hello-world-gui.md.txt b/pages/develop/tutorials/c/hello-world-gui.md.txt index 25e5e352b..ca0ba5cce 100644 --- a/pages/develop/tutorials/c/hello-world-gui.md.txt +++ b/pages/develop/tutorials/c/hello-world-gui.md.txt @@ -16,7 +16,6 @@ If you haven't already done so take a look at our [previous guide](https://www.e As you'll be building on the code from the prior tutorial, take a look at the program below to refresh your memory: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -73,7 +72,6 @@ Technically you could put all the code for opening the window, text boxes, butto Create a function to set up your window and name it ``_gui_setup()``. Insert a call to the function from within the main EFL loop. Your program should look like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -121,7 +119,6 @@ The ``efl_ui_win_type_set()`` function does what it says on the box. There are s Your program will now look like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -203,7 +200,6 @@ As with the ``EFL_UI_WIN_CLASS`` you saw in the ``win`` creation block, [``EFL_U Your program should now look like this: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -352,7 +348,6 @@ If you use ``0.5, 0.5``, the text will be centered. Take a look at [the complete ## The Complete "hello-world-gui.c" Program ## ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> diff --git a/pages/develop/tutorials/c/hello-world.md.txt b/pages/develop/tutorials/c/hello-world.md.txt index 7dd95beab..8b0d7ca3d 100644 --- a/pages/develop/tutorials/c/hello-world.md.txt +++ b/pages/develop/tutorials/c/hello-world.md.txt @@ -13,14 +13,13 @@ There is very little code in this first tutorial so don't worry if you have litt Using your favorite text editor, create a text file and save it as ``hello-world.c``. Type in the following: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> #include <Efl_Core.h> ``` -The new EFL API has been in Beta stage for a while, and some libraries still need that you define the ``EFL_EO_API_SUPPORT`` and ``EFL_BETA_API_SUPPORT`` symbols before including any EFL library. Don't worry, though, they should not be required any more in the near future. +The new EFL API has been in Beta stage for a while, and some libraries still need that you define the ``EFL_BETA_API_SUPPORT`` symbols before including any EFL library. Don't worry, though, they should not be required any more in the near future. The EFL is split into several libraries. You only need to include the ones you actually want to use. In this tutorial you will be calling methods from the ``Eina`` and ``Efl`` libraries, therefore you need to include the ``Eina.h`` and ``Efl_Core.h`` headers. diff --git a/pages/develop/tutorials/c/lifecycle.md.txt b/pages/develop/tutorials/c/lifecycle.md.txt index d8d40f5cb..15b4f6674 100644 --- a/pages/develop/tutorials/c/lifecycle.md.txt +++ b/pages/develop/tutorials/c/lifecycle.md.txt @@ -19,7 +19,6 @@ If you use the ``EFL_MAIN()`` macro, as in the [Hello World](/develop/tutorials/ Begin by creating a ``lifecycle_main.c`` file: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> @@ -123,7 +122,6 @@ With this, the program is complete including the simulation code. The whole program, with some additional comments for clarity, is reproduced below: ```c -#define EFL_EO_API_SUPPORT 1 #define EFL_BETA_API_SUPPORT 1 #include <Eina.h> diff --git a/pages/develop/tutorials/c/start.md.txt b/pages/develop/tutorials/c/start.md.txt index 89d55ed1e..ea5357c1b 100644 --- a/pages/develop/tutorials/c/start.md.txt +++ b/pages/develop/tutorials/c/start.md.txt @@ -8,7 +8,7 @@ The following tutorials are designed to build on each other, introducing concepts in a logical manner and working towards full understanding of EFL's capabilities. Most users should approach them in the order in which they are presented; only those with previous EFL experience should skip ahead. > **NOTE:** -> The tutorials in this section use the latest beta release of the API, as noted in [Developing with the Enlightenment Foundation Libraries](https://www.enlightenment.org/develop/start.md#Current_vs._Beta). Versions of these tutorials written for the current release can be found in the [Legacy section of the website](https://www.enlightenment.org/develop/legacy/tutorial/start). +> The tutorials in this section use the latest Unified API, as noted in [Developing with the Enlightenment Foundation Libraries](/develop/start.md#Legacy_vs_Unified_APIs). Versions of these tutorials written for the Legacy API can be found in the [Legacy section of the website](/develop/legacy/tutorial/start). * [Hello World](hello-world.md) * [Hello World GUI](hello-world-gui.md) diff --git a/pages/develop/tutorials/csharp/start.md.txt b/pages/develop/tutorials/csharp/start.md.txt index 411c4c29b..c79bb1b55 100644 --- a/pages/develop/tutorials/csharp/start.md.txt +++ b/pages/develop/tutorials/csharp/start.md.txt @@ -3,7 +3,7 @@ ~~NOCACHE~~ --- -# Beta API C# Tutorials # +# Unified API C# Tutorials # The following tutorials are designed to build on each other, introducing concepts in a logical manner and working towards full understanding of EFL's capabilities. Most users should approach them in the order in which they are presented; only those with previous EFL experience should skip ahead. @@ -12,7 +12,7 @@ The following tutorials are designed to build on each other, introducing concept |  | **Some C# classes are currently in BETA state**<br>They should only be used for experimenting and **NOT** for any product development.<br>These classes are marked as **BETA** in the reference documentation.<br>The source code for the tutorials is subject to change in the future. |  | > **NOTE:** -> The tutorials in this section use the latest beta release of the API, as noted in [Developing with the Enlightenment Foundation Libraries](/develop/start.md#Current_vs._Beta). Versions of these tutorials written for the current release can be found in the [Legacy section of the website](https://www.enlightenment.org/develop/legacy/tutorial/start). +> The tutorials in this section use the latest Unified API, as noted in [Developing with the Enlightenment Foundation Libraries](/develop/start.md#Legacy_vs_Unified_APIs). Versions of these tutorials written for the Legacy API can be found in the [Legacy section of the website](/develop/legacy/tutorial/start). If you haven't done so yet, read the [Setting Up a C# Development Environment](/develop/setup/csharp/) guide so you have a working EFL installation with C# support. diff --git a/pages/develop/tutorials/start.md.txt b/pages/develop/tutorials/start.md.txt index 4aaf43769..cbe02b3b2 100644 --- a/pages/develop/tutorials/start.md.txt +++ b/pages/develop/tutorials/start.md.txt @@ -7,10 +7,10 @@ If you are just beginning your journey into programming with the Enlightenment Foundation Libraries (EFL), then these tutorials will help you on your way. Designed for those who have prior programming experience but who have not necessarily used EFL before, the tutorials will walk you through writing programs which build on EFL from the basic - a traditional "Hello World" example - through to the more advanced. -If you have not yet done so, visit [Developing with the Enlightenment Foundation Libraries](https://www.enlightenment.org/develop/start.md) for background on EFL and details on how to set up your development environment. +If you have not yet done so, visit [Developing with the Enlightenment Foundation Libraries](/develop/start.md) for background on EFL and details on how to set up your development environment. > **NOTE:** -> The tutorials in this section use the latest beta release of the API, as noted in [Developing with the Enlightenment Foundation Libraries](https://www.enlightenment.org/develop/start.md#Current_vs._Beta). Versions of these tutorials written for the current release can be found in the [Legacy section of the website](https://www.enlightenment.org/develop/legacy/tutorial/start). +> The tutorials in this section use the latest Unified API, as noted in [Developing with the Enlightenment Foundation Libraries](/develop/start.md#Legacy_vs_Unified_APIs). Versions of these tutorials written for the Legacy API can be found in the [Legacy section of the website](/develop/legacy/tutorial/start). ## Languages ## --
