Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_file_dialog
Modified Files:
Esmart_File_Dialog.h esmart_file_dialog.c
Log Message:
esmart_file_dialog api tweaks. incompatible, sorry.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_file_dialog/Esmart_File_Dialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Esmart_File_Dialog.h 10 Nov 2004 15:22:39 -0000 1.2
+++ Esmart_File_Dialog.h 2 May 2005 17:27:41 -0000 1.3
@@ -9,12 +9,14 @@
{
#endif
-#define FILE_NEW 1
-#define FILE_RENAME 2
-#define FILE_DELETE 3
-#define FILE_OK 4
-#define FILE_CANCEL 5
-#define DIR_CHANGED 6
+typedef enum {
+ ESMART_FILE_DIALOG_NEW = 1,
+ ESMART_FILE_DIALOG_RENAME,
+ ESMART_FILE_DIALOG_DELETE,
+ ESMART_FILE_DIALOG_OK,
+ ESMART_FILE_DIALOG_CANCEL,
+ ESMART_FILE_DIALOG_DIR_CHANGED,
+} Esmart_File_Dialog_Op;
/**
* esmart_file_dialog_new
@@ -26,7 +28,7 @@
void esmart_file_dialog_callback_add (Evas_Object * efd,
void (*func) (void *data,
Evas_Object * edje,
- int type), void *data);
+ Esmart_File_Dialog_Op
op), void *data);
Evas_Object *esmart_file_dialog_edje_get (Evas_Object * efd);
Evas_List *esmart_file_dialog_selections_get (Evas_Object * efd);
const char *esmart_file_dialog_current_directory_get (Evas_Object * efd);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_file_dialog/esmart_file_dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- esmart_file_dialog.c 10 Nov 2004 15:22:39 -0000 1.2
+++ esmart_file_dialog.c 2 May 2005 17:27:41 -0000 1.3
@@ -35,7 +35,7 @@
char *path; /* the cwd for the dialog */
/* the client callback for intercepting file dialog specific stuff */
- void (*func) (void *data, Evas_Object * edje, int type);
+ void (*func) (void *data, Evas_Object * edje, Esmart_File_Dialog_Op type);
/* the data that's passed to the file dialog callback */
void *fdata;
@@ -268,7 +268,7 @@
void
esmart_file_dialog_callback_add (Evas_Object * efd,
void (*func) (void *data, Evas_Object * edje,
- int type), void *data)
+ Esmart_File_Dialog_Op type),
void *data)
{
Esmart_File_Dialog *fddata;
@@ -524,7 +524,7 @@
}
fddata->selections =
evas_list_append (fddata->selections, txt);
- fddata->func (fddata->fdata, obj, FILE_OK);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_OK);
fddata->selections =
evas_list_free (fddata->selections);
}
@@ -581,7 +581,7 @@
{
fprintf (stderr, "Load Request: %s\n", txt);
fddata->selections = evas_list_append (fddata->selections, txt);
- fddata->func (fddata->fdata, obj, FILE_OK);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_OK);
fddata->selections = evas_list_free (fddata->selections);
}
}
@@ -606,14 +606,14 @@
{
if (fddata->func)
{
- fddata->func (fddata->fdata, obj, FILE_CANCEL);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_CANCEL);
}
}
else if (!strcmp (emission, "e,fd,button,global,ok"))
{
if (fddata->func)
{
- fddata->func (fddata->fdata, obj, FILE_OK);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_OK);
}
}
else
@@ -638,21 +638,21 @@
{
if (fddata->func)
{
- fddata->func (fddata->fdata, obj, FILE_NEW);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_NEW);
}
}
else if (!strcmp (emission, "e,fd,button,file,rename"))
{
if (fddata->func)
{
- fddata->func (fddata->fdata, obj, FILE_RENAME);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_RENAME);
}
}
else if (!strcmp (emission, "e,fd,button,file,delete"))
{
if (fddata->func)
{
- fddata->func (fddata->fdata, obj, FILE_DELETE);
+ fddata->func (fddata->fdata, obj, ESMART_FILE_DIALOG_DELETE);
}
}
else
@@ -1014,7 +1014,7 @@
closedir (dir);
esmart_container_sort (data->files, sort_cb);
esmart_container_sort (data->directories, sort_cb);
- data->func (data->fdata, o, DIR_CHANGED);
+ data->func (data->fdata, o, ESMART_FILE_DIALOG_DIR_CHANGED);
}
else
{
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
