Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
_ew_list.c ew_dialog.c ew_dialog.h ew_entry.c ew_group.c
ew_messagebox.c ew_messagebox.h ew_notice.c ew_notice.h
Log Message:
I don't know what is this etk_box_append(), but there were a lot of it, and has
to be
wiped out, because doesn't exists. Also, fixed the messageboxes, now they work
again.
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- _ew_list.c 15 Aug 2006 19:57:27 -0000 1.5
+++ _ew_list.c 16 Aug 2006 09:18:41 -0000 1.6
@@ -57,7 +57,7 @@
ew->box = etk_vbox_new(0,10);
/*etk_box_append(ETK_BOX(ew->box), hbox, ETK_BOX_START,
ETK_BOX_EXPAND, 0);*/
- etk_box_append(ETK_BOX(ew->box), ew->owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_pack_start(ETK_BOX(ew->box), ew->owner, ETK_TRUE, ETK_TRUE,
0);
return ew;
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ew_dialog.c 15 Aug 2006 19:57:27 -0000 1.7
+++ ew_dialog.c 16 Aug 2006 09:18:41 -0000 1.8
@@ -13,6 +13,7 @@
ed->owner = NULL;
ed->box = NULL;
ed->hbox = NULL;
+ ed->extra = NULL;
}
return ed;
@@ -59,7 +60,7 @@
return;
}
- etk_box_append(ETK_BOX(d->box), ew->owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_pack_start(ETK_BOX(d->box), ew->owner, ETK_TRUE, ETK_TRUE, 0);
return ew;
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_dialog.h 14 Aug 2006 17:08:55 -0000 1.3
+++ ew_dialog.h 16 Aug 2006 09:18:41 -0000 1.4
@@ -5,6 +5,7 @@
Etk_Widget *owner;
Etk_Widget *box;
Etk_Widget *hbox;
+ void *extra;
} *Entrance_Dialog;
#define EW_DIALOG_FREE(ew) if(1) \
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew_entry.c 16 Aug 2006 04:18:03 -0000 1.5
+++ ew_entry.c 16 Aug 2006 09:18:41 -0000 1.6
@@ -36,10 +36,10 @@
if(label)
{
ew->label = etk_label_new(label);
- etk_box_append(ETK_BOX(ew->owner), ew->label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_pack_start(ETK_BOX(ew->owner), ew->label, ETK_TRUE,
ETK_TRUE, 0);
}
- etk_box_append(ETK_BOX(ew->owner), ew->control, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_pack_start(ETK_BOX(ew->owner), ew->control, ETK_TRUE, ETK_TRUE,
0);
if(text)
{
ew_entry_set(ew, text);
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_group.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew_group.c 15 Aug 2006 19:57:27 -0000 1.4
+++ ew_group.c 16 Aug 2006 09:18:41 -0000 1.5
@@ -33,6 +33,6 @@
}
Entrance_Widget ew = w;
- etk_box_append(ETK_BOX(g->box), ew->owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_pack_start(ETK_BOX(g->box), ew->owner, ETK_TRUE, ETK_TRUE, 0);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ew_messagebox.c 15 Aug 2006 20:11:12 -0000 1.6
+++ ew_messagebox.c 16 Aug 2006 09:18:41 -0000 1.7
@@ -52,31 +52,31 @@
}
Entrance_Dialog
-ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, void *)) {
+ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_ok_button_add(ew, funct, NULL);
- ew_notice_cancel_button_add(ew, funct, NULL);
+ ew_notice_cancel_button_add(ew, NULL, NULL);
ew_notice_show(ew);
return ew;
}
Entrance_Dialog
-ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, void *)) {
+ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, int, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
- ew_notice_no_button_add(ew, funct, NULL);
+ ew_notice_no_button_add(ew, NULL, NULL);
ew_notice_show(ew);
return ew;
}
Entrance_Dialog
-ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, void *)) {
+ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
- ew_notice_no_button_add(ew, funct, NULL);
- ew_notice_cancel_button_add(ew, funct, NULL);
+ ew_notice_no_button_add(ew, NULL, NULL);
+ ew_notice_cancel_button_add(ew, NULL, NULL);
ew_notice_show(ew);
return ew;
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew_messagebox.h 15 Aug 2006 14:46:35 -0000 1.4
+++ ew_messagebox.h 16 Aug 2006 09:18:41 -0000 1.5
@@ -8,9 +8,9 @@
#define EW_MESSAGEBOX_ICON_ERROR "error"
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 *, void *));
-Entrance_Dialog ew_messagebox_yes_no(const char *, const char *, const char *,
void (*)(void *, void *));
-Entrance_Dialog ew_messagebox_yes_no_cancel(const char *, const char *, const
char *, void (*)(void *, void *));
+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.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew_notice.c 15 Aug 2006 19:57:27 -0000 1.5
+++ ew_notice.c 16 Aug 2006 09:18:41 -0000 1.6
@@ -32,49 +32,51 @@
return;
}
- etk_box_append(ETK_BOX(d->box), ew->owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_pack_start(ETK_BOX(d->box), ew->owner, ETK_TRUE, ETK_TRUE, 0);
return ew;
}
void
-ew_notice_button_add(Entrance_Dialog ew, const char *name, int response_id,
void (*response_event)(void *, 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)
- etk_signal_connect("clicked", ETK_OBJECT(btn),
ETK_CALLBACK(response_event), data);
+ if(response_event && !ew->extra) {
+ etk_signal_connect("response", ETK_OBJECT(ew->owner),
ETK_CALLBACK(response_event), data);
+ ew->extra = response_event;
+ }
}
void
-ew_notice_close_button_add(Entrance_Dialog ew, void (*response_event)(void *,
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_Dialog ew, void (*response_event)(void *,
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_Dialog ew, void (*response_event)(void *,
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_Dialog ew, void (*response_event)(void *,
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_Dialog ew, void (*response_event)(void *,
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_Dialog ew, void (*response_event)(void *,
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);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_notice.h 15 Aug 2006 14:46:35 -0000 1.3
+++ ew_notice.h 16 Aug 2006 09:18:41 -0000 1.4
@@ -14,12 +14,12 @@
Entrance_Widget ew_notice_group_add(Entrance_Dialog, const char *, int);
void ew_notice_destroy(Entrance_Dialog);
-void ew_notice_button_add(Entrance_Dialog, const char*, int, void (*)(void *,
void *), void *);
-void ew_notice_close_button_add(Entrance_Dialog, void (*)(void *, void *),
void *);
-void ew_notice_apply_button_add(Entrance_Dialog, void (*)(void *, void *),
void *);
-void ew_notice_ok_button_add(Entrance_Dialog, void (*)(void *, void *), void
*);
-void ew_notice_yes_button_add(Entrance_Dialog, void (*)(void *, void *), void
*);
-void ew_notice_no_button_add(Entrance_Dialog, void (*)(void *, void *), void
*);
-void ew_notice_cancel_button_add(Entrance_Dialog, void (*)(void *, 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
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs