Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
Makefile.am msgbox.c msgbox.h saveload.c settings.c
Added Files:
welcome.c welcome.h
Log Message:
EWL Fill Policies
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 8 May 2004 10:34:43 -0000 1.3
+++ Makefile.am 27 Aug 2004 20:40:37 -0000 1.4
@@ -29,6 +29,8 @@
xml.c \
xml.h \
debug.c \
-debug.h
+debug.h \
+welcome.c \
+welcome.h
enotes_LDADD = @ewl_libs@ @ecore_libs@ @evas_libs@ @edje_libs@ @edb_libs@
@imlib2_libs@ @libxml2_libs@ @esmart_libs@ -lesmart_draggies
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- msgbox.c 24 Aug 2004 13:01:33 -0000 1.4
+++ msgbox.c 27 Aug 2004 20:40:37 -0000 1.5
@@ -39,37 +39,15 @@
void
msgbox_manual(char *title, char *content, int x, int y, int width, int height)
{
- MsgBox msgbox;
- MsgBox *mb = &msgbox;
+ MsgBox *mb = malloc(sizeof(MsgBox));
/* Setup the Window */
- mb->win = ecore_evas_software_x11_new(NULL, 0, x, y, width, height);
- ecore_evas_title_set(mb->win, title);
- ecore_evas_show(mb->win);
-
- /* Setup the Canvas, Render-Method */
- mb->evas = ecore_evas_get(mb->win);
- evas_output_method_set(mb->evas,
- evas_render_method_lookup(main_config->
- render_method));
-
- /* Setup the EWL Widgets */
- mb->emb = ewl_embed_new();
- 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_evas_set((Ewl_Embed *) mb->emb, mb->evas, (void *)
- ecore_evas_software_x11_window_get(mb->
- win));
- evas_object_name_set(mb->eo, "eo");
- evas_object_layer_set(mb->eo, 0);
- evas_object_move(mb->eo, 0, 0);
- evas_object_resize(mb->eo, width, height);
- evas_object_show(mb->eo);
+ mb->win=ewl_window_new();
+ ewl_window_title_set((Ewl_Window*)mb->win, title);
+ ewl_widget_show(mb->win);
mb->vbox = ewl_vbox_new();
- ewl_container_child_append((Ewl_Container *) mb->emb, mb->vbox);
+ ewl_container_child_append((Ewl_Container *) mb->win, mb->vbox);
ewl_object_fill_policy_set((Ewl_Object *) mb->vbox, EWL_FLAG_FILL_FILL);
ewl_widget_show(mb->vbox);
@@ -86,14 +64,11 @@
ewl_container_child_append((Ewl_Container *) mb->hbox, mb->okbtn);
ewl_widget_show(mb->okbtn);
- /* Ecore Callbacks */
- ecore_evas_callback_resize_set(mb->win, msgbox_resize);
- ecore_evas_callback_delete_request_set(mb->win, msgbox_close);
- ecore_evas_callback_destroy_set(mb->win, msgbox_close);
-
/* EWL Callbacks */
- ewl_callback_append(mb->okbtn, EWL_CALLBACK_MOUSE_DOWN,
- (void *) msgbox_okbtn_clicked, mb->win);
+ ewl_callback_append(mb->okbtn, EWL_CALLBACK_CLICKED,
+ (void *) msgbox_okbtn_clicked, mb);
+ ewl_callback_append(mb->win, EWL_CALLBACK_DELETE_WINDOW,
+ (void *) msgbox_okbtn_clicked, mb);
return;
}
@@ -102,42 +77,27 @@
/* Callbacks */
/**
- * @param ee: The Ecore_Evas which has been resized.
- * @brief: Ecore callback for window resize, resizes the ewl embed object
- * to compensate.
- */
-void
-msgbox_resize(Ecore_Evas * ee)
-{
- int x, y, w, h;
-
- ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- evas_object_resize(evas_object_name_find(ecore_evas_get(ee), "eo"),
- w, h);
- return;
-}
-
-/**
- * @param ee: The Ecore_Evas window which the wm has requested be closed.
+ * @param p: The Msgbox to be destroyed.
* @brief: Closes the msgbox window ee.
*/
void
-msgbox_close(Ecore_Evas * ee)
+msgbox_close(MsgBox *p)
{
- ecore_evas_free(ee);
+ ewl_widget_destroy(p->win);
+ free(p);
return;
}
/**
* @param widget: The Ewl_Widget of the ok button which was clicked.
* @param ev_data: Event data, not used.
- * @param data: The msgbox Ecore_Evas supplied when the callback was set.
+ * @param data: The msgbox supplied when the callback was set.
* @brief: Ewl callback on the ok button being clicked.
* Closes the Ecore_Evas window (data) via msgbox_close.
*/
void
msgbox_okbtn_clicked(Ewl_Widget * widget, void *ev_data, void *data)
{
- msgbox_close((Ecore_Evas *) data);
+ msgbox_close((MsgBox *) data);
return;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- msgbox.h 11 Mar 2004 17:28:58 -0000 1.3
+++ msgbox.h 27 Aug 2004 20:40:37 -0000 1.4
@@ -22,10 +22,7 @@
#include "config.h"
typedef struct {
- Ecore_Evas *win;
- Evas *evas;
- Evas_Object *eo;
- Ewl_Widget *emb;
+ Ewl_Widget *win;
Ewl_Widget *vbox;
Ewl_Widget *hbox;
Ewl_Widget *okbtn;
@@ -42,7 +39,6 @@
/* Callbacks */
void msgbox_okbtn_clicked(Ewl_Widget * widget, void *ev_data,
void *data);
-void msgbox_resize(Ecore_Evas * ee);
-void msgbox_close(Ecore_Evas * ee);
+void msgbox_close(MsgBox *p);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- saveload.c 26 Aug 2004 20:50:24 -0000 1.12
+++ saveload.c 27 Aug 2004 20:40:37 -0000 1.13
@@ -53,13 +53,14 @@
/* Setup the Window */
saveload->win = ewl_window_new();
ewl_window_title_set((Ewl_Window *) saveload->win, "E-Notes Save/Load");
+ ewl_object_fill_policy_set((Ewl_Object*)saveload->win, EWL_FLAG_FILL_ALL);
+ ewl_object_size_request((Ewl_Object*)saveload->win, 400,350);
ewl_widget_show(saveload->win);
saveload->vbox = ewl_vbox_new();
ewl_container_child_append((Ewl_Container *) saveload->win,
saveload->vbox);
- ewl_object_fill_policy_set((Ewl_Object *) saveload->vbox,
- EWL_FLAG_FILL_FILL);
+ ewl_object_fill_policy_set((Ewl_Object*)saveload->vbox, EWL_FLAG_FILL_ALL);
ewl_widget_show(saveload->vbox);
ewl_callback_append(saveload->win, EWL_CALLBACK_CONFIGURE,
@@ -68,8 +69,6 @@
saveload->tree = ewl_tree_new(1);
ewl_container_child_append((Ewl_Container *) saveload->vbox,
saveload->tree);
- ewl_object_fill_policy_set((Ewl_Object *) saveload->tree,
- EWL_FLAG_FILL_FILL);
headers[0] = strdup("Note Title");
ewl_tree_headers_set((Ewl_Tree *) saveload->tree, headers);
@@ -85,8 +84,8 @@
saveload->hbox = ewl_hbox_new();
ewl_container_child_append((Ewl_Container *) saveload->vbox,
saveload->hbox);
- ewl_object_fill_policy_set((Ewl_Object *) saveload->hbox,
- EWL_FLAG_FILL_HFILL);
+ ewl_object_fill_policy_set((Ewl_Object*)saveload->hbox,EWL_FLAG_FILL_VSHRINK);
+ ewl_object_fill_policy_set((Ewl_Object*)saveload->hbox,EWL_FLAG_FILL_HFILL);
ewl_widget_show(saveload->hbox);
saveload_setup_button(saveload->hbox, &saveload->savebtn, "Save.");
@@ -171,9 +170,11 @@
capt = (Ewl_Widget *) ewl_text_new(caption);
ewl_callback_append(capt, EWL_CALLBACK_CLICKED,
(void *) ewl_saveload_listitem_click, NULL);
+ ewl_object_fill_policy_set((Ewl_Object*)capt, EWL_FLAG_FILL_ALL);
ewl_widget_show(capt);
d->saveload_row =
(Ewl_Row *) ewl_tree_row_add((Ewl_Tree *) tree, 0, &capt);
+ ewl_object_fill_policy_set((Ewl_Object*)d->saveload_row, EWL_FLAG_FILL_ALL);
return;
}
@@ -320,12 +321,14 @@
/* Setup the Window */
load->win = ewl_window_new();
ewl_window_title_set((Ewl_Window *) load->win, "E-Notes Load");
+ ewl_object_fill_policy_set((Ewl_Object*)load->win, EWL_FLAG_FILL_ALL);
+ ewl_object_size_request((Ewl_Object*)load->win, 400,350);
ewl_widget_show(load->win);
load->vbox = ewl_vbox_new();
ewl_container_child_append((Ewl_Container *) load->win, load->vbox);
ewl_object_fill_policy_set((Ewl_Object *) load->vbox,
- EWL_FLAG_FILL_FILL);
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(load->vbox);
ewl_callback_append(load->win, EWL_CALLBACK_CONFIGURE,
@@ -333,8 +336,6 @@
load->tree = ewl_tree_new(1);
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_headers_set((Ewl_Tree *) load->tree, headers);
@@ -350,6 +351,8 @@
load->hbox = ewl_hbox_new();
ewl_container_child_append((Ewl_Container *) load->vbox, load->hbox);
ewl_object_fill_policy_set((Ewl_Object *) load->hbox,
+ EWL_FLAG_FILL_VSHRINK);
+ ewl_object_fill_policy_set((Ewl_Object *) load->hbox,
EWL_FLAG_FILL_HFILL);
ewl_widget_show(load->hbox);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- settings.c 26 Aug 2004 20:50:24 -0000 1.10
+++ settings.c 27 Aug 2004 20:40:37 -0000 1.11
@@ -50,11 +50,13 @@
/* Setup the Window */
s->win = ewl_window_new();
ewl_window_title_set((Ewl_Window *) s->win, "E-Notes Settings");
+ ewl_object_fill_policy_set((Ewl_Object*)s->win, EWL_FLAG_FILL_ALL);
+ ewl_object_size_request((Ewl_Object*)s->win, 400,350);
ewl_widget_show(s->win);
s->vbox = ewl_vbox_new();
ewl_container_child_append((Ewl_Container *) s->win, s->vbox);
- ewl_object_fill_policy_set((Ewl_Object *) s->vbox, EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set((Ewl_Object*)s->vbox, EWL_FLAG_FILL_ALL);
ewl_widget_show(s->vbox);
ewl_callback_append(s->win, EWL_CALLBACK_CONFIGURE, settings_move_embed,
@@ -73,7 +75,8 @@
s->hbox = ewl_hbox_new();
ewl_container_child_append((Ewl_Container *) s->vbox, s->hbox);
- ewl_object_fill_policy_set((Ewl_Object *) s->hbox, EWL_FLAG_FILL_HFILL);
+ ewl_object_fill_policy_set ((Ewl_Object*) s->hbox, EWL_FLAG_FILL_VSHRINK);
+ 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.");
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
