Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
controlcentre.c controlcentre.h ipc.c ipc.h msgbox.c note.c
saveload.c settings.c
Log Message:
Keeping up with EWL - more IPC foo - some bugs remain
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/controlcentre.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- controlcentre.c 29 Apr 2004 16:20:19 -0000 1.9
+++ controlcentre.c 24 Aug 2004 13:01:33 -0000 1.10
@@ -13,7 +13,7 @@
#include "controlcentre.h"
-extern MainConfig *main_config;
+ControlCentre *controlcentre;
/**
@@ -22,12 +22,14 @@
void
setup_cc(void)
{
- ControlCentre controlcentre;
- ControlCentre *cc = &controlcentre;
+ ControlCentre *cc;
char *edjefn = malloc(PATH_MAX);
char *fontpath = malloc(PATH_MAX);
Evas_Coord edje_w, edje_h;
+ cc=malloc(sizeof(ControlCentre));
+ controlcentre=cc;
+
/* Setup the Window */
cc->win = ecore_evas_software_x11_new(NULL, 0, 0, 0, 250, 250);
ecore_evas_title_set(cc->win, "Enotes");
@@ -63,7 +65,7 @@
evas_object_move(cc->edje, 0, 0);
evas_object_layer_set(cc->edje, 1);
evas_object_name_set(cc->edje, "edje");
- evas_object_pass_events_set(cc->edje, 1);
+ evas_object_pass_events_set(cc->edje, 0);
evas_object_show(cc->edje);
/* EDJE and ECORE min, max and resizing */
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/controlcentre.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- controlcentre.h 25 Apr 2004 16:25:50 -0000 1.5
+++ controlcentre.h 24 Aug 2004 13:01:33 -0000 1.6
@@ -50,6 +50,9 @@
Evas_Object *edje;
} ControlCentre;
+extern ControlCentre *controlcentre;
+extern MainConfig *main_config;
+
/* Setting the Control Centre up */
void setup_cc(void);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/ipc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ipc.c 11 Mar 2004 17:28:58 -0000 1.4
+++ ipc.c 24 Aug 2004 13:01:33 -0000 1.5
@@ -14,6 +14,7 @@
#include "ipc.h"
Ecore_Ipc_Server *mysvr;
+Ecore_Event_Handler *listenev;
/**
* @return: Integer stating whether a server is running.
@@ -50,7 +51,7 @@
mysvr = ecore_ipc_server_add(ECORE_IPC_LOCAL_USER,
IPC_NAME, IPC_PORT, NULL);
if (mysvr != NULL) {
- ecore_event_handler_add
+ listenev=ecore_event_handler_add
(ECORE_IPC_EVENT_CLIENT_DATA,
ipc_svr_data_recv, NULL);
}
@@ -67,14 +68,13 @@
void
send_to_server(char *msg)
{
- Ecore_Ipc_Server *p;
-
- if ((p =
+ if ((mysvr =
ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, IPC_NAME, IPC_PORT,
NULL)) != NULL) {
- ecore_ipc_server_send(p, 0, 0, 0, 0, 0, optarg,
- strlen(optarg) + 1);
- ecore_ipc_server_del(p);
+
+ ipc_send_message_with_mysvr(msg); /* To server */
+
+ ecore_ipc_server_del(mysvr);
} else {
return;
}
@@ -123,6 +123,20 @@
}
} else if (p->cmd == CLOSE) {
ecore_main_loop_quit();
+ } else if (p->cmd == CONTROLCENTRECLOSE) {
+ if (controlcentre!=NULL){
+ ecore_evas_free(controlcentre->win);
+ free(controlcentre);
+ controlcentre=NULL;
+ } else {
+ new_note_with_values (325, 0, "No Control
Centre to Close", "An IPC command was recieved which\nwants to close the
controlcentre.\n\nSince the control centre isn't currently\nopen, it wasn't possible
to do so!");
+ }
+ } else if (p->cmd == CONTROLCENTREOPEN) {
+ if (controlcentre==NULL){
+ setup_cc();
+ } else {
+ new_note_with_values (325, 0, "Control Centre
Already Open", "An IPC command was recieved which\nwants to open the control centre,
but the\ncontrol centre is already open!");
+ }
}
}
}
@@ -130,6 +144,19 @@
}
/**
+ * @param msg: The message to be sent to the connected host.
+ * @brief: Send a char message to the host.
+ */
+void
+ipc_send_message_with_mysvr (char *msg)
+{
+ if (msg!=NULL && mysvr != NULL)
+ ecore_ipc_server_send(mysvr, 0, 0, 0, 0, 0, msg, strlen(msg) + 1);
+ return;
+}
+
+
+/**
* @param msg: Message to parse.
* @return: Returns the RecvMsg variable containing the individual
* options and information.
@@ -176,6 +203,10 @@
p->cmd = NOTE;
} else if (!strcmp(one, "CLOSE")) {
p->cmd = CLOSE;
+ } else if (!strcmp(one, "CONTROLCENTREOPEN")) {
+ p->cmd = CONTROLCENTREOPEN;
+ } else if (!strcmp(one, "CONTROLCENTRECLOSE")) {
+ p->cmd = CONTROLCENTRECLOSE;
} else {
free(one);
free(p);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/ipc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ipc.h 7 Feb 2004 22:01:56 -0000 1.3
+++ ipc.h 24 Aug 2004 13:01:33 -0000 1.4
@@ -24,13 +24,16 @@
#include "note.h"
#include "storage.h"
#include "debug.h"
+#include "controlcentre.h"
#define IPC_NAME "enotes"
#define IPC_PORT 2323
typedef enum { /* More to come. :-) */
NOTE,
- CLOSE
+ CLOSE,
+ CONTROLCENTREOPEN,
+ CONTROLCENTRECLOSE
} MessageType;
typedef struct {
@@ -39,6 +42,7 @@
} RecvMsg;
extern Ecore_Ipc_Server *mysvr;
+extern Ecore_Event_Handler *listenev;
/* High Level */
int find_server(void);
@@ -47,8 +51,10 @@
/* Low Level */
int ipc_svr_data_recv(void *data, int type, void *event);
+int ipc_response_data_recv(void *data, int type, void *event);
RecvMsg *parse_message(char *msg);
int ipc_close_enotes(void *data);
char *fix_newlines(char *b);
+void ipc_send_message_with_mysvr (char *msg);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- msgbox.c 11 Mar 2004 17:28:58 -0000 1.3
+++ msgbox.c 24 Aug 2004 13:01:33 -0000 1.4
@@ -55,11 +55,11 @@
/* Setup the EWL Widgets */
mb->emb = ewl_embed_new();
- ewl_object_set_fill_policy((Ewl_Object *) mb->emb, EWL_FLAG_FILL_FILL);
- ewl_widget_set_appearance(mb->emb, "window");
+ ewl_object_fill_policy_set((Ewl_Object *) mb->emb, EWL_FLAG_FILL_FILL);
+ ewl_widget_appearance_set(mb->emb, "window");
ewl_widget_show(mb->emb);
- mb->eo = ewl_embed_set_evas((Ewl_Embed *) mb->emb, mb->evas, (void *)
+ mb->eo = ewl_embed_evas_set((Ewl_Embed *) mb->emb, mb->evas, (void *)
ecore_evas_software_x11_window_get(mb->
win));
evas_object_name_set(mb->eo, "eo");
@@ -69,21 +69,21 @@
evas_object_show(mb->eo);
mb->vbox = ewl_vbox_new();
- ewl_container_append_child((Ewl_Container *) mb->emb, mb->vbox);
- ewl_object_set_fill_policy((Ewl_Object *) mb->vbox, EWL_FLAG_FILL_FILL);
+ ewl_container_child_append((Ewl_Container *) mb->emb, mb->vbox);
+ ewl_object_fill_policy_set((Ewl_Object *) mb->vbox, EWL_FLAG_FILL_FILL);
ewl_widget_show(mb->vbox);
mb->msg = ewl_text_new(content);
- ewl_container_append_child((Ewl_Container *) mb->vbox, mb->msg);
- ewl_object_set_fill_policy((Ewl_Object *) mb->msg, EWL_FLAG_FILL_FILL);
+ ewl_container_child_append((Ewl_Container *) mb->vbox, mb->msg);
+ ewl_object_fill_policy_set((Ewl_Object *) mb->msg, EWL_FLAG_FILL_FILL);
ewl_widget_show(mb->msg);
mb->hbox = ewl_hbox_new();
- ewl_container_append_child((Ewl_Container *) mb->vbox, mb->hbox);
+ ewl_container_child_append((Ewl_Container *) mb->vbox, mb->hbox);
ewl_widget_show(mb->hbox);
mb->okbtn = ewl_button_new("Ok.");
- ewl_container_append_child((Ewl_Container *) mb->hbox, mb->okbtn);
+ ewl_container_child_append((Ewl_Container *) mb->hbox, mb->okbtn);
ewl_widget_show(mb->okbtn);
/* Ecore Callbacks */
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- note.c 5 May 2004 18:59:26 -0000 1.15
+++ note.c 24 Aug 2004 13:01:33 -0000 1.16
@@ -84,6 +84,8 @@
dml("Closing a Note", 2);
ecore_timer_del(p->timcomp);
+ p->timcomp=NULL;
+
ecore_evas_free(p->win);
free(p);
gbl_notes = evas_list_remove_list(gbl_notes, note);
@@ -98,7 +100,7 @@
if (saveload != NULL) {
dml("Removing note entry from saveload list", 2);
- ewl_tree_destroy_row((Ewl_Tree *) saveload->tree,
+ ewl_tree_row_destroy((Ewl_Tree *) saveload->tree,
p->saveload_row);
}
@@ -192,9 +194,9 @@
/* Ewl */
p->emb = ewl_embed_new();
- ewl_object_set_fill_policy((Ewl_Object *) p->emb, EWL_FLAG_FILL_FILL);
+ ewl_object_fill_policy_set((Ewl_Object *) p->emb, EWL_FLAG_FILL_FILL);
ewl_widget_show(p->emb);
- p->eo = ewl_embed_set_evas(EWL_EMBED(p->emb),
+ p->eo = ewl_embed_evas_set((Ewl_Embed*)p->emb,
ecore_evas_get(p->win), (void *)
ecore_evas_software_x11_window_get(p->win));
evas_object_layer_set(p->eo, 2);
@@ -203,20 +205,24 @@
evas_object_show(p->eo);
+ evas_object_focus_set (p->eo, TRUE);
+ ewl_embed_focus_set ((Ewl_Embed*)p->emb, TRUE);
+
+
p->vbox = ewl_vbox_new();
- ewl_object_set_fill_policy((Ewl_Object *) p->vbox, EWL_FLAG_FILL_FILL);
- ewl_container_append_child((Ewl_Container *) p->emb, p->vbox);
+ ewl_object_fill_policy_set((Ewl_Object *) p->vbox, EWL_FLAG_FILL_FILL);
+ ewl_container_child_append((Ewl_Container *) p->emb, p->vbox);
ewl_widget_show(p->vbox);
ewl_callback_append(p->emb, EWL_CALLBACK_CONFIGURE, note_move_embed,
p->vbox);
p->title = ewl_entry_new(title);
- ewl_container_append_child((Ewl_Container *) p->vbox, p->title);
+ ewl_container_child_append((Ewl_Container *) p->vbox, p->title);
ewl_widget_show(p->title);
- p->content = ewl_textarea_new(fcontent);
- ewl_container_append_child((Ewl_Container *) p->vbox, p->content);
+ p->content = ewl_text_new(fcontent);
+ ewl_container_child_append((Ewl_Container *) p->vbox, p->content);
ewl_widget_show(p->content);
/* Ecore Callbacks */
@@ -388,6 +394,8 @@
{
Note *p = (Note *) data;
+ if (p->timcomp==NULL) return(0);
+
if (p->txt_title != NULL) {
if (strcmp
(p->txt_title,
@@ -475,7 +483,7 @@
{
Note *p = evas_list_data(note);
- return ((char *) ewl_textarea_get_text((Ewl_TextArea *) p->content));
+ return ((char *) ewl_text_text_get((Ewl_Text *) p->content));
}
@@ -519,6 +527,6 @@
void
note_move_embed(Ewl_Widget * w, void *ev_data, void *user_data)
{
- ewl_object_request_geometry(EWL_OBJECT(user_data), CURRENT_X(w),
+ ewl_object_geometry_request(EWL_OBJECT(user_data), CURRENT_X(w),
CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w));
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- saveload.c 5 May 2004 18:59:26 -0000 1.9
+++ saveload.c 24 Aug 2004 13:01:33 -0000 1.10
@@ -65,13 +65,13 @@
/* Setup the EWL Widgets */
saveload->emb = ewl_embed_new();
- ewl_object_set_fill_policy((Ewl_Object *) saveload->emb,
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->emb,
EWL_FLAG_FILL_FILL);
- ewl_widget_set_appearance(saveload->emb, "window");
+ ewl_widget_appearance_set(saveload->emb, "window");
ewl_widget_show(saveload->emb);
saveload->eo =
- ewl_embed_set_evas((Ewl_Embed *) saveload->emb, saveload->evas,
+ ewl_embed_evas_set((Ewl_Embed *) saveload->emb, saveload->evas,
(void *)
ecore_evas_software_x11_window_get(saveload->
win));
@@ -81,10 +81,13 @@
evas_object_resize(saveload->eo, SAVELOAD_W, SAVELOAD_H);
evas_object_show(saveload->eo);
+ evas_object_focus_set (saveload->eo, TRUE);
+ ewl_embed_focus_set ((Ewl_Embed*)saveload->emb, TRUE);
+
saveload->vbox = ewl_vbox_new();
- ewl_container_append_child((Ewl_Container *) saveload->emb,
+ ewl_container_child_append((Ewl_Container *) saveload->emb,
saveload->vbox);
- ewl_object_set_fill_policy((Ewl_Object *) saveload->vbox,
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->vbox,
EWL_FLAG_FILL_FILL);
ewl_widget_show(saveload->vbox);
@@ -92,26 +95,26 @@
save_and_load_move_embed, saveload->vbox);
saveload->tree = ewl_tree_new(1);
- ewl_container_append_child((Ewl_Container *) saveload->vbox,
+ ewl_container_child_append((Ewl_Container *) saveload->vbox,
saveload->tree);
- ewl_object_set_fill_policy((Ewl_Object *) saveload->tree,
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->tree,
EWL_FLAG_FILL_FILL);
headers[0] = strdup("Note Title");
- ewl_tree_set_headers((Ewl_Tree *) saveload->tree, headers);
+ ewl_tree_headers_set((Ewl_Tree *) saveload->tree, headers);
free(headers[0]);
ewl_widget_show(saveload->tree);
saveload->txt_selected = ewl_text_new("Selected: N/A");
- ewl_container_append_child((Ewl_Container *) saveload->vbox,
+ ewl_container_child_append((Ewl_Container *) saveload->vbox,
saveload->txt_selected);
ewl_widget_show(saveload->txt_selected);
saveload->hbox = ewl_hbox_new();
- ewl_container_append_child((Ewl_Container *) saveload->vbox,
+ ewl_container_child_append((Ewl_Container *) saveload->vbox,
saveload->hbox);
- ewl_object_set_fill_policy((Ewl_Object *) saveload->hbox,
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->hbox,
EWL_FLAG_FILL_HFILL);
ewl_widget_show(saveload->hbox);
@@ -154,7 +157,7 @@
saveload_setup_button(Ewl_Widget * c, Ewl_Widget ** b, char *label)
{
*b = ewl_button_new(label);
- ewl_container_append_child((Ewl_Container *) c, *b);
+ ewl_container_child_append((Ewl_Container *) c, *b);
ewl_widget_show(*b);
return;
}
@@ -202,7 +205,7 @@
(void *) ewl_saveload_listitem_click, NULL);
ewl_widget_show(capt);
d->saveload_row =
- (Ewl_Row *) ewl_tree_add_row((Ewl_Tree *) tree, 0, &capt);
+ (Ewl_Row *) ewl_tree_row_add((Ewl_Tree *) tree, 0, &capt);
return;
}
@@ -288,9 +291,9 @@
{
char *tmp = malloc(MAX_TITLE);
- saveload_selected = ewl_text_get_text((Ewl_Text *) o);
+ saveload_selected = ewl_text_text_get((Ewl_Text *) o);
snprintf(tmp, MAX_TITLE, "Selected: %s", saveload_selected);
- ewl_text_set_text((Ewl_Text *) saveload->txt_selected, tmp);
+ ewl_text_text_set((Ewl_Text *) saveload->txt_selected, tmp);
free(tmp);
return;
}
@@ -392,12 +395,12 @@
/* Setup the EWL Widgets */
load->emb = ewl_embed_new();
- ewl_object_set_fill_policy((Ewl_Object *) load->emb,
+ ewl_object_fill_policy_set((Ewl_Object *) load->emb,
EWL_FLAG_FILL_FILL);
- ewl_widget_set_appearance(load->emb, "window");
+ ewl_widget_appearance_set(load->emb, "window");
ewl_widget_show(load->emb);
- load->eo = ewl_embed_set_evas((Ewl_Embed *) load->emb, load->evas,
+ load->eo = ewl_embed_evas_set((Ewl_Embed *) load->emb, load->evas,
(void *)
ecore_evas_software_x11_window_get(load->
win));
@@ -407,9 +410,12 @@
evas_object_resize(load->eo, LOAD_W, LOAD_H);
evas_object_show(load->eo);
+ evas_object_focus_set (load->eo, TRUE);
+ ewl_embed_focus_set ((Ewl_Embed*)load->emb, TRUE);
+
load->vbox = ewl_vbox_new();
- ewl_container_append_child((Ewl_Container *) load->emb, load->vbox);
- ewl_object_set_fill_policy((Ewl_Object *) load->vbox,
+ ewl_container_child_append((Ewl_Container *) load->emb, load->vbox);
+ ewl_object_fill_policy_set((Ewl_Object *) load->vbox,
EWL_FLAG_FILL_FILL);
ewl_widget_show(load->vbox);
@@ -417,24 +423,24 @@
save_and_load_move_embed, load->vbox);
load->tree = ewl_tree_new(1);
- ewl_container_append_child((Ewl_Container *) load->vbox, load->tree);
- ewl_object_set_fill_policy((Ewl_Object *) load->tree,
+ ewl_container_child_append((Ewl_Container *) load->vbox, load->tree);
+ ewl_object_fill_policy_set((Ewl_Object *) load->tree,
EWL_FLAG_FILL_FILL);
headers[0] = strdup("Note Title");
- ewl_tree_set_headers((Ewl_Tree *) load->tree, headers);
+ ewl_tree_headers_set((Ewl_Tree *) load->tree, headers);
free(headers[0]);
ewl_widget_show(load->tree);
load->txt_selected = ewl_text_new("Selected: N/A");
- ewl_container_append_child((Ewl_Container *) load->vbox,
+ ewl_container_child_append((Ewl_Container *) load->vbox,
load->txt_selected);
ewl_widget_show(load->txt_selected);
load->hbox = ewl_hbox_new();
- ewl_container_append_child((Ewl_Container *) load->vbox, load->hbox);
- ewl_object_set_fill_policy((Ewl_Object *) load->hbox,
+ ewl_container_child_append((Ewl_Container *) load->vbox, load->hbox);
+ ewl_object_fill_policy_set((Ewl_Object *) load->hbox,
EWL_FLAG_FILL_HFILL);
ewl_widget_show(load->hbox);
@@ -465,7 +471,7 @@
load_setup_button(Ewl_Widget * c, Ewl_Widget ** b, char *label)
{
*b = ewl_button_new(label);
- ewl_container_append_child((Ewl_Container *) c, *b);
+ ewl_container_child_append((Ewl_Container *) c, *b);
ewl_widget_show(*b);
return;
}
@@ -509,7 +515,7 @@
ewl_callback_append(capt, EWL_CALLBACK_CLICKED,
(void *) ewl_load_listitem_click, NULL);
ewl_widget_show(capt);
- ewl_tree_add_row((Ewl_Tree *) tree, 0, &capt);
+ ewl_tree_row_add((Ewl_Tree *) tree, 0, &capt);
return;
}
@@ -623,9 +629,9 @@
{
char *tmp = malloc(MAX_TITLE);
- load_selected = ewl_text_get_text((Ewl_Text *) o);
+ load_selected = ewl_text_text_get((Ewl_Text *) o);
snprintf(tmp, MAX_TITLE, "Selected: %s", load_selected);
- ewl_text_set_text((Ewl_Text *) load->txt_selected, tmp);
+ ewl_text_text_set((Ewl_Text *) load->txt_selected, tmp);
free(tmp);
return;
}
@@ -672,6 +678,6 @@
void
save_and_load_move_embed(Ewl_Widget * w, void *ev_data, void *user_data)
{
- ewl_object_request_geometry(EWL_OBJECT(user_data), CURRENT_X(w),
+ ewl_object_geometry_request(EWL_OBJECT(user_data), CURRENT_X(w),
CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w));
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- settings.c 5 May 2004 18:59:26 -0000 1.7
+++ settings.c 24 Aug 2004 13:01:33 -0000 1.8
@@ -61,11 +61,11 @@
/* Setup the EWL Widgets */
s->emb = ewl_embed_new();
- ewl_object_set_fill_policy((Ewl_Object *) s->emb, EWL_FLAG_FILL_FILL);
- ewl_widget_set_appearance(s->emb, "window");
+ ewl_object_fill_policy_set((Ewl_Object *) s->emb, EWL_FLAG_FILL_ALL);
+ ewl_widget_appearance_set(s->emb, "window");
ewl_widget_show(s->emb);
- s->eo = ewl_embed_set_evas((Ewl_Embed *) s->emb, s->evas, (void *)
+ s->eo = ewl_embed_evas_set((Ewl_Embed *) s->emb, s->evas, (void *)
ecore_evas_software_x11_window_get(s->win));
evas_object_name_set(s->eo, "eo");
evas_object_layer_set(s->eo, 0);
@@ -73,29 +73,31 @@
evas_object_resize(s->eo, SETTINGS_W, SETTINGS_H);
evas_object_show(s->eo);
+ evas_object_focus_set (s->eo, TRUE);
+ ewl_embed_focus_set ((Ewl_Embed*)s->emb, TRUE);
+
s->vbox = ewl_vbox_new();
- ewl_container_append_child((Ewl_Container *) s->emb, s->vbox);
- ewl_object_set_fill_policy((Ewl_Object *) s->vbox, EWL_FLAG_FILL_FILL);
+ ewl_container_child_append((Ewl_Container *) s->emb, s->vbox);
+ ewl_object_fill_policy_set((Ewl_Object *) s->vbox, EWL_FLAG_FILL_ALL);
ewl_widget_show(s->vbox);
ewl_callback_append(s->emb, EWL_CALLBACK_CONFIGURE, settings_move_embed,
s->vbox);
s->tree = ewl_tree_new(2);
- ewl_container_append_child((Ewl_Container *) s->vbox, s->tree);
- ewl_object_set_fill_policy((Ewl_Object *) s->tree, EWL_FLAG_FILL_FILL);
+ ewl_container_child_append((Ewl_Container *) s->vbox, s->tree);
headers[0] = strdup("Setting");
headers[1] = strdup("Value");
- ewl_tree_set_headers((Ewl_Tree *) s->tree, headers);
+ ewl_tree_headers_set((Ewl_Tree *) s->tree, headers);
free(headers[0]);
free(headers[1]);
ewl_widget_show(s->tree);
s->hbox = ewl_hbox_new();
- ewl_container_append_child((Ewl_Container *) s->vbox, s->hbox);
- ewl_object_set_fill_policy((Ewl_Object *) s->hbox, EWL_FLAG_FILL_HFILL);
+ ewl_container_child_append((Ewl_Container *) s->vbox, s->hbox);
+ ewl_object_fill_policy_set((Ewl_Object *) s->hbox, EWL_FLAG_FILL_HFILL);
ewl_widget_show(s->hbox);
settings_setup_button(s->hbox, &(s->savebtn), "Save.");
@@ -165,7 +167,7 @@
settings_setup_button(Ewl_Widget * c, Ewl_Widget ** b, char *label)
{
*b = ewl_button_new(label);
- ewl_container_append_child((Ewl_Container *) c, *b);
+ ewl_container_child_append((Ewl_Container *) c, *b);
ewl_widget_show(*b);
return;
}
@@ -194,7 +196,7 @@
entries[0] = o->caption;
entries[1] = o->entry;
- ewl_tree_add_row((Ewl_Tree *) tree, 0, entries);
+ ewl_tree_row_add((Ewl_Tree *) tree, 0, entries);
return (oa);
}
@@ -350,6 +352,6 @@
void
settings_move_embed(Ewl_Widget * w, void *ev_data, void *user_data)
{
- ewl_object_request_geometry(EWL_OBJECT(user_data), CURRENT_X(w),
+ ewl_object_geometry_request(EWL_OBJECT(user_data), CURRENT_X(w),
CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w));
}
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
