elm_fileselector: Move enums to elm_interface_fileselector.eo

Move enums from elm_fileselector_common.h to elm_interface_fileselector.eo
in order to make them more accessible for bindings.
Include generated elm_interface_fileselector.eo.legacy.h
into elm_fileselector_legacy.h

diff --git a/src/lib/elc_fileselector_common.h b/src/lib/elc_fileselector_common.h
index 9c5bd87dbd5d9eccfa0555f8f83b95d285ef2c6c..2202a9692d89d0b62f01b7278aa8b56e3b36bf4a 100644 (file)
--- a/src/lib/elc_fileselector_common.h
+++ b/src/lib/elc_fileselector_common.h
@@ -1,27 +1,3 @@
-/**
- * Defines how a file selector widget is to layout its contents
- * (file system entries).
- */
-typedef enum
-{
-   ELM_FILESELECTOR_LIST = 0, /**< layout as a list */
-   ELM_FILESELECTOR_GRID, /**< layout as a grid */
-   ELM_FILESELECTOR_LAST /**< sentinel (helper) value, not used */
-} Elm_Fileselector_Mode;
-
-typedef enum
-{
-   ELM_FILESELECTOR_SORT_BY_FILENAME_ASC = 0,
-   ELM_FILESELECTOR_SORT_BY_FILENAME_DESC,
-   ELM_FILESELECTOR_SORT_BY_TYPE_ASC,
-   ELM_FILESELECTOR_SORT_BY_TYPE_DESC,
-   ELM_FILESELECTOR_SORT_BY_SIZE_ASC,
-   ELM_FILESELECTOR_SORT_BY_SIZE_DESC,
-   ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC,
-   ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC,
-   ELM_FILESELECTOR_SORT_LAST /**< sentinel (helper) value, not used */
-} Elm_Fileselector_Sort;
-
 typedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, /**< File path */
                                                   Eina_Bool dir, /**< A flag to show if path is a directory or not. True if the path is a directory. */
                                                   void *data /**< A user data that was given by elm_fileselector_custom_filter_append. */);

diff --git a/src/lib/elc_fileselector_legacy.h b/src/lib/elc_fileselector_legacy.h
index 0aa5b7949d1a6be4dd8cc6da53bf7df558639d82..88c1ef38d80f8ce7c909cf4da4e7aac7b6da440c 100644 (file)
--- a/src/lib/elc_fileselector_legacy.h
+++ b/src/lib/elc_fileselector_legacy.h
@@ -1,3 +1,4 @@
+#include "elm_interface_fileselector.eo.legacy.h"
 /**
  * Add a new file selector widget to the given parent Elementary
  * (container) object

diff --git a/src/lib/elm_interface_fileselector.eo b/src/lib/elm_interface_fileselector.eo
index dc95e629b8d97ea3aa998e369044839aa974a811..4c52c566f49e39593993e20aee19e670106364aa 100644 (file)
--- a/src/lib/elm_interface_fileselector.eo
+++ b/src/lib/elm_interface_fileselector.eo
@@ -1,3 +1,29 @@
+enum Elm.Fileselector.Mode
+{
+   [[
+      @addtogroup Fileselector
+      Defines how a file selector widget is to layout its contents
+      (file system entries).
+   ]]
+   legacy: elm_fileselector;
+   list = 0, [[Layout as a list.]]
+   grid, [[Layout as a grid.]]
+   last [[Sentinel (helper) value, not used.]]
+}
+
+enum Elm.Fileselector.Sort
+{
+   by_filename_asc = 0,
+   by_filename_desc,
+   by_type_asc,
+   by_type_desc,
+   by_size_asc,
+   by_size_desc,
+   by_modified_asc,
+   by_modified_desc,
+   last [[Sentinel (helper) value, not used.]]
+}
+
 interface Elm_Interface_Fileselector ()
 {
    legacy_prefix: null;
@@ -57,7 +83,7 @@ interface Elm_Interface_Fileselector ()
             /*@ Get the sort method of the file selector widget. */
          }
          values {
-            sort: Elm_Fileselector_Sort;
+            sort: Elm.Fileselector.Sort;
          }
       }
       @property multi_select {
@@ -101,7 +127,7 @@ interface Elm_Interface_Fileselector ()
             /*@ Get the mode in which a given file selector widget is displaying */
          }
          values {
-            mode: Elm_Fileselector_Mode;
+            mode: Elm.Fileselector.Mode;
          }
       }
       @property is_save {