enlightenment
/
eflxx
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sync to C API 

...


SVN revision: 43647
This commit is contained in:
Andreas Volz 2009-11-12 21:17:23 +00:00
parent 1215ecaf8f
commit 8bf05e556b
10 changed files with 38 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
elementaryxx/README
View File

@ -1,262 +0,0 @@
/* General calls */
EAPI void elm_quicklaunch_init(int argc, char **argv);
EAPI void elm_quicklaunch_sub_init(int argc, char **argv);
EAPI void elm_quicklaunch_sub_shutdown(void);
EAPI void elm_quicklaunch_shutdown(void);
EAPI void elm_quicklaunch_seed(void);
EAPI Evas_Bool elm_quicklaunch_prepare(int argc, char **argv);
EAPI Evas_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);
EAPI void elm_quicklaunch_cleanup(void);
EAPI int elm_quicklaunch_fallback(int argc, char **argv);
EAPI char *elm_quicklaunch_exe_path_get(const char *exe);
EAPI void elm_object_scale_set(Evas_Object *obj, double scale);
EAPI double elm_object_scale_get(const Evas_Object *obj);
EAPI void elm_object_style_set(Evas_Object *obj, const char *style);
EAPI const char *elm_object_style_get(const Evas_Object *obj);
EAPI double elm_scale_get(void);
EAPI void elm_scale_set(double scale);
EAPI Evas_Coord elm_finger_size_get(void);
EAPI void elm_finger_size_set(Evas_Coord size);
EAPI void elm_object_focus(Evas_Object *obj);
EAPI void elm_coords_finger_size_adjust(int times_w, Evas_Coord *w, int times_h, Evas_Coord *h);
EAPI void elm_theme_overlay_add(const char *item);
EAPI void elm_theme_extension_add(const char *item);
typedef enum _Elm_Scroller_Policy
{
ELM_SCROLLER_POLICY_AUTO,
ELM_SCROLLER_POLICY_ON,
ELM_SCROLLER_POLICY_OFF
}
Elm_Scroller_Policy;
EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
EAPI Eina_Bool elm_layout_file_set(Evas_Object *obj, const char *file, const char *group);
EAPI void elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
/* smart callbacks called:
*/
typedef enum _Elm_Hover_Axis
{
ELM_HOVER_AXIS_NONE,
ELM_HOVER_AXIS_HORIZONTAL,
ELM_HOVER_AXIS_VERTICAL,
ELM_HOVER_AXIS_BOTH
} Elm_Hover_Axis;
EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
EAPI void elm_hover_target_set(Evas_Object *obj, Evas_Object *target);
EAPI void elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
EAPI void elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
EAPI void elm_hover_style_set(Evas_Object *obj, const char *style);
EAPI const char *elm_hover_best_content_location_get(const Evas_Object *obj, Elm_Hover_Axis pref_axis);
/* available styles:
* default
* popout
* hoversel_vertical
*/
/* smart callbacks called:
* "clicked" - the user clicked the empty space in the hover to dismiss
*/
/* composite widgets - these basically put together basic widgets above
* in convenient packages that do more than basic stuff */
typedef enum _Elm_Text_Format
{
ELM_TEXT_FORMAT_PLAIN_UTF8,
ELM_TEXT_FORMAT_MARKUP_UTF8
} Elm_Text_Format;
EAPI Evas_Object *elm_notepad_add(Evas_Object *parent);
EAPI void elm_notepad_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format);
/* smart callbacks called:
*/
typedef struct _Elm_Entry_Anchorview_Info Elm_Entry_Anchorview_Info;
struct _Elm_Entry_Anchorview_Info
{
const char *name;
int button;
Evas_Object *hover;
struct {
Evas_Coord x, y, w, h;
} anchor, hover_parent;
Evas_Bool hover_left : 1;
Evas_Bool hover_right : 1;
Evas_Bool hover_top : 1;
Evas_Bool hover_bottom : 1;
};
EAPI Evas_Object *elm_anchorview_add(Evas_Object *parent);
EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text);
EAPI void elm_anchorview_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
EAPI void elm_anchorview_hover_style_set(Evas_Object *obj, const char *style);
EAPI void elm_anchorview_hover_end(Evas_Object *obj);
/* smart callbacks called:
* "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchorview_Info
*/
typedef struct _Elm_Entry_Anchorblock_Info Elm_Entry_Anchorblock_Info;
struct _Elm_Entry_Anchorblock_Info
{
const char *name;
int button;
Evas_Object *hover;
struct {
Evas_Coord x, y, w, h;
} anchor, hover_parent;
Evas_Bool hover_left : 1;
Evas_Bool hover_right : 1;
Evas_Bool hover_top : 1;
Evas_Bool hover_bottom : 1;
};
EAPI Evas_Object *elm_anchorblock_add(Evas_Object *parent);
EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text);
EAPI void elm_anchorblock_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
EAPI void elm_anchorblock_hover_style_set(Evas_Object *obj, const char *style);
EAPI void elm_anchorblock_hover_end(Evas_Object *obj);
/* smart callbacks called:
* "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchorblock_Info
*/
EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
EAPI Eina_Bool elm_photo_file_set(Evas_Object *obj, const char *file);
EAPI void elm_photo_size_set(Evas_Object *obj, int size);
/* smart callbacks called:
* "clicked" - the user clicked the icon
*/
typedef enum _Elm_Icon_Type
{
ELM_ICON_NONE,
ELM_ICON_FILE,
ELM_ICON_STANDARD
} Elm_Icon_Type;
typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item;
EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
EAPI void elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label);
EAPI void elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon);
EAPI void elm_hoversel_hover_begin(Evas_Object *obj);
EAPI void elm_hoversel_hover_end(Evas_Object *obj);
EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI void elm_hoversel_item_del(Elm_Hoversel_Item *item);
EAPI void *elm_hoversel_item_data_get(Elm_Hoversel_Item *it);
/* smart callbacks called:
* "clicked" - the user clicked the hoversel button and popped up the sel
* "selected" - an item in the hoversel list is selected
* "dismissed" - the hover is dismissed
*/
typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item);
EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item);
EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable);
/* smart callbacks called:
* "clicked" - when the user clicks on a toolbar item and becomes selected
*/
// FIXME: incomplete - carousel
typedef struct _Elm_Carousel_Item Elm_Carousel_Item;
EAPI Evas_Object *elm_carousel_add(Evas_Object *parent);
EAPI Elm_Carousel_Item *elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI void elm_carousel_item_del(Elm_Carousel_Item *item);
EAPI void elm_carousel_item_select(Elm_Carousel_Item *item);
/* smart callbacks called:
* "clicked" - when the user clicks on a carousel item and becomes selected
*/
typedef enum _Elm_Genlist_Item_Flags
{
ELM_GENLIST_ITEM_NONE = 0,
ELM_GENLIST_ITEM_SUBITEMS = (1 << 0)
} Elm_Genlist_Item_Flags;
typedef struct _Elm_Genlist_Item_Class Elm_Genlist_Item_Class;
typedef struct _Elm_Genlist_Item Elm_Genlist_Item;
typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func;
typedef char *(*GenlistItemLabelGetFunc) (const void *data, Evas_Object *obj, const char *part);
typedef Evas_Object *(*GenlistItemIconGetFunc) (const void *data, Evas_Object *obj, const char *part);
typedef Evas_Bool (*GenlistItemStateGetFunc) (const void *data, Evas_Object *obj, const char *part);
typedef void (*GenlistItemDelFunc) (const void *data, Evas_Object *obj);
struct _Elm_Genlist_Item_Class
{
const char *item_style;
struct _Elm_Genlist_Item_Class_Func {
GenlistItemLabelGetFunc label_get;
GenlistItemIconGetFunc icon_get;
GenlistItemStateGetFunc state_get;
GenlistItemDelFunc del;
} func;
};
EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
EAPI void elm_genlist_clear(Evas_Object *obj);
EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Evas_Bool multi);
EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj);
EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj);
EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj);
EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item);
EAPI Elm_Genlist_Item *elm_genlist_item_prev_get(const Elm_Genlist_Item *item);
EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item);
EAPI Elm_Genlist_Item *elm_genlist_item_parent_get(const Elm_Genlist_Item *it);
EAPI void elm_genlist_item_subitems_clear(Elm_Genlist_Item *item);
EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected);
EAPI Evas_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_expanded_set(Elm_Genlist_Item *item, Evas_Bool expanded);
EAPI Evas_Bool elm_genlist_item_expanded_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Evas_Bool disabled);
EAPI Evas_Bool elm_genlist_item_disabled_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_show(Elm_Genlist_Item *item);
EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
EAPI const void *elm_genlist_item_data_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_update(Elm_Genlist_Item *item);
EAPI void elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode);
EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select);
EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Evas_Bool no_select);
/* available item styles:
* default
* double_label
*/
/* smart callbacks called:
* "clicked" - when the user double-clicked an item
* "selected" - when the user selected an item
* "unselected" - when the user selected an item
* "expanded" - when the user expanded an item
* "contracted" - when the user contracted an item
* "expand,request" - when the user requested to expand an item
* "contract,request" - when the user requested to expand an item
*/
EAPI Evas_Object *elm_pager_add(Evas_Object *parent);
EAPI void elm_pager_content_push(Evas_Object *obj, Evas_Object *content);
EAPI void elm_pager_content_pop(Evas_Object *obj);
EAPI void elm_pager_content_promote(Evas_Object *obj, Evas_Object *content);
EAPI Evas_Object *elm_pager_content_bottom_get(Evas_Object *obj);
EAPI Evas_Object *elm_pager_content_top_get(Evas_Object *obj);
/* smart callbacks called:
*/

21
elementaryxx/TODO.tasks
View File

@ -6,13 +6,6 @@
<summary>parent parameter with EvasSmart?</summary>
<comment/>
</item>
<item>
<attribute id="1246518979" priority="1" done="0" start_date="733590" enddate="99999999" notify="0" endtime="-60" last_edited="1246573316"/>
<summary>evas_object_del()</summary>
<comment>I think evas_object_del() shouldn't be called in the destructur if the destruction was initiated by the C object (e.g. by deleting the parent)
=&gt; create a elmDeinit() function in ElmWidget and us it</comment>
</item>
<item>
<attribute id="1245447931" priority="1" done="1" start_date="733577" completed_date="733591" notify="0" last_edited="1246573323"/>
<summary>Create a EwlWidget hierarchie</summary>
@ -21,7 +14,14 @@
<item>
<attribute id="1245793994" priority="1" done="1" start_date="733581" completed_date="733591" notify="0" last_edited="1246573325"/>
<summary>const get functions</summary>
<comment></comment>
<comment/>
</item>
<item>
<attribute id="1246518979" priority="1" done="1" start_date="733590" completed_date="733723" notify="0" last_edited="1258060562"/>
<summary>evas_object_del()</summary>
<comment>I think evas_object_del() shouldn't be called in the destructur if the destruction was initiated by the C object (e.g. by deleting the parent)
=&gt; create a elmDeinit() function in ElmWidget and us it</comment>
</item>
</category>
<category title="Features" place="1">
@ -30,5 +30,10 @@
<summary>Date/Time struct</summary>
<comment/>
</item>
<item>
<attribute id="1258060585" priority="0" done="0" start_date="733723" enddate="99999999" notify="0" endtime="-60" last_edited="1258060585"/>
<summary>Add all docs from C API to C++ API</summary>
<comment></comment>
</item>
</category>
</gtodo>

1
elementaryxx/include/elementaryxx/ElmAnchorblock.h
View File

@ -28,7 +28,6 @@ private:
void setHoverParent (EvasObject &parent);
void setHoverStyle (const std::string &style);
void endHover ();
};
} // end namespace efl

12
elementaryxx/include/elementaryxx/ElmButton.h
View File

@ -15,6 +15,11 @@ namespace efl {
/*!
* smart callbacks called:
* "clicked" - the user clicked the button
*
* available styles:
* default
* hoversel_vertical
* hoversel_vertical_entry
*/
class ElmButton : public ElmObject
{
@ -25,12 +30,7 @@ public:
void setIcon (const EvasObject &icon);
/*!
* available styles:
* default
* hoversel_vertical
* hoversel_vertical_entry
*/
void setStyle (const std::string &style);
private:

18
elementaryxx/include/elementaryxx/ElmFrame.h
View File

@ -12,15 +12,6 @@
namespace efl {
class ElmFrame : public ElmObject
{
public:
static ElmFrame *factory (EvasObject &parent);
void setLabel (const std::string &label);
void setContent (const EvasObject &content);
/*!
* available styles:
* default
@ -31,7 +22,14 @@ public:
* outdent_top
* outdent_bottom
*/
void setStyle (const std::string &style);
class ElmFrame : public ElmObject
{
public:
static ElmFrame *factory (EvasObject &parent);
void setLabel (const std::string &label);
void setContent (const EvasObject &content);
private:
ElmFrame (); // forbid standard constructor

13
elementaryxx/include/elementaryxx/ElmHover.h
View File

@ -11,6 +11,11 @@ namespace efl {
/*! smart callbacks called:
* "clicked" - the user clicked the empty space in the hover to dismiss
*
* available styles:
* default
* popout
* hoversel_vertical
*/
class ElmHover : public ElmObject
{
@ -23,14 +28,6 @@ public:
void setContent (const std::string &swallow, const EvasObject &content);
/*!
* available styles:
* default
* popout
* hoversel_vertical
*/
void setStyle (const std::string &style);
const string getBestContentLocation (Elm_Hover_Axis prefAxis) const;
private:

5
elementaryxx/src/ElmButton.cpp
View File

@ -32,9 +32,4 @@ void ElmButton::setIcon (const EvasObject &icon)
elm_button_icon_set (o, icon.obj ());
}
void ElmButton::setStyle (const std::string &style)
{
elm_button_style_set (o, style.c_str ());
}
} // end namespace efl

5
elementaryxx/src/ElmFrame.cpp
View File

@ -32,9 +32,4 @@ void ElmFrame::setContent (const EvasObject &content)
elm_frame_content_set (o, content.obj ());
}
void ElmFrame::setStyle (const std::string &style)
{
elm_frame_style_set (o, style.c_str ());
}
} // end namespace efl

5
elementaryxx/src/ElmHover.cpp
View File

@ -37,11 +37,6 @@ void ElmHover::setContent (const std::string &swallow, const EvasObject &content
elm_hover_content_set (o, swallow.c_str (), content.obj ());
}
void ElmHover::setStyle (const std::string &style)
{
elm_hover_style_set (o, style.c_str ());
}
const string ElmHover::getBestContentLocation (Elm_Hover_Axis prefAxis) const
{
return elm_hover_best_content_location_get (o, prefAxis);

6
elementaryxx/src/ElmObject.cpp
View File

@ -4,6 +4,9 @@
#include "../include/elementaryxx/ElmObject.h"
/* STD */
#include <cassert>
using namespace std;
namespace efl {
@ -14,6 +17,9 @@ ElmObject::~ElmObject () {}
void ElmObject::elmInit ()
{
// check if there was a problem with object creation
assert (o);
init (); // call init() from EvasObject
signalHandleFree.connect (sigc::mem_fun (this, &ElmObject::freeSignalHandler));