Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
_ew_list.c _ew_list.h ew.c ew.h ew_dialog.c ew_dialog.h
ew_edjelist.c ew_edjelist.h ew_entry.c ew_entry.h
ew_fileselector.c ew_fileselector.h ew_messagebox.c
ew_messagebox.h ew_notice.c ew_notice.h ew_preview.c
ew_preview.h ew_textlist.c ew_textlist.h
Log Message:
Revert the Object Unification changes. Too many crashes and segfaults. We seem
to be missing something small and simple. This will have to be done after other
critical changes, so we can move along.
Oh... and i'm back out of crazy work :P
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- _ew_list.c 25 Aug 2006 11:49:18 -0000 1.10
+++ _ew_list.c 25 Sep 2006 19:08:56 -0000 1.11
@@ -3,10 +3,24 @@
static void _ew_list_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Down *, void *);
-Entrance_Widget
+Entrance_List
+__ew_list_new(void)
+{
+ Entrance_List el = calloc(1, sizeof(*el));
+ if(el)
+ {
+ el->owner = NULL;
+ el->box = NULL;
+ el->col = NULL;
+ }
+
+ return el;
+}
+
+Entrance_List
_ew_list_new(const char *title, int w, int h, int r_h)
{
- Entrance_Widget ew = ew_new();
+ Entrance_List ew = __ew_list_new();
if(!ew) {
return NULL;
}
@@ -19,14 +33,14 @@
etk_tree_headers_visible_set(ETK_TREE(ew->owner), ETK_FALSE);
etk_tree_row_height_set(ETK_TREE(ew->owner), r_h);
- ew->list_col = NULL;
+ ew->col = NULL;
return ew;
}
-Entrance_Widget
-_ew_list_buildtree(Entrance_Widget ew)
+Entrance_List
+_ew_list_buildtree(Entrance_List ew)
{
etk_tree_build(ETK_TREE(ew->owner));
@@ -62,14 +76,14 @@
}
void
-ew_list_first_row_select(Entrance_Widget el)
+ew_list_first_row_select(Entrance_List el)
{
Etk_Tree_Row *row = etk_tree_first_row_get(ETK_TREE(el->owner));
etk_tree_row_select(row);
}
void*
-ew_list_selected_data_get(Entrance_Widget el)
+ew_list_selected_data_get(Entrance_List el)
{
Etk_Tree_Row *row = etk_tree_selected_row_get(ETK_TREE(el->owner));
if(!row) {
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- _ew_list.h 23 Aug 2006 19:11:25 -0000 1.4
+++ _ew_list.h 25 Sep 2006 19:08:56 -0000 1.5
@@ -6,6 +6,35 @@
void *data;
} *Entrance_List_Data;
+
+typedef struct _Entrance_List {
+ Etk_Widget *owner;
+ Etk_Widget *box;
+ Etk_Tree_Col *col;
+} *Entrance_List;
+
+
+#define EW_LIST_FREE(ew) if(1) \
+{ \
+ if(ew) \
+ { \
+ if(ew->owner) \
+ { \
+ free(ew->owner); \
+ } \
+ if(ew->box) \
+ { \
+ free(ew->box); \
+ } \
+ if(ew->col) \
+ { \
+ free(ew->col); \
+ } \
+ free(ew); \
+ } \
+} \
+else \
+
#define EW_LIST_DATA_FREE(ewld) if(1) \
{ \
if(ewld) \
@@ -20,10 +49,10 @@
else \
-Entrance_Widget _ew_list_new(const char*, int, int, int);
-Entrance_Widget _ew_list_buildtree(Entrance_Widget);
+Entrance_List _ew_list_new(const char*, int, int, int);
+Entrance_List _ew_list_buildtree(Entrance_List);
Entrance_List_Data ew_listdata_new(void);
-void* ew_list_selected_data_get(Entrance_Widget);
-void ew_list_first_row_select(Entrance_Widget);
+void* ew_list_selected_data_get(Entrance_List);
+void ew_list_first_row_select(Entrance_List);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew.c 24 Aug 2006 12:58:14 -0000 1.4
+++ ew.c 25 Sep 2006 19:08:56 -0000 1.5
@@ -1,6 +1,7 @@
#include <etk/Etk.h>
#include "Entrance_Widgets.h"
+
int
ew_init(int *argc, char*** argv)
{
@@ -8,19 +9,19 @@
}
void
-ew_main(void)
+ew_main()
{
etk_main();
}
void
-ew_main_quit(void)
+ew_main_quit()
{
etk_main_quit();
}
int
-ew_shutdown(void)
+ew_shutdown()
{
return etk_shutdown();
}
@@ -33,30 +34,11 @@
{
ew->owner = NULL;
ew->box = NULL;
- ew->label = NULL;
- ew->dialog_hbox = NULL;
- ew->entry_control = NULL;
- ew->list_col = NULL;
- ew->preview_smart = NULL;
- ew->extra = NULL;
}
return ew;
}
-void
-ew_widget_destroy(Entrance_Widget ew) {
- EW_FREE(ew);
-}
-void
-ew_widget_extra_set(Entrance_Widget w, void *extra) {
- w->extra = extra;
-}
-
-void *
-ew_widget_extra_get(Entrance_Widget w) {
- return w->extra;
-}
/* privates */
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew.h 24 Aug 2006 13:15:22 -0000 1.5
+++ ew.h 25 Sep 2006 19:08:56 -0000 1.6
@@ -4,32 +4,25 @@
typedef struct _Entrance_Widget {
Etk_Widget *owner;
Etk_Widget *box;
- Etk_Widget *label;
- Etk_Widget *dialog_hbox;
- Etk_Widget *entry_control;
-
- Etk_Tree_Col *list_col;
- Evas_Object *preview_smart;
- void *extra;
} *Entrance_Widget;
-#define _EW_FREE(ew) if(ew) \
-{ \
- etk_object_destroy(ETK_OBJECT(ew)); \
-}
-#define EW_FREE(ew) if(ew) \
+#define EW_FREE(ew) if(1) \
{ \
- if(ew->owner) { _EW_FREE(ew->owner); } \
- if(ew->box) { _EW_FREE(ew->box); } \
- if(ew->label) { _EW_FREE(ew->label); } \
- if(ew->dialog_hbox) { _EW_FREE(ew->dialog_hbox); } \
- if(ew->entry_control) { _EW_FREE(ew->entry_control); } \
- if(ew->list_col) { _EW_FREE(ew->list_col); } \
- if(ew->preview_smart) { _EW_FREE(ew->preview_smart); } \
- if(ew->extra) { free(ew->extra); } \
+ if(ew) \
+ { \
+ if(ew->owner) \
+ { \
+ free(ew->owner); \
+ } \
+ if(ew->box) \
+ { \
+ free(ew->box); \
+ } \
free(ew); \
-}
+ } \
+} \
+else \
#define EW_FALSE 0
#define EW_TRUE 1
@@ -40,8 +33,5 @@
void ew_main_quit(void);
Entrance_Widget ew_new(void);
-void ew_widget_destroy(Entrance_Widget);
-void ew_widget_extra_set(Entrance_Widget, void *);
-void *ew_widget_extra_get(Entrance_Widget);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ew_dialog.c 24 Aug 2006 12:58:14 -0000 1.11
+++ ew_dialog.c 25 Sep 2006 19:08:56 -0000 1.12
@@ -2,12 +2,27 @@
#include "Entrance_Widgets.h"
static void _ew_cb_destroy(void *);
-static void _ew_dialog_add_bottom(Entrance_Widget d, Entrance_Widget ew);
+static void _ew_dialog_add_bottom(Entrance_Dialog d, Entrance_Widget ew);
-Entrance_Widget
+Entrance_Dialog
+_ew_dialog_new()
+{
+ Entrance_Dialog ed = calloc(1, sizeof(*ed));
+ if(ed)
+ {
+ ed->owner = NULL;
+ ed->box = NULL;
+ ed->hbox = NULL;
+ ed->extra = NULL;
+ }
+
+ return ed;
+}
+
+Entrance_Dialog
ew_dialog_new(const char *title, int toplevel)
{
- Entrance_Widget ew = ew_new();
+ Entrance_Dialog ew = _ew_dialog_new();
if(!ew)
{
return NULL;
@@ -27,7 +42,7 @@
}
void
-ew_dialog_show(Entrance_Widget ew)
+ew_dialog_show(Entrance_Dialog ew)
{
etk_dialog_pack_in_main_area(ETK_DIALOG(ew->owner), ew->box, ETK_TRUE,
ETK_TRUE,
0, ETK_FALSE);
@@ -37,7 +52,7 @@
Entrance_Widget
-ew_dialog_group_add(Entrance_Widget d, const char *title, int direction)
+ew_dialog_group_add(Entrance_Dialog d, const char *title, int direction)
{
Entrance_Widget ew = ew_group_new(title, direction);
if(!ew)
@@ -51,7 +66,7 @@
}
/*void
-ew_dialog_add(Entrance_Widget d, Entrance_Widget ew)
+ew_dialog_add(Entrance_Dialog d, Entrance_Widget ew)
{
if(d && ew)
etk_box_append(ETK_BOX(d->box), ew->box, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
@@ -59,7 +74,7 @@
void
-ew_dialog_button_add(Entrance_Widget ew, const char *title, void
(*func)(void*, void*), void *data)
+ew_dialog_button_add(Entrance_Dialog ew, const char *title, void
(*func)(void*, void*), void *data)
{
/*TODO: poke all buttons into an ecore_list*/
Entrance_Widget button = ew_button_new(title, func, data);
@@ -68,27 +83,27 @@
void
-ew_dialog_close_button_add(Entrance_Widget ew, void (*func)(void *, void*),
void *data)
+ew_dialog_close_button_add(Entrance_Dialog ew, void (*func)(void *, void*),
void *data)
{
ew_dialog_button_add(ew, _("Close"), func, data);
}
void
-ew_dialog_apply_button_add(Entrance_Widget ew, void (*func)(void *, void*),
void *data)
+ew_dialog_apply_button_add(Entrance_Dialog ew, void (*func)(void *, void*),
void *data)
{
ew_dialog_button_add(ew, _("Apply"), func, data);
}
void
-ew_dialog_ok_button_add(Entrance_Widget ew, void (*func)(void *, void*), void
*data)
+ew_dialog_ok_button_add(Entrance_Dialog ew, void (*func)(void *, void*), void
*data)
{
ew_dialog_button_add(ew, _("Ok"), func, data);
}
void
-ew_dialog_destroy(Entrance_Widget ew)
+ew_dialog_destroy(Entrance_Dialog ew)
{
- ew_widget_destroy(ew);
+ etk_object_destroy(ETK_OBJECT(ew->owner));
}
/*privates*/
@@ -99,7 +114,7 @@
}
static void
-_ew_dialog_add_bottom(Entrance_Widget d, Entrance_Widget ew)
+_ew_dialog_add_bottom(Entrance_Dialog d, Entrance_Widget ew)
{
if(d && ew)
etk_dialog_pack_widget_in_action_area(ETK_DIALOG(d->owner),
ETK_WIDGET(ew->owner), ETK_TRUE, ETK_TRUE, 10, ETK_TRUE);
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew_dialog.h 23 Aug 2006 19:11:25 -0000 1.5
+++ ew_dialog.h 25 Sep 2006 19:08:56 -0000 1.6
@@ -1,13 +1,41 @@
#ifndef _EW_DIALOG_H
#define _EW_DIALOG_H
-Entrance_Widget ew_dialog_new(const char*, int);
-void ew_dialog_show(Entrance_Widget);
-void ew_dialog_destroy(Entrance_Widget);
-void ew_dialog_add(Entrance_Widget, Entrance_Widget);
-void ew_dialog_close_button_add(Entrance_Widget ew, void (*func)(void *,
void*), void *);
-void ew_dialog_apply_button_add(Entrance_Widget ew, void (*func)(void *,
void*), void *);
-void ew_dialog_ok_button_add(Entrance_Widget ew, void (*func)(void *, void*),
void *);
-Entrance_Widget ew_dialog_group_add(Entrance_Widget, const char *, int);
+typedef struct _Entrance_Dialog {
+ Etk_Widget *owner;
+ Etk_Widget *box;
+ Etk_Widget *hbox;
+ void *extra;
+} *Entrance_Dialog;
+
+#define EW_DIALOG_FREE(ew) if(1) \
+{ \
+ if(ew) \
+ { \
+ if(ew->owner) \
+ { \
+ free(ew->owner); \
+ } \
+ if(ew->box) \
+ { \
+ free(ew->box); \
+ } \
+ if(ew->hbox) \
+ { \
+ free(ew->hbox); \
+ } \
+ free(ew); \
+ } \
+} \
+else \
+
+Entrance_Dialog ew_dialog_new(const char*, int);
+void ew_dialog_show(Entrance_Dialog);
+void ew_dialog_destroy(Entrance_Dialog);
+void ew_dialog_add(Entrance_Dialog, Entrance_Widget);
+void ew_dialog_close_button_add(Entrance_Dialog ew, void (*func)(void *,
void*), void *);
+void ew_dialog_apply_button_add(Entrance_Dialog ew, void (*func)(void *,
void*), void *);
+void ew_dialog_ok_button_add(Entrance_Dialog ew, void (*func)(void *, void*),
void *);
+Entrance_Widget ew_dialog_group_add(Entrance_Dialog, const char *, int);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_edjelist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew_edjelist.c 25 Aug 2006 11:49:18 -0000 1.5
+++ ew_edjelist.c 25 Sep 2006 19:08:56 -0000 1.6
@@ -5,21 +5,21 @@
static void _ew_tree_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Down *, void *);
-Entrance_Widget
+Entrance_List
ew_edjelist_new(const char *title, int w, int h, int r_h, int c_w)
{
- Entrance_Widget ew = _ew_list_new(title, w, h, r_h);
+ Entrance_List ew = _ew_list_new(title, w, h, r_h);
if(!ew) {
return NULL;
}
- ew->list_col = etk_tree_col_new(ETK_TREE(ew->owner), NULL,
etk_tree_model_icon_text_new(ETK_TREE(ew->owner), ETK_TREE_FROM_EDJE), c_w);
+ ew->col = etk_tree_col_new(ETK_TREE(ew->owner), NULL,
etk_tree_model_icon_text_new(ETK_TREE(ew->owner), ETK_TREE_FROM_EDJE), c_w);
return _ew_list_buildtree(ew);
}
void
-ew_edjelist_add(Entrance_Widget ew, const char *label, const char *edje, const
char *group, void *data, size_t size, void (*func) (void))
+ew_edjelist_add(Entrance_List ew, const char *label, const char *edje, const
char *group, void *data, size_t size, void (*func) (void))
{
Etk_Tree_Row *row;
etk_tree_freeze(ETK_TREE(ew->owner));
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_edjelist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_edjelist.h 23 Aug 2006 19:11:25 -0000 1.2
+++ ew_edjelist.h 25 Sep 2006 19:08:56 -0000 1.3
@@ -3,8 +3,8 @@
#include "_ew_list.h"
-Entrance_Widget ew_edjelist_new(const char*, int, int, int, int);
-void ew_edjelist_add(Entrance_Widget, const char *, const char *, const char*,
void *, size_t, void (*) (void));
+Entrance_List ew_edjelist_new(const char*, int, int, int, int);
+void ew_edjelist_add(Entrance_List, const char *, const char *, const char*,
void *, size_t, void (*) (void));
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ew_entry.c 24 Aug 2006 12:58:14 -0000 1.13
+++ ew_entry.c 25 Sep 2006 19:08:56 -0000 1.14
@@ -1,17 +1,33 @@
#include <Etk.h>
#include <Entrance_Widgets.h>
-Entrance_Widget
+
+Entrance_Entry
+_ew_entry_new(void)
+{
+ Entrance_Entry ee = calloc(1, sizeof(*ee));
+ if(ee)
+ {
+ ee->owner = NULL;
+ ee->box = NULL;
+ ee->label = NULL;
+ ee->control = NULL;
+ }
+
+ return ee;
+}
+
+Entrance_Entry
ew_entry_new(const char *label, const char *text, int ispassword)
{
- Entrance_Widget ew = ew_new();
+ Entrance_Entry ew = _ew_entry_new();
if(!ew)
{
return NULL;
}
ew->owner = etk_hbox_new(0, 10);
- ew->entry_control = etk_entry_new();
+ ew->control = etk_entry_new();
if(ispassword)
@@ -23,7 +39,7 @@
etk_box_append(ETK_BOX(ew->owner), ew->label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
}
- etk_box_append(ETK_BOX(ew->owner), ew->entry_control, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(ew->owner), ew->control, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
if(text)
{
ew_entry_set(ew, text);
@@ -32,28 +48,28 @@
}
const char*
-ew_entry_get(Entrance_Widget ew)
+ew_entry_get(Entrance_Entry ew)
{
- return etk_entry_text_get(ETK_ENTRY(ew->entry_control));
+ return etk_entry_text_get(ETK_ENTRY(ew->control));
}
void
-ew_entry_set(Entrance_Widget ew, const char *text)
+ew_entry_set(Entrance_Entry ew, const char *text)
{
if(ew)
- etk_entry_text_set(ETK_ENTRY(ew->entry_control), text);
+ etk_entry_text_set(ETK_ENTRY(ew->control), text);
}
void
-ew_entry_password_set(Entrance_Widget ew)
+ew_entry_password_set(Entrance_Entry ew)
{
if(ew)
- etk_entry_password_mode_set(ETK_ENTRY(ew->entry_control),
ETK_TRUE);
+ etk_entry_password_mode_set(ETK_ENTRY(ew->control), ETK_TRUE);
}
void
-ew_entry_password_clear(Entrance_Widget ew)
+ew_entry_password_clear(Entrance_Entry ew)
{
if(ew)
- etk_entry_password_mode_set(ETK_ENTRY(ew->entry_control),
ETK_FALSE);
+ etk_entry_password_mode_set(ETK_ENTRY(ew->control), ETK_FALSE);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ew_entry.h 23 Aug 2006 19:11:25 -0000 1.8
+++ ew_entry.h 25 Sep 2006 19:08:56 -0000 1.9
@@ -1,11 +1,43 @@
#ifndef _EW_ENTRY_H
#define _EW_ENTRY_H
-Entrance_Widget ew_entry_new(const char *label, const char *text, int
ispassword);
-const char* ew_entry_get(Entrance_Widget);
-void ew_entry_set(Entrance_Widget ew, const char *text);
-void ew_entry_password_set(Entrance_Widget ew);
-void ew_entry_password_clear(Entrance_Widget ew);
+typedef struct _Entrance_Entry {
+ Etk_Widget *owner;
+ Etk_Widget *box;
+ Etk_Widget *label;
+ Etk_Widget *control;
+} *Entrance_Entry;
+
+#define EW_ENTRY_FREE(ew) if(1) \
+{ \
+ if(ew) \
+ { \
+ if(ew->owner) \
+ { \
+ free(ew->owner); \
+ } \
+ if(ew->box) \
+ { \
+ free(ew->box); \
+ } \
+ if(ew->label) \
+ { \
+ free(ew->label); \
+ } \
+ if(ew->control) \
+ { \
+ free(ew->control); \
+ } \
+ free(ew); \
+ } \
+} \
+else \
+
+Entrance_Entry ew_entry_new(const char *label, const char *text, int
ispassword);
+const char* ew_entry_get(Entrance_Entry);
+void ew_entry_set(Entrance_Entry ew, const char *text);
+void ew_entry_password_set(Entrance_Entry ew);
+void ew_entry_password_clear(Entrance_Entry ew);
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_fileselector.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_fileselector.c 24 Aug 2006 12:58:14 -0000 1.3
+++ ew_fileselector.c 25 Sep 2006 19:08:56 -0000 1.4
@@ -1,18 +1,18 @@
#include "Entrance_Widgets.h"
-Entrance_Widget
+Entrance_Dialog
ew_fileselector_new(const char *title, const char *directory, int multiple,
int showdot,
void (*response)(void *, int, void *), void *data) {
- Entrance_Widget dialog = ew_notice_new(title);
- dialog->dialog_hbox = etk_filechooser_widget_new();
+ Entrance_Dialog dialog = ew_notice_new(title);
+ dialog->hbox = etk_filechooser_widget_new();
if(directory)
-
etk_filechooser_widget_current_folder_set(ETK_FILECHOOSER_WIDGET(dialog->dialog_hbox),
directory);
+
etk_filechooser_widget_current_folder_set(ETK_FILECHOOSER_WIDGET(dialog->hbox),
directory);
-
etk_filechooser_widget_select_multiple_set(ETK_FILECHOOSER_WIDGET(dialog->dialog_hbox),
multiple);
-
etk_filechooser_widget_show_hidden_set(ETK_FILECHOOSER_WIDGET(dialog->dialog_hbox),
showdot);
+
etk_filechooser_widget_select_multiple_set(ETK_FILECHOOSER_WIDGET(dialog->hbox),
multiple);
+
etk_filechooser_widget_show_hidden_set(ETK_FILECHOOSER_WIDGET(dialog->hbox),
showdot);
- etk_box_append(ETK_BOX(dialog->box), dialog->dialog_hbox,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(dialog->box), dialog->hbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
ew_notice_cancel_button_add(dialog, response, data);
ew_notice_ok_button_add(dialog, NULL, NULL);
@@ -21,11 +21,11 @@
}
const char *
-ew_fileselector_file_get(Entrance_Widget dialog) {
- return
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(dialog->dialog_hbox));
+ew_fileselector_file_get(Entrance_Dialog dialog) {
+ return
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(dialog->hbox));
}
Evas_List *
-ew_fileselector_file_list_get(Entrance_Widget dialog) {
- return
etk_filechooser_widget_selected_files_get(ETK_FILECHOOSER_WIDGET(dialog->dialog_hbox));
+ew_fileselector_file_list_get(Entrance_Dialog dialog) {
+ return
etk_filechooser_widget_selected_files_get(ETK_FILECHOOSER_WIDGET(dialog->hbox));
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_fileselector.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_fileselector.h 23 Aug 2006 19:11:25 -0000 1.2
+++ ew_fileselector.h 25 Sep 2006 19:08:56 -0000 1.3
@@ -1,10 +1,10 @@
#ifndef _EW_FILESELECTOR_H
#define _EW_FILESELECTOR_H
-Entrance_Widget ew_fileselector_new(const char *title, const char *folder, int
multiple,
+Entrance_Dialog ew_fileselector_new(const char *title, const char *folder, int
multiple,
int showdot, void (*response_callback)(void *, int, void *),
void *data);
-const char *ew_fileselector_file_get(Entrance_Widget);
-Evas_List *ew_fileselector_file_list_get(Entrance_Widget);
+const char *ew_fileselector_file_get(Entrance_Dialog);
+Evas_List *ew_fileselector_file_list_get(Entrance_Dialog);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ew_messagebox.c 23 Aug 2006 19:11:25 -0000 1.9
+++ ew_messagebox.c 25 Sep 2006 19:08:56 -0000 1.10
@@ -6,10 +6,10 @@
static void _ew_messagebox_cb_ok(void *, int, void *);
-Entrance_Widget
+Entrance_Dialog
_ew_messagebox_new(const char *title, const char *message, const char *icon)
{
- Entrance_Widget ew = ew_notice_new(title);
+ Entrance_Dialog ew = ew_notice_new(title);
Entrance_Widget group;
Entrance_Widget _image;
Entrance_Widget _text;
@@ -41,19 +41,19 @@
return ew;
}
-Entrance_Widget
+Entrance_Dialog
ew_messagebox_ok(const char *title, const char *message, const char *icon)
{
- Entrance_Widget ew = _ew_messagebox_new(title, message, icon);
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_ok_button_add(ew, _ew_messagebox_cb_ok, ew);
ew_notice_show(ew);
return ew;
}
-Entrance_Widget
+Entrance_Dialog
ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
- Entrance_Widget ew = _ew_messagebox_new(title, message, icon);
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_ok_button_add(ew, funct, NULL);
ew_notice_cancel_button_add(ew, NULL, NULL);
@@ -61,9 +61,9 @@
return ew;
}
-Entrance_Widget
+Entrance_Dialog
ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, int, void *)) {
- Entrance_Widget ew = _ew_messagebox_new(title, message, icon);
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
ew_notice_no_button_add(ew, NULL, NULL);
@@ -71,9 +71,9 @@
return ew;
}
-Entrance_Widget
+Entrance_Dialog
ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
- Entrance_Widget ew = _ew_messagebox_new(title, message, icon);
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
ew_notice_no_button_add(ew, NULL, NULL);
ew_notice_cancel_button_add(ew, NULL, NULL);
@@ -84,6 +84,6 @@
static void
_ew_messagebox_cb_ok(void *win, int response_type, void *data) {
- Entrance_Widget ew = data;
+ Entrance_Dialog ew = data;
ew_dialog_destroy(ew);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ew_messagebox.h 23 Aug 2006 19:11:25 -0000 1.6
+++ ew_messagebox.h 25 Sep 2006 19:08:56 -0000 1.7
@@ -7,10 +7,10 @@
#define EW_MESSAGEBOX_ICON_WARNING "warning"
#define EW_MESSAGEBOX_ICON_ERROR "error"
-Entrance_Widget ew_messagebox_ok(const char *type, const char *title, const
char *message);
-Entrance_Widget ew_messagebox_ok_cancel(const char *, const char *, const char
*, void (*)(void *, int, void *));
-Entrance_Widget ew_messagebox_yes_no(const char *, const char *, const char *,
void (*)(void *, int, void *));
-Entrance_Widget ew_messagebox_yes_no_cancel(const char *, const char *, const
char *, void (*)(void *, int, void *));
+Entrance_Dialog ew_messagebox_ok(const char *type, const char *title, const
char *message);
+Entrance_Dialog ew_messagebox_ok_cancel(const char *, const char *, const char
*, void (*)(void *, int, void *));
+Entrance_Dialog ew_messagebox_yes_no(const char *, const char *, const char *,
void (*)(void *, int, void *));
+Entrance_Dialog ew_messagebox_yes_no_cancel(const char *, const char *, const
char *, void (*)(void *, int, void *));
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ew_notice.c 23 Aug 2006 19:11:25 -0000 1.8
+++ ew_notice.c 25 Sep 2006 19:08:56 -0000 1.9
@@ -4,10 +4,10 @@
static void _ew_cb_destroy(void *);
static void _ew_cb_emit_response(Etk_Object *, void *data);
-Entrance_Widget
+Entrance_Dialog
ew_notice_new(const char *title)
{
- Entrance_Widget ew = ew_dialog_new(title, EW_FALSE);
+ Entrance_Dialog ew = ew_dialog_new(title, EW_FALSE);
if(!ew)
{
return NULL;
@@ -18,13 +18,13 @@
}
void
-ew_notice_show(Entrance_Widget ew)
+ew_notice_show(Entrance_Dialog ew)
{
ew_dialog_show(ew);
}
Entrance_Widget
-ew_notice_group_add(Entrance_Widget d, const char *title, int direction)
+ew_notice_group_add(Entrance_Dialog d, const char *title, int direction)
{
Entrance_Widget ew = ew_group_new(title, direction);
if(!ew)
@@ -38,7 +38,7 @@
}
void
-ew_notice_button_add(Entrance_Widget ew, const char *name, int response_id,
void (*response_event)(void *, int, void *), void *data)
+ew_notice_button_add(Entrance_Dialog ew, const char *name, int response_id,
void (*response_event)(void *, int, void *), void *data)
{
Etk_Widget *btn = etk_dialog_button_add(ETK_DIALOG(ew->owner), name,
response_id);
if(response_event && !ew->extra) {
@@ -48,40 +48,40 @@
}
void
-ew_notice_close_button_add(Entrance_Widget ew, void (*response_event)(void *,
int, void *), void *data)
+ew_notice_close_button_add(Entrance_Dialog ew, void (*response_event)(void *,
int, void *), void *data)
{
ew_notice_button_add(ew, _("Close"), EW_NOTICE_CLOSE_BUTTON,
response_event, data);
}
void
-ew_notice_apply_button_add(Entrance_Widget ew, void (*response_event)(void *,
int, void *), void *data)
+ew_notice_apply_button_add(Entrance_Dialog ew, void (*response_event)(void *,
int, void *), void *data)
{
ew_notice_button_add(ew, _("Apply"), EW_NOTICE_APPLY_BUTTON,
response_event, data);
}
void
-ew_notice_ok_button_add(Entrance_Widget ew, void (*response_event)(void *,
int, void *), void *data)
+ew_notice_ok_button_add(Entrance_Dialog ew, void (*response_event)(void *,
int, void *), void *data)
{
ew_notice_button_add(ew, _("Ok"), EW_NOTICE_OK_BUTTON, response_event,
data);
}
void
-ew_notice_yes_button_add(Entrance_Widget ew, void (*response_event)(void *,
int, void *), void *data) {
+ew_notice_yes_button_add(Entrance_Dialog ew, void (*response_event)(void *,
int, void *), void *data) {
ew_notice_button_add(ew, _("Yes"), EW_NOTICE_YES_BUTTON,
response_event, data);
}
void
-ew_notice_no_button_add(Entrance_Widget ew, void (*response_event)(void *,
int, void *), void *data) {
+ew_notice_no_button_add(Entrance_Dialog ew, void (*response_event)(void *,
int, void *), void *data) {
ew_notice_button_add(ew, _("No"), EW_NOTICE_NO_BUTTON, response_event,
data);
}
void
-ew_notice_cancel_button_add(Entrance_Widget ew, void (*response_event)(void *,
int, void *), void *data) {
+ew_notice_cancel_button_add(Entrance_Dialog ew, void (*response_event)(void *,
int, void *), void *data) {
ew_notice_button_add(ew, _("Cancel"), EW_NOTICE_CANCEL_BUTTON,
response_event, data);
}
void
-ew_notice_destroy(Entrance_Widget ew)
+ew_notice_destroy(Entrance_Dialog ew)
{
ew_dialog_destroy(ew);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ew_notice.h 23 Aug 2006 19:11:25 -0000 1.6
+++ ew_notice.h 25 Sep 2006 19:08:56 -0000 1.7
@@ -8,17 +8,17 @@
#define EW_NOTICE_NO_BUTTON -9
#define EW_NOTICE_APPLY_BUTTON -10
-Entrance_Widget ew_notice_new(const char *);
-void ew_notice_show(Entrance_Widget);
-Entrance_Widget ew_notice_group_add(Entrance_Widget, const char *, int);
-void ew_notice_destroy(Entrance_Widget);
+Entrance_Dialog ew_notice_new(const char *);
+void ew_notice_show(Entrance_Dialog);
+Entrance_Widget ew_notice_group_add(Entrance_Dialog, const char *, int);
+void ew_notice_destroy(Entrance_Dialog);
-void ew_notice_button_add(Entrance_Widget, const char*, int, void (*)(void *,
int, void *), void *);
-void ew_notice_close_button_add(Entrance_Widget, void (*)(void *, int, void
*), void *);
-void ew_notice_apply_button_add(Entrance_Widget, void (*)(void *, int, void
*), void *);
-void ew_notice_ok_button_add(Entrance_Widget, void (*)(void *, int, void *),
void *);
-void ew_notice_yes_button_add(Entrance_Widget, void (*)(void *, int, void *),
void *);
-void ew_notice_no_button_add(Entrance_Widget, void (*)(void *, int, void *),
void *);
-void ew_notice_cancel_button_add(Entrance_Widget, void (*)(void *, int, void
*), void *);
+void ew_notice_button_add(Entrance_Dialog, const char*, int, void (*)(void *,
int, void *), void *);
+void ew_notice_close_button_add(Entrance_Dialog, void (*)(void *, int, void
*), void *);
+void ew_notice_apply_button_add(Entrance_Dialog, void (*)(void *, int, void
*), void *);
+void ew_notice_ok_button_add(Entrance_Dialog, void (*)(void *, int, void *),
void *);
+void ew_notice_yes_button_add(Entrance_Dialog, void (*)(void *, int, void *),
void *);
+void ew_notice_no_button_add(Entrance_Dialog, void (*)(void *, int, void *),
void *);
+void ew_notice_cancel_button_add(Entrance_Dialog, void (*)(void *, int, void
*), void *);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_preview.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_preview.c 23 Aug 2006 19:11:25 -0000 1.2
+++ ew_preview.c 25 Sep 2006 19:08:56 -0000 1.3
@@ -3,10 +3,24 @@
#include <Esmart_Preview.h>
#include "Entrance_Widgets.h"
-Entrance_Widget
+Entrance_Preview
+_ew_preview_new(void)
+{
+ Entrance_Preview ep = calloc(1, sizeof(*ep));
+ if(ep)
+ {
+ ep->owner = NULL;
+ ep->box = NULL;
+ ep->preview_smart = NULL;
+ }
+
+ return ep;
+}
+
+Entrance_Preview
ew_preview_new(int w, int h)
{
- Entrance_Widget ep = ew_new();
+ Entrance_Preview ep = _ew_preview_new();
if(!ep)
return NULL;
@@ -17,7 +31,7 @@
}
Evas*
-ew_preview_evas_get(Entrance_Widget ep, int w, int h, int vw, int vh)
+ew_preview_evas_get(Entrance_Preview ep, int w, int h, int vw, int vh)
{
if(ep->preview_smart)
esmart_preview_evas_get(ep->preview_smart);
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_preview.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_preview.h 23 Aug 2006 19:11:25 -0000 1.2
+++ ew_preview.h 25 Sep 2006 19:08:56 -0000 1.3
@@ -1,6 +1,13 @@
#ifndef _EW_PREVIEW_H
#define _EW_PREVIEW_H
-Entrance_Widget ew_preview_new(int w, int h);
-Evas *ew_preview_evas_get(Entrance_Widget ep, int w, int h, int vw, int vh);
+typedef struct _Entrance_Preview {
+ Etk_Widget *owner;
+ Etk_Widget *box;
+ Evas_Object *preview_smart;
+} *Entrance_Preview;
+
+
+Entrance_Preview ew_preview_new(int w, int h);
+Evas *ew_preview_evas_get(Entrance_Preview ep, int w, int h, int vw, int vh);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_textlist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew_textlist.c 25 Aug 2006 11:49:18 -0000 1.5
+++ ew_textlist.c 25 Sep 2006 19:08:56 -0000 1.6
@@ -5,21 +5,21 @@
static void _ew_tree_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Down *, void *);
-Entrance_Widget
+Entrance_List
ew_textlist_new(const char *title, int w, int h, int r_h, int c_w)
{
- Entrance_Widget ew = _ew_list_new(title, w, h, r_h);
+ Entrance_List ew = _ew_list_new(title, w, h, r_h);
if(!ew) {
return NULL;
}
- ew->list_col = etk_tree_col_new(ETK_TREE(ew->owner), NULL,
etk_tree_model_text_new(ETK_TREE(ew->owner)), c_w);
+ ew->col = etk_tree_col_new(ETK_TREE(ew->owner), NULL,
etk_tree_model_text_new(ETK_TREE(ew->owner)), c_w);
return _ew_list_buildtree(ew);
}
void
-ew_textlist_add(Entrance_Widget ew, const char *label, void *data, size_t size,
+ew_textlist_add(Entrance_List ew, const char *label, void *data, size_t size,
void (*func) (void))
{
Etk_Tree_Row *row;
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_textlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_textlist.h 23 Aug 2006 19:11:25 -0000 1.2
+++ ew_textlist.h 25 Sep 2006 19:08:56 -0000 1.3
@@ -3,8 +3,8 @@
#include "_ew_list.h"
-Entrance_Widget ew_textlist_new(const char*, int, int, int, int);
-void ew_textlist_add(Entrance_Widget, const char *, void *, size_t, void (*)
(void));
+Entrance_List ew_textlist_new(const char*, int, int, int, int);
+void ew_textlist_add(Entrance_List, const char *, void *, size_t, void (*)
(void));
#endif
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
