Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_attach.h ewl_events.h ewl_filedialog.h ewl_fileselector.h
ewl_floater.c ewl_floater.h ewl_grid.c ewl_grid.h
ewl_iconbox.h ewl_image.c ewl_image.h ewl_object.h
ewl_statusbar.h ewl_tree2.h
Log Message:
- docs
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_attach.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_attach.h 16 Feb 2006 17:06:43 -0000 1.8
+++ ewl_attach.h 17 Feb 2006 02:19:26 -0000 1.9
@@ -49,8 +49,8 @@
/**
- * @def ewl_attach_mouse_pointer_set(w, data)
- * Convenience method to set a pointer widget attachment
+ * @def ewl_attach_mouse_cursor_set(w, data)
+ * Convenience method to set a cursor widget attachment
*/
#define ewl_attach_mouse_cursor_set(w, data) \
ewl_attach_other_set(w, EWL_ATTACH_TYPE_MOUSE_CURSOR, \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_events.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_events.h 22 Dec 2005 04:29:44 -0000 1.8
+++ ewl_events.h 17 Feb 2006 02:19:26 -0000 1.9
@@ -1,9 +1,8 @@
-#ifndef __EWL_EVENTS_H__
-#define __EWL_EVENTS_H__
+#ifndef EWL_EVENTS_H
+#define EWL_EVENTS_H
/**
- * @file ewl_events.h
- * @defgroup Ewl_Events Events: Lower Level Event Handlers
+ * @defgroup Ewl_Events Ewl_Events: Lower Level Event Handlers
* @brief Defines the routines that dispatch the lower level events to EWL.
*
* @{
@@ -12,7 +11,6 @@
typedef struct Ewl_Event_Window_Expose Ewl_Event_Window_Expose;
/**
- * @struct Ewl_Event_Window_Expose
* Describes the evas region that received an expose notification.
*/
struct Ewl_Event_Window_Expose
@@ -26,7 +24,6 @@
typedef struct Ewl_Event_Window_Configure Ewl_Event_Window_Configure;
/**
- * @struct Ewl_Event_Window_Configure
* Notifies widgets when the enclosing window size has changed.
*/
struct Ewl_Event_Window_Configure
@@ -40,7 +37,6 @@
typedef struct Ewl_Event_Window_Delete Ewl_Event_Window_Delete;
/**
- * @struct Ewl_Event_Window_Delete
* Notifies of window close requests.
*/
struct Ewl_Event_Window_Delete
@@ -51,7 +47,6 @@
typedef struct Ewl_Event_Key_Down Ewl_Event_Key_Down;
/**
- * @struct Ewl_Event_Key_Down
* Provides clients with necessary information about the key press event.
*/
struct Ewl_Event_Key_Down
@@ -63,7 +58,6 @@
typedef struct Ewl_Event_Key_Up Ewl_Event_Key_Up;
/**
- * @struct Ewl_Event_Key_Up
* Provides clients with necessary information about the key release event.
*/
struct Ewl_Event_Key_Up
@@ -75,7 +69,6 @@
typedef struct Ewl_Event_Mouse_Down Ewl_Event_Mouse_Down;
/**
- * @struct Ewl_Event_Mouse_Down
* Provides information about the mouse down event.
*/
struct Ewl_Event_Mouse_Down
@@ -90,7 +83,6 @@
typedef struct Ewl_Event_Mouse_Up Ewl_Event_Mouse_Up;
/**
- * @struct Ewl_Event_Mouse_Up
* Provides information about the mouse up event.
*/
struct Ewl_Event_Mouse_Up
@@ -104,7 +96,6 @@
typedef struct Ewl_Event_Mouse_Move Ewl_Event_Mouse_Move;
/**
- * @struct Ewl_Event_Mouse_Move
* Provides information about mouse movement
*/
struct Ewl_Event_Mouse_Move
@@ -117,7 +108,6 @@
typedef struct Ewl_Event_Mouse_In Ewl_Event_Mouse_In;
/**
- * @struct Ewl_Event_Mouse_In
* Provides information about the mouse entering
*/
struct Ewl_Event_Mouse_In
@@ -130,7 +120,6 @@
typedef struct Ewl_Event_Mouse_Out Ewl_Event_Mouse_Out;
/**
- * @struct Ewl_Event_Mouse_Out
* Provides information about the mouse leaving
*/
struct Ewl_Event_Mouse_Out
@@ -143,7 +132,6 @@
typedef struct Ewl_Event_Mouse_Wheel Ewl_Event_Mouse_Wheel;
/**
- * @struct Ewl_Event_Mouse_Wheel
* Provides information about the mouse wheel scrolling
*/
struct Ewl_Event_Mouse_Wheel
@@ -158,7 +146,6 @@
typedef struct Ewl_Dnd_Types Ewl_Dnd_Types;
/**
- * @struct Ewl_Dnd_Types
* Provides type information about an external DND drag
*/
struct Ewl_Dnd_Types
@@ -169,7 +156,6 @@
};
/**
- * @struct Ewl_Event_Dnd_Drop
* Provides information about dnd drops movement
*/
struct Ewl_Event_Dnd_Drop
@@ -185,7 +171,6 @@
typedef struct Ewl_Dialog_Event Ewl_Dialog_Event;
/**
- * @struct Ewl_Dialog_Event
* Stores the reponse from a dialog
*/
struct Ewl_Dialog_Event
@@ -201,4 +186,4 @@
* @}
*/
-#endif /* __EWL_EVENTS_H__ */
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_filedialog.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_filedialog.h 12 Jan 2006 18:21:18 -0000 1.8
+++ ewl_filedialog.h 17 Feb 2006 02:19:26 -0000 1.9
@@ -1,21 +1,9 @@
-#ifndef __EWL_FILEDIALOG_H__
-#define __EWL_FILEDIALOG_H__
+#ifndef EWL_FILEDIALOG_H
+#define EWL_FILEDIALOG_H
/**
- * @file ewl_filedialog.h
- * @defgroup Ewl_Filedialog Filedialog: A Dialog For Picking Files
- *
- * The filedialog is intended to be used for a simple file chooser. It can be
- * placed inside any other container, and provides the ability to pack extra
- * buttons or widgets along the left side. It currently supports two types, an
- * Open and a Save dialog.
- *
- * The normal use of the filedialog is to create a new one the first time an
- * event occurs that requires one. Setting a callback for
- * EWL_CALLBACK_VALUE_CHANGED, allows the programmer to determine when the
- * Open/Save buttons were chosen. If the event data on the callback is NULL,
- * Cancel was clicked, otherwise, the event data is a pointer to the chosen
- * file(s).
+ * @defgroup Ewl_Filedialog Ewl_Filedialog: A Dialog For Picking Files
+ * A simple dialog to show a file selector widget
*
* @{
*/
@@ -39,7 +27,6 @@
#define EWL_FILEDIALOG(fd) ((Ewl_Filedialog *) fd)
/**
- * @struct Ewl_Filedialog
* Creates a dialog for the fileselector
*/
struct Ewl_Filedialog
@@ -78,4 +65,4 @@
* @}
*/
-#endif /* __EWL_FS_H__ */
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_fileselector.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_fileselector.h 17 Feb 2006 00:26:29 -0000 1.15
+++ ewl_fileselector.h 17 Feb 2006 02:19:26 -0000 1.16
@@ -1,17 +1,10 @@
-#ifndef __EWL_FILESELECTOR_H__
-#define __EWL_FILESELECTOR_H__
+#ifndef EWL_FILESELECTOR_H
+#define EWL_FILESELECTOR_H
/**
- * @file ewl_fileselector.h
- * @defgroup Ewl_Fileselector Fileselector: Basic File And Directory Listing
- *
- * Displays a list of directories and a list of files for the user to choose.
- * The selector triggers a EWL_CALLBACK_VALUE_CHANGED callback when either a
- * click causes the selected file to change, when a double click causes the
- * currently displayed directory to change, or when a double click on a file
- * occurs to signal an open. The event data passed to the callback is NULL,
- * unless the double click event occurred on a file, in which case it is the
- * file's path.
+ * @defgroup Ewl_Fileselector Ewl_Fileselector: Basic File And Directory
Listing
+ * A simple widget that is used to display a list of directories and files
+ * for the user to choose from.
*
* @{
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_floater.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_floater.c 12 Jan 2006 18:21:18 -0000 1.9
+++ ewl_floater.c 17 Feb 2006 02:19:26 -0000 1.10
@@ -63,6 +63,7 @@
* @param f: The Ewl_Floater to set the follow into
* @param p: The widget to follow
* @return Returns no value
+ * @brief Set the widget to follow
*/
void
ewl_floater_follow_set(Ewl_Floater *f, Ewl_Widget *p)
@@ -102,6 +103,7 @@
/**
* @param f: The Floater to get the follow from
* @return Returns the widget the floater is following, or NULL
+ * @brief Get the widget we are following
*/
Ewl_Widget *
ewl_floater_follow_get(Ewl_Floater *f)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_floater.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_floater.h 12 Jan 2006 18:21:18 -0000 1.6
+++ ewl_floater.h 17 Feb 2006 02:19:26 -0000 1.7
@@ -1,9 +1,8 @@
-#ifndef __EWL_FLOATER_H__
-#define __EWL_FLOATER_H__
+#ifndef EWL_FLOATER_H
+#define EWL_FLOATER_H
/**
- * @file ewl_floater.h
- * @defgroup Ewl_Floater Floater: A Floating Container
+ * @defgroup Ewl_Floater Ewl_Floater: A Floating Container
* @brief Defines a widget for layering above other widgets in EWL's drawing
* area, with the ability to follow the movement of another widget.
*
@@ -30,7 +29,6 @@
#define EWL_FLOATER(floater) ((Ewl_Floater *) floater)
/**
- * @struct Ewl_Floater
* Inherits from Ewl_Box for layout purposes. Provides a means to layer above
* other widgets and to follow the movement of another widget.
*/
@@ -48,7 +46,6 @@
void ewl_floater_follow_set(Ewl_Floater *f, Ewl_Widget *p);
Ewl_Widget *ewl_floater_follow_get(Ewl_Floater *f);
void ewl_floater_position_set(Ewl_Floater *parent, int x, int y);
-void ewl_floater_position_get(Ewl_Floater *parent, int *x, int *y);
/*
* Internally used callbacks, override at your own risk.
@@ -64,4 +61,4 @@
* @}
*/
-#endif /* __EWL_FLOATER_H__ */
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_grid.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_grid.c 16 Feb 2006 21:52:42 -0000 1.13
+++ ewl_grid.c 17 Feb 2006 02:19:26 -0000 1.14
@@ -6,12 +6,10 @@
static void ewl_grid_resize(Ewl_Grid *g);
/**
- * ewl_grid_new - create a new grid
* @param cols: number of columns
* @param rows: number of rows
- *
- * @return Returns a pointer to a newly allocated grid on success, NULL on
- * failure.
+ * @return Returns a pointer to a newly allocated grid on success, NULL on
failure.
+ * @brief Create a new Ewl_Grid widget
*/
Ewl_Widget *
ewl_grid_new(int cols, int rows)
@@ -34,13 +32,12 @@
/**
- * ewl_grid_init - initialize the grid to starting values
* @param g: the grid
* @param cols: number of columns
* @param rows: number of rows
- *
* @return Returns no value. Responsible for setting up default values and
* callbacks within a grid structure
+ * @brief Initializes an Ewl_Grid widget to default values
*/
int
ewl_grid_init(Ewl_Grid *g, int cols, int rows)
@@ -99,12 +96,11 @@
}
/**
- * ewl_grid_reset - clear the grid and set new geometry
* @param g: the grid
* @param cols: the new number of columns
* @param rows: the new number of rows
- *
* @return Returns no value
+ * @brief Clears the grid and sets new geometry
*/
void
ewl_grid_reset(Ewl_Grid *g, int cols, int rows)
@@ -165,7 +161,7 @@
* @param g: the grid to change homogeneous layout
* @param h: the boolean value to change the layout mode to
* @return Returns no value.
- * @breif Change the homogeneous layout of the box
+ * @brief Change the homogeneous layout of the grid
*
* Grids use non-homogeneous layout by default, this can be used
* to change that.
@@ -189,7 +185,7 @@
* @param g: the grid to change horizontal homogeneous layout
* @param h: the boolean value to change the horizontal layout mode to
* @return Returns no value.
- * @breif Change the horizontal homogeneous layout of the box
+ * @brief Change the horizontal homogeneous layout of the box
*
* Grids use non-homogeneous layout by default, this can be used
* to change that for horizontal orientation, i.e. all columns can
@@ -212,7 +208,7 @@
* @param g: the grid to change vertical homogeneous layout
* @param h: the boolean value to change the vertical layout mode to
* @return Returns no value.
- * @breif Change the vertical homogeneous layout of the box
+ * @brief Change the vertical homogeneous layout of the box
*
* Grids use non-homogeneous layout by default, this can be used
* to change that for vertical orientation, i.e. all rows can have
@@ -262,15 +258,14 @@
}
/**
- * ewl_grid_add - add a child widget to the grid
* @param g: the grid
* @param w: the child widget
* @param start_col: the start column
* @param end_col: the end column
* @param start_row: the start row
* @param end_row: the end row
- *
* @return Returns no value
+ * @brief Add a child widget to the grid
*/
void
ewl_grid_add(Ewl_Grid *g, Ewl_Widget *w,
@@ -322,12 +317,11 @@
}
/**
- * ewl_grid_col_w_set - set the width of a column
* @param g: the grid
* @param col: the column
* @param width: the new width
- *
* @return Returns no value.
+ * @brief Set the widget of a column
*/
void
ewl_grid_col_w_set(Ewl_Grid *g, int col, int width)
@@ -359,13 +353,11 @@
}
/**
- * ewl_grid_col_w_get - get the width of a column
- *
* @param g: the grid
* @param col: the column
* @param width: integer pointer to store the width in
- *
* @return Returns no value.
+ * @brief Get the width of a column
*/
void
ewl_grid_col_w_get(Ewl_Grid *g, int col, int *width)
@@ -381,12 +373,11 @@
}
/**
- * ewl_grid_row_h_set - set the height of a row
* @param g: the grid
* @param row: the row
* @param height: the new height
- *
* @return Returns no value.
+ * @brief Set the height of a row
*/
void
ewl_grid_row_h_set(Ewl_Grid *g, int row, int height)
@@ -415,13 +406,11 @@
}
/**
- * ewl_grid_row_h_get - get the height of a row
- *
* @param g: the grid
* @param row: the row
* @param height: integer pointer to store the height in
- *
* @return Returns no value.
+ * @brief Get the height of a row
*/
void
ewl_grid_row_h_get(Ewl_Grid *g, int row, int *height)
@@ -857,3 +846,4 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_grid.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_grid.h 4 Feb 2006 06:14:56 -0000 1.8
+++ ewl_grid.h 17 Feb 2006 02:19:26 -0000 1.9
@@ -1,11 +1,10 @@
-#ifndef __EWL_GRID_H__
-#define __EWL_GRID_H__
+#ifndef EWL_GRID_H
+#define EWL_GRID_H
/**
- * @file ewl_grid.h
- *
- * @defgroup Ewl_Grid Grid The ewl grid widget
+ * @defgroup Ewl_Grid Ewl_Grid The ewl grid widget
* @brief The Ewl Grid widget
+ *
* @{
*/
@@ -26,41 +25,42 @@
Ecore_List *cross;
};
+/**
+ * The Ewl_Grid widget
+ */
typedef struct Ewl_Grid Ewl_Grid;
+/**
+ * @def EWL_GRID(grid)
+ * Typecast a pointer to an Ewl_Grid pointer
+ */
#define EWL_GRID(grid) ((Ewl_Grid *)grid)
+/**
+ * Inherit from Ewl_Container and extend to privide a grid layout widget
+ */
struct Ewl_Grid
{
- Ewl_Container container;
+ Ewl_Container container; /**< Inherit from Ewl_Container
*/
+
+ Ewl_Grid_Info *col_size; /**< Horizontal/vertical size
of the columns */
+ Ewl_Grid_Info *row_size; /**< Horizontal/vertical size
of the rows */
+
+ int rows; /**< Row count */
+ int cols; /**< Column count */
- /*
- * horisontal/vertical size of the columns and rows
- */
- Ewl_Grid_Info *col_size;
- Ewl_Grid_Info *row_size;
-
- int rows, cols;
-
- /*
- * Flag indicating space assignment
- */
- unsigned int homogeneous_h; /** Horizontal homogeneous flag */
- unsigned int homogeneous_v; /** Vertical homogeneous flag */
- /*
- * total size of the grid widget
- */
- int grid_h;
- int grid_w;
-
- /*
- * list of old children after a reset call
- */
- Ecore_List *rchildren;
+ unsigned int homogeneous_h; /**< Horizontal homogeneous
flag */
+ unsigned int homogeneous_v; /**< Vertical homogeneous flag
*/
+
+ int grid_h; /**< Total height of the grid */
+ int grid_w; /**< Total width of the grid */
+
+ Ecore_List *rchildren; /**< List of old children after
a reset call */
};
typedef struct Ewl_Grid_Child Ewl_Grid_Child;
+
struct Ewl_Grid_Child
{
int start_col;
@@ -105,5 +105,5 @@
* @}
*/
-#endif /* __EWL_GRID_H__ */
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_iconbox.h 12 Jan 2006 18:21:18 -0000 1.30
+++ ewl_iconbox.h 17 Feb 2006 02:19:26 -0000 1.31
@@ -1,5 +1,5 @@
-#ifndef __EWL_ICONBOX_H__
-#define __EWL_ICONBOX_H__
+#ifndef EWL_ICONBOX_H
+#define EWL_ICONBOX_H
#define EWL_ICONBOX_ICON_PADDING 15
#define EWL_ICONBOX_MOVE_TOLERANCE 5
@@ -10,11 +10,11 @@
#include <time.h>
/**
- * @file ewl_iconbox.h
- * @defgroup Ewl_Iconbox Iconbox: The Icon Box Layout Container
- * @brief Defines the Ewl_Iconbox class, used to display a collection of icons
- * with annotations and support arranging/manipulating contained icons
+ * @defgroup Ewl_Iconbox Ewl_Iconbox: The Icon Box Layout Container
+ * Defines the Ewl_Iconbox class, used to display a collection of icons
+ * with annotations and support arranging/manipulating contained icons
*
+ * @{
*/
/**
@@ -24,6 +24,9 @@
#define EWL_ICONBOX_TYPE "iconbox"
+/**
+ * The Ewl_Iconbox
+ */
typedef struct Ewl_Iconbox Ewl_Iconbox;
typedef struct Ewl_Iconbox_Icon Ewl_Iconbox_Icon;
@@ -53,71 +56,65 @@
#define EWL_ICONBOX_ICON(icon) ((Ewl_Iconbox_Icon *) icon)
/**
- * @struct Ewl_Iconbox
- * Inherits from an Ewl_Container to provide layout facilities for child
widgets placed inside
+ * Inherits from an Ewl_Box to provide layout facilities for child widgets
placed inside
* Layout is either free-form, or auto-arranged to a grid.
*/
struct Ewl_Iconbox
{
- Ewl_Box box; /**< Inherit from Ewl_Container */
+ Ewl_Box box; /**< Inherit from Ewl_Box */
- Ewl_Widget *ewl_iconbox_scrollpane;
- Ewl_Widget *ewl_iconbox_pane_inner;
+ Ewl_Widget *ewl_iconbox_scrollpane; /**< The scrollpane */
+ Ewl_Widget *ewl_iconbox_pane_inner; /**< The inner pane */
- Ewl_Widget *ewl_iconbox_context_menu;
- Ewl_Widget *ewl_iconbox_context_menu_item;
- Ewl_Widget *ewl_iconbox_menu_floater;
- Ewl_Widget *ewl_iconbox_menu_box;
- Ewl_Widget *ewl_iconbox_view_menu;
-
- Ewl_Widget *icon_menu_floater;
- Ewl_Widget *icon_menu_item;
- Ewl_Widget *icon_menu;
-
-
- Ecore_List *ewl_iconbox_icon_list; /* The icon list */
- char *test;
-
- Ewl_Iconbox_Icon *drag_icon;
- Ewl_Iconbox_Icon *edit_icon;
- Ewl_Iconbox_Icon *select_icon;
-
- int xdown, ydown; /* Last icon button down x/y, for
edge resistence */
- int dx, dy; /* Drag start x/y */
- int lx, ly; /* Layout x, layout y */
- int ox, oy; /* Layout x offset, layout y offset
*/
- int iw, ih; /* Custom icon width/height*/
-
- /*Background*/
- Ewl_Widget *background;
-
- /* Objects for label editing..*/
- Ewl_Widget *entry;
- Ewl_Widget *entry_floater;
- Ewl_Widget *entry_box;
-
- /* Objects for selection */
- Ewl_Widget *select;
- Ewl_Widget *select_floater;
- int drag_box; /* Are we dragging? */
-
- /* Key event/repeat timer */
- struct timeval lasttime;
- void (*key_event_cb)(Ewl_Iconbox *ib, void *data, char *keyname);
- void *key_event_data;
+ Ewl_Widget *ewl_iconbox_context_menu; /**< The context menu */
+ Ewl_Widget *ewl_iconbox_context_menu_item; /**< Context menu item
*/
+ Ewl_Widget *ewl_iconbox_menu_floater; /**< The menu floater */
+ Ewl_Widget *ewl_iconbox_view_menu; /**< The view menu */
- /* Editable flag */
- int editable;
-};
+ Ewl_Widget *icon_menu_floater; /**< Icon menu floater */
+ Ewl_Widget *icon_menu_item; /**< Icon menu item */
+ Ewl_Widget *icon_menu; /**< Icon menu */
+
+
+ Ecore_List *ewl_iconbox_icon_list; /**< The icon list */
+
+ Ewl_Iconbox_Icon *drag_icon; /**< The drag icon */
+ Ewl_Iconbox_Icon *edit_icon; /**< The edit icon */
+ Ewl_Iconbox_Icon *select_icon; /**< The select icon */
+
+ int xdown, /**< Last icon button down x,
for edge resistence */
+ ydown; /**< Last icon button down y,
for edge resistence */
+ int dx, /**< Drag start x */
+ dy; /**< Drag start y */
+ int lx, /**< Layout x */
+ ly; /**< Layout y */
+ int ox, /**< Layout x offset */
+ oy; /**< Layout y offset */
+ int iw, /**< Custom icon width */
+ ih; /**< Custom icon height*/
+
+ Ewl_Widget *background; /**< Background */
+
+ Ewl_Widget *entry; /**< label editing entry */
+ Ewl_Widget *entry_floater; /**< Entry floater */
+ Ewl_Widget *entry_box; /**< Entry box */
+ Ewl_Widget *select; /**< selection */
+ Ewl_Widget *select_floater; /**< Selection floater */
+ int drag_box; /**< Are we dragging? */
+
+ struct timeval lasttime; /**< Last key event/repeat time
*/
+ void (*key_event_cb)(Ewl_Iconbox *ib, void *data, char *keyname); /**<
Key event callback */
+ void *key_event_data; /**< Key event data */
+
+ int editable; /**< Does the iconbox allow
editing */
+};
Ewl_Widget *ewl_iconbox_new(void);
Ewl_Widget *ewl_iconbox_icon_new(void);
int ewl_iconbox_init(Ewl_Iconbox *iconbox);
int ewl_iconbox_icon_init(Ewl_Iconbox_Icon *icon);
-
-/* External functions */
void ewl_iconbox_icon_size_custom_set(Ewl_Iconbox *ib, int w, int
h);
void ewl_iconbox_editable_set(Ewl_Iconbox *ib, int edit);
void ewl_iconbox_icon_arrange(Ewl_Iconbox *ib);
@@ -137,7 +134,9 @@
void *data);
Ecore_List *ewl_iconbox_get_selection(Ewl_Iconbox *ib);
-/* Internal callbacks */
+/*
+ * Internal callbacks
+ */
void ewl_iconbox_dnd_drop_cb(Ewl_Widget *item, void *ev_data, void *user_data);
void ewl_iconbox_dnd_position_cb(Ewl_Widget *item, void *ev_data, void
*user_data);
void ewl_iconbox_arrange_cb(Ewl_Widget *w, void *ev_data, void *user_data);
@@ -153,5 +152,9 @@
void ewl_iconbox_icon_destroy_cb(Ewl_Widget *w, void *ev_data ,void *user_data
);
void ewl_iconbox_key_press_cb (Ewl_Widget *w, void *ev_data, void *user_data);
+/**
+ * @}
+ */
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_image.c 6 Feb 2006 16:32:10 -0000 1.24
+++ ewl_image.c 17 Feb 2006 02:19:26 -0000 1.25
@@ -91,6 +91,7 @@
* @param i: The image to set the file into
* @param path: The path to set into the image
* @return Returns no value.
+ * @brief Sets the path to the image file
*/
void
ewl_image_file_path_set(Ewl_Image *i, const char *path)
@@ -124,6 +125,7 @@
* @param i: The image to set the key into
* @param key: The key to set into the image
* @return Returns no value.
+ * @brief Sets the key to use for the image
*/
void
ewl_image_file_key_set(Ewl_Image *i, const char *key)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_image.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_image.h 6 Feb 2006 16:32:10 -0000 1.14
+++ ewl_image.h 17 Feb 2006 02:19:26 -0000 1.15
@@ -1,9 +1,8 @@
-#ifndef __EWL_IMAGE_H__
-#define __EWL_IMAGE_H__
+#ifndef EWL_IMAGE_H
+#define EWL_IMAGE_H
/**
- * @file ewl_image.h
- * @defgroup Ewl_Image Image: An Image Display Widget
+ * @defgroup Ewl_Image Ewl_Image: An Image Display Widget
* Provides a widget for displaying evas loadable images, and edjes.
*
* @{
@@ -21,34 +20,45 @@
EWL_IMAGE_TYPE_NORMAL, /**< Standard image type */
EWL_IMAGE_TYPE_EDJE /**< Edje image type */
};
-
typedef enum Ewl_Image_Type Ewl_Image_Type;
+/**
+ * The Ewl_Image widget
+ */
typedef struct Ewl_Image Ewl_Image;
+/**
+ * @def EWL_IMAGE(image)
+ * Typecase a pointer to an Ewl_Image widget
+ */
#define EWL_IMAGE(image) ((Ewl_Image *) image)
/**
- * @struct Ewl_Image
- *
+ * Inherits from Ewl_Widget and extends to provide an image widget
*/
struct Ewl_Image
{
- Ewl_Widget widget;
- Ewl_Image_Type type;
- Evas_Object *image;
- char *path;
- char *key;
- char proportional;
- int ow, oh;
- double sw, sh;
- int cs;
- Evas_Coord aw, ah;
+ Ewl_Widget widget; /**< Inherit from Ewl_Widget */
+ Ewl_Image_Type type; /**< The type of the image */
+ Evas_Object *image; /**< The evas object for the image */
+ char *path; /**< The path to the image */
+ char *key; /**< The key for the image */
+ char proportional; /**< Is the image displayed
proportional */
+ int ow, /**< Original image width */
+ oh; /**< Original image height */
+ double sw, /**< Scale width */
+ sh; /**< Scale height */
+ int cs; /**< Constrain size */
+ Evas_Coord aw, /**< Scale width */
+ ah; /**< Scale height */
struct {
- int set;
- int x, y, w, h;
- } tile;
+ int set; /**< Tiling set? */
+ int x, /**< Tile x start */
+ y, /**< Tile y start */
+ w, /**< Tile width */
+ h; /**< Tile height */
+ } tile; /**< Image tiling information */
};
Ewl_Widget *ewl_image_new(void);
@@ -85,4 +95,4 @@
* @}
*/
-#endif /* __EWL_IMAGE_H__ */
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_object.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_object.h 30 Nov 2005 04:33:32 -0000 1.4
+++ ewl_object.h 17 Feb 2006 02:19:26 -0000 1.5
@@ -1,9 +1,8 @@
-#ifndef __EWL_OBJECT_H__
-#define __EWL_OBJECT_H__
+#ifndef EWL_OBJECT_H
+#define EWL_OBJECT_H
/**
- * @file ewl_object.h
- * @defgroup Ewl_Object Object: Basic Object Inherited by Ewl_Widget
+ * @defgroup Ewl_Object Ewl_Object: Basic Object Inherited by Ewl_Widget
* @brief Defines the Ewl_Object class along with methods and macros related
* to it.
*
@@ -11,11 +10,13 @@
*/
/**
- * @def EWL_OBJECT_MIN_SIZE The minimum possible size any object can receive.
+ * @def EWL_OBJECT_MIN_SIZE
+ * The minimum possible size any object can receive.
*/
#define EWL_OBJECT_MIN_SIZE (1)
/**
- * @def EWL_OBJECT_MIN_SIZE The maximum possible size any object can receive.
+ * @def EWL_OBJECT_MIN_SIZE
+ * The maximum possible size any object can receive.
*/
#define EWL_OBJECT_MAX_SIZE (INT_MAX)
@@ -26,8 +27,8 @@
typedef struct Ewl_Object Ewl_Object;
/**
- * @def EWL_OBJECT(object) A typecast for accessing the inherited object
- * fields.
+ * @def EWL_OBJECT(object)
+ * A typecast for accessing the inherited object fields.
*/
#define EWL_OBJECT(object) ((Ewl_Object *) object)
@@ -338,4 +339,4 @@
* @}
*/
-#endif /* __EWL_OBJECT_H__ */
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_statusbar.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_statusbar.h 12 Jan 2006 18:21:19 -0000 1.7
+++ ewl_statusbar.h 17 Feb 2006 02:19:26 -0000 1.8
@@ -1,9 +1,8 @@
-#ifndef __EWL_BAR_H__
-#define __EWL_BAR_H__
+#ifndef EWL_BAR_H
+#define EWL_BAR_H
/**
- * @file ewl_bar.h
- * @defgroup Ewl_Statusbar Bar: A status bar widget
+ * @defgroup Ewl_Statusbar Ewl_Statusbar: A status bar widget
* @brief Defines a class for displaying status bars
*
* @{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_tree2.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_tree2.h 6 Feb 2006 04:14:45 -0000 1.15
+++ ewl_tree2.h 17 Feb 2006 02:19:26 -0000 1.16
@@ -1,9 +1,8 @@
-#ifndef _EWL_TREE2_H
-#define _EWL_TREE2_H
+#ifndef EWL_TREE2_H
+#define EWL_TREE2_H
/**
- * @file ewl_tree2.h
- * @defgroup Ewl_Tree2 Tree: A Widget for List or Tree Layout
+ * @defgroup Ewl_Tree2 Ewl_Tree2: A Widget for List or Tree Layout
* @brief Defines a widget for laying out other widgets in a tree or list
* like manner. This also fulfills the functionality often seen in a table
* widget.
@@ -89,7 +88,6 @@
typedef struct Ewl_Tree2 Ewl_Tree2;
/**
- * @struct Ewl_Tree
* The tree is a columnar listing, where items in the list may be nested
* below other items.
*/
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
