Menu
▾
▴
enlightenment-cvs
|
From: <enl...@li...> - 2002-05-25 05:46:43
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/test
Modified Files:
Makefile.am ewl_imenu_test.c ewl_test.c
Log Message:
Indent run. Some minor bug fixes. Support for automatically resizing windows
based on content. Beginnings of abstracted menu classes. Added a simple class
for representing the check in a checkbutton, mainly to ease layout. Need to
update the bits to reflect some of these changes.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Makefile.am 17 Apr 2002 22:18:50 -0000 1.20
+++ Makefile.am 25 May 2002 05:46:42 -0000 1.21
@@ -16,6 +16,7 @@
ewl_filedialog_test.c \
ewl_floater_test.c \
ewl_imenu_test.c \
+ ewl_menu_test.c \
ewl_notebook_test.c \
ewl_selectionbook_test.c \
ewl_selectionbar_test.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_imenu_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_imenu_test.c 17 Apr 2002 19:17:34 -0000 1.2
+++ ewl_imenu_test.c 25 May 2002 05:46:42 -0000 1.3
@@ -22,11 +22,11 @@
void
-__menu_select(Ewl_Widget * w, void *ev_data, void *user_data)
+__imenu_select(Ewl_Widget * w, void *ev_data, void *user_data)
{
char *text;
- text = ewl_text_get_text(EWL_TEXT(EWL_IMENU_ITEM(w)->text));
+ text = ewl_text_get_text(EWL_TEXT(EWL_MENU_ITEM(w)->text));
printf("%s item down\n", text);
return;
@@ -74,19 +74,19 @@
/*
* Append some test items
*/
- item = ewl_imenu_item_new("/usr/share/pixmaps/dia.xpm", "dia");
+ item = ewl_menu_item_new("/usr/share/pixmaps/dia.xpm", "dia");
ewl_container_append_child(EWL_CONTAINER(imenu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
ewl_widget_show(item);
- item = ewl_imenu_item_new("/usr/share/pixmaps/wilber.xpm", "gimp");
+ item = ewl_menu_item_new("/usr/share/pixmaps/wilber.xpm", "gimp");
ewl_container_append_child(EWL_CONTAINER(imenu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
ewl_widget_show(item);
- item = ewl_imenu_item_new(NULL, "button");
+ item = ewl_menu_item_new(NULL, "button");
ewl_container_append_child(EWL_CONTAINER(imenu1), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
ewl_widget_show(item);
/*
@@ -96,14 +96,14 @@
ewl_container_append_child(EWL_CONTAINER(imenu1), imenu2);
ewl_widget_show(imenu2);
- item = ewl_imenu_item_new(NULL, "button");
+ item = ewl_menu_item_new(NULL, "button");
ewl_container_append_child(EWL_CONTAINER(imenu2), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
ewl_widget_show(item);
- item = ewl_imenu_item_new(NULL, "button");
+ item = ewl_menu_item_new(NULL, "button");
ewl_container_append_child(EWL_CONTAINER(imenu2), item);
- ewl_callback_append(item, EWL_CALLBACK_SELECT, __menu_select, NULL);
+ ewl_callback_append(item, EWL_CALLBACK_SELECT, __imenu_select, NULL);
ewl_widget_show(item);
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_test.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_test.c 17 Apr 2002 22:18:50 -0000 1.35
+++ ewl_test.c 25 May 2002 05:46:42 -0000 1.36
@@ -1,6 +1,6 @@
#include <Ewl.h>
-#define BUTTONS 16
+#define BUTTONS 17
void __close_main_widow(Ewl_Widget * w, void *ev_data,
void *user_data);
@@ -29,6 +29,9 @@
void __create_imenu_test_window(Ewl_Widget * w, void *ev_data,
void *user_data);
+void __create_menu_test_window(Ewl_Widget * w, void *ev_data,
+ void *user_data);
+
void __create_notebook_test_window(Ewl_Widget * w, void *ev_data,
void *user_data);
@@ -162,6 +165,14 @@
button[i] = ewl_button_new("Ewl_IMenu");
ewl_callback_append(button[i], EWL_CALLBACK_CLICKED,
__create_imenu_test_window, NULL);
+ i++;
+
+ /*
+ * Create the button for the menu test and add it to the box.
+ */
+ button[i] = ewl_button_new("Ewl_Menu");
+ ewl_callback_append(button[i], EWL_CALLBACK_CLICKED,
+ __create_menu_test_window, NULL);
i++;
/*
|
|
From: <enl...@li...> - 2002-05-25 05:47:10
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/scripts Modified Files: theme.sh Log Message: Indent run. Some minor bug fixes. Support for automatically resizing windows based on content. Beginnings of abstracted menu classes. Added a simple class for representing the check in a checkbutton, mainly to ease layout. Need to update the bits to reflect some of these changes. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/scripts/theme.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- theme.sh 16 Apr 2002 18:26:57 -0000 1.6 +++ theme.sh 25 May 2002 05:46:39 -0000 1.7 @@ -19,14 +19,23 @@ edb_ed $DB add "/appearance/button/default/label/font" str "borzoib" edb_ed $DB add "/appearance/button/default/label/font_size" int 8 edb_ed $DB add "/appearance/button/default/label/style" str "shadow" + +edb_ed $DB add "/appearance/check/base" str "/appearance/button/check/base.bits.db" +edb_ed $DB add "/appearance/check/base/visible" str "yes" + edb_ed $DB add "/appearance/button/check/base" str "/appearance/button/check/base.bits.db" -edb_ed $DB add "/appearance/button/check/base/visible" str "yes" +edb_ed $DB add "/appearance/button/check/base/visible" str "no" + edb_ed $DB add "/appearance/button/check/label/font" str "borzoib" edb_ed $DB add "/appearance/button/check/label/font_size" int 8 edb_ed $DB add "/appearance/button/check/label/style" str "shadow" +edb_ed $DB add "/appearance/radio/base" str "/appearance/button/radio/base.bits.db" +edb_ed $DB add "/appearance/radio/base/visible" str "yes" + edb_ed $DB add "/appearance/button/radio/base" str "/appearance/button/radio/base.bits.db" -edb_ed $DB add "/appearance/button/radio/base/visible" str "yes" +edb_ed $DB add "/appearance/button/radio/base/visible" str "no" + edb_ed $DB add "/appearance/button/radio/label/font" str "borzoib" edb_ed $DB add "/appearance/button/radio/label/font_size" int 8 edb_ed $DB add "/appearance/button/radio/label/style" str "shadow" |
|
From: <enl...@li...> - 2002-05-25 05:47:10
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/default Modified Files: theme.db Log Message: Indent run. Some minor bug fixes. Support for automatically resizing windows based on content. Beginnings of abstracted menu classes. Added a simple class for representing the check in a checkbutton, mainly to ease layout. Need to update the bits to reflect some of these changes. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/theme.db,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 Binary files /tmp/cvsq7LYE4 and /tmp/cvs82DhVY differ |
|
From: <enl...@li...> - 2002-05-25 05:47:14
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Ewl.h Makefile.am ewl_box.c ewl_box.h ewl_button.c
ewl_button.h ewl_callback.c ewl_callback.h ewl_checkbutton.c
ewl_checkbutton.h ewl_config.c ewl_config.h ewl_container.c
ewl_container.h ewl_cursor.c ewl_cursor.h ewl_debug.h
ewl_entry.c ewl_entry.h ewl_enums.h ewl_events.c ewl_events.h
ewl_filedialog.c ewl_fileselector.c ewl_fileselector.h
ewl_floater.c ewl_floater.h ewl_fx.c ewl_fx.h ewl_grid.c
ewl_grid.h ewl_image.c ewl_image.h ewl_imenu.c ewl_imenu.h
ewl_list.c ewl_list.h ewl_macros.h ewl_misc.c ewl_misc.h
ewl_notebook.c ewl_notebook.h ewl_object.c ewl_object.h
ewl_radiobutton.c ewl_radiobutton.h ewl_scrollbar.c
ewl_scrollbar.h ewl_scrollpane.c ewl_scrollpane.h ewl_seeker.c
ewl_seeker.h ewl_selection.c ewl_selection.h
ewl_selectionbar.c ewl_selectionbar.h ewl_selectionbook.c
ewl_selectionbook.h ewl_separator.c ewl_separator.h
ewl_spinner.c ewl_spinner.h ewl_table.c ewl_table.h ewl_text.c
ewl_textarea.c ewl_textarea.h ewl_theme.c ewl_theme.h
ewl_widget.c ewl_widget.h ewl_window.c ewl_window.h getopt.c
getopt1.c
Added Files:
ewl_check.c ewl_check.h ewl_menu.c ewl_menu.h ewl_menu_base.c
ewl_menu_base.h
Log Message:
Indent run. Some minor bug fixes. Support for automatically resizing windows
based on content. Beginnings of abstracted menu classes. Added a simple class
for representing the check in a checkbutton, mainly to ease layout. Need to
update the bits to reflect some of these changes.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Ewl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Ewl.h 17 Apr 2002 22:18:50 -0000 1.21
+++ Ewl.h 25 May 2002 05:46:39 -0000 1.22
@@ -59,7 +59,10 @@
#include <ewl_spinner.h>
#include <ewl_list.h>
#include <ewl_image.h>
+#include <ewl_menu_base.h>
#include <ewl_imenu.h>
+#include <ewl_menu.h>
+#include <ewl_check.h>
#include <ewl_checkbutton.h>
#include <ewl_radiobutton.h>
#include <ewl_cursor.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- Makefile.am 23 Apr 2002 16:37:39 -0000 1.26
+++ Makefile.am 25 May 2002 05:46:39 -0000 1.27
@@ -11,6 +11,7 @@
ewl_box.h \
ewl_button.h \
ewl_callback.h \
+ ewl_check.h \
ewl_checkbutton.h \
ewl_config.h \
ewl_container.h \
@@ -26,8 +27,10 @@
ewl_grid.h \
ewl_image.h \
ewl_imenu.h \
+ ewl_menu.h \
ewl_list.h \
ewl_macros.h \
+ ewl_menu_base.h \
ewl_misc.h \
ewl_notebook.h \
ewl_object.h \
@@ -51,6 +54,7 @@
ewl_box.c \
ewl_button.c \
ewl_callback.c \
+ ewl_check.c \
ewl_checkbutton.c \
ewl_config.c \
ewl_container.c \
@@ -64,6 +68,8 @@
ewl_grid.c \
ewl_image.c \
ewl_imenu.c \
+ ewl_menu.c \
+ ewl_menu_base.c \
ewl_misc.c \
ewl_notebook.c \
ewl_object.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_box.c 19 Apr 2002 22:09:57 -0000 1.37
+++ ewl_box.c 25 May 2002 05:46:39 -0000 1.38
@@ -73,8 +73,7 @@
*
* Returns NULL on failure, or a newly allocated box on success.
*/
-Ewl_Widget *
-ewl_box_new(Ewl_Orientation o)
+Ewl_Widget *ewl_box_new(Ewl_Orientation o)
{
Ewl_Box *b;
@@ -98,8 +97,7 @@
* Returns no value. Responsible for setting up default values and callbacks
* within a box structure.
*/
-void
-ewl_box_init(Ewl_Box * b, Ewl_Orientation o)
+void ewl_box_init(Ewl_Box * b, Ewl_Orientation o)
{
Ewl_Widget *w;
@@ -154,8 +152,7 @@
* Returns no value. Changes the orientation of the specified box, and
* reconfigures it in order for the appearance to be updated.
*/
-void
-ewl_box_set_orientation(Ewl_Box * b, Ewl_Orientation o)
+void ewl_box_set_orientation(Ewl_Box * b, Ewl_Orientation o)
{
Ewl_Widget *w;
@@ -173,14 +170,6 @@
b->orientation = o;
- /*
- * Change the appearance based on orientation
- */
- if (b->orientation == EWL_ORIENTATION_VERTICAL)
- ewl_widget_set_appearance(w, "/appearance/box/vertical");
- else
- ewl_widget_set_appearance(w, "/appearance/box/horizontal");
-
ewl_widget_configure(w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -194,8 +183,7 @@
* Returns no value. Adjust the spacing of the specified box and reconfigure
* it to change the appearance.
*/
-void
-ewl_box_set_spacing(Ewl_Box * b, int s)
+void ewl_box_set_spacing(Ewl_Box * b, int s)
{
Ewl_Widget *w;
@@ -211,8 +199,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_box_configure(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_box_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Box *b;
@@ -288,8 +275,7 @@
/*
* Split the children into three lists for layout.
*/
-void
-__ewl_box_configure_calc(Ewl_Box * b, int *fill_size, int *align_size)
+void __ewl_box_configure_calc(Ewl_Box * b, int *fill_size, int *align_size)
{
Ewl_Object *child;
@@ -320,7 +306,7 @@
*/
change = *fill_size;
*fill_size -= info->fill_ask(child) + b->spacing +
- info->fill_pad1(child) + info->fill_pad2(child);
+ info->fill_pad1(child) + info->fill_pad2(child);
/*
* Attempt to give the widget the full size, this will
@@ -344,8 +330,7 @@
* Spread space to any widgets that have fill policy set to fill. This should
* not be called if @num_fill or *@fill_size are equal to zero.
*/
-void
-__ewl_box_configure_fill(Ewl_Box * b, int *fill_size, int *align_size)
+void __ewl_box_configure_fill(Ewl_Box * b, int *fill_size, int *align_size)
{
int space;
int temp, remainder;
@@ -488,7 +473,7 @@
* Move to the next position for the child.
*/
*fill += info->fill_ask(child) + b->spacing +
- info->fill_pad2(child);
+ info->fill_pad2(child);
ewl_widget_configure(EWL_WIDGET(child));
}
@@ -536,8 +521,7 @@
/*
* When a child gets added to the box update it's size.
*/
-void
-__ewl_box_add(Ewl_Container * c, Ewl_Widget * w)
+void __ewl_box_add(Ewl_Container * c, Ewl_Widget * w)
{
int max_size = 0;
Box_Orientation *info;
@@ -558,7 +542,7 @@
*/
if (EWL_BOX(c)->max_align)
max_size =
- info->pref_align_ask(EWL_OBJECT(EWL_BOX(c)->max_align));
+ info->pref_align_ask(EWL_OBJECT(EWL_BOX(c)->max_align));
else
max_size = info->pref_align_ask(EWL_OBJECT(w));
@@ -679,8 +663,7 @@
* Setup some internal variables for effectively laying out the children based
* on orientation.
*/
-void
-__ewl_box_setup()
+void __ewl_box_setup()
{
if (!vertical) {
vertical = NEW(Box_Orientation, 1);
@@ -696,7 +679,7 @@
* These are the valid fill policies for this widget.
*/
vertical->f_policy =
- EWL_FILL_POLICY_VSHRINK | EWL_FILL_POLICY_VFILL;
+ EWL_FILL_POLICY_VSHRINK | EWL_FILL_POLICY_VFILL;
/*
* This sets the aligments for the non-filling direction.
@@ -749,7 +732,7 @@
* These are the valid fill policies for this widget.
*/
horizontal->f_policy =
- EWL_FILL_POLICY_HSHRINK | EWL_FILL_POLICY_HFILL;
+ EWL_FILL_POLICY_HSHRINK | EWL_FILL_POLICY_HFILL;
/*
* This sets the aligments for the non-filling direction.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_box.h 16 Apr 2002 18:22:56 -0000 1.17
+++ ewl_box.h 25 May 2002 05:46:39 -0000 1.18
@@ -31,4 +31,4 @@
void ewl_box_set_orientation(Ewl_Box * b, Ewl_Orientation o);
void ewl_box_set_spacing(Ewl_Box * b, int spacing);
-#endif /* __EWL_BOX_H__ */
+#endif /* __EWL_BOX_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_button.c 19 Apr 2002 22:09:57 -0000 1.35
+++ ewl_button.c 25 May 2002 05:46:39 -0000 1.36
@@ -20,8 +20,7 @@
*
* Returns NULL on failure, a pointer to a new button on success
*/
-Ewl_Widget *
-ewl_button_new(char *label)
+Ewl_Widget *ewl_button_new(char *label)
{
Ewl_Button *b;
@@ -44,8 +43,7 @@
*
* Returns no value. Initializes a button to default values and callbacks.
*/
-void
-ewl_button_init(Ewl_Button * b, char *label)
+void ewl_button_init(Ewl_Button * b, char *label)
{
Ewl_Widget *w;
@@ -101,8 +99,7 @@
*
* Returns no value.
*/
-void
-ewl_button_set_label(Ewl_Button * b, char *l)
+void ewl_button_set_label(Ewl_Button * b, char *l)
{
Ewl_Widget *w;
@@ -123,8 +120,7 @@
}
-void
-__ewl_button_focus_in(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_button_focus_in(Ewl_Widget * w, void *ev_data, void *user_data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -137,8 +133,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_button_focus_out(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_button_focus_out(Ewl_Widget * w, void *ev_data, void *user_data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -148,8 +143,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_button_mouse_down(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_button_mouse_down(Ewl_Widget * w, void *ev_data, void *user_data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -159,8 +153,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_button_mouse_up(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_button_mouse_up(Ewl_Widget * w, void *ev_data, void *user_data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -175,8 +168,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_button_show(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_button_show(Ewl_Widget * w, void *ev_data, void *user_data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -186,8 +178,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_button_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_button_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Button *b;
char appearance[PATH_LEN];
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_button.h 16 Apr 2002 18:22:56 -0000 1.14
+++ ewl_button.h 25 May 2002 05:46:40 -0000 1.15
@@ -22,4 +22,4 @@
void ewl_button_init(Ewl_Button * b, char *label);
void ewl_button_set_label(Ewl_Button * b, char *l);
-#endif /* __EWL_BUTTON_H__ */
+#endif /* __EWL_BUTTON_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_callback.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_callback.c 19 Apr 2002 22:09:57 -0000 1.28
+++ ewl_callback.c 25 May 2002 05:46:40 -0000 1.29
@@ -21,8 +21,7 @@
*
* So using shared callbacks saves us over 2 MB of memory in this case.
*/
-void
-ewl_callbacks_init()
+void ewl_callbacks_init()
{
cb_registration = ewd_hash_new(__ewl_callback_hash,
__ewl_callback_compare);
@@ -34,8 +33,7 @@
* Returns no value. Destroys some important variables for tracking callbacks
* that allow shared callbacks.
*/
-void
-ewl_callbacks_deinit()
+void ewl_callbacks_deinit()
{
ewd_hash_destroy(cb_registration);
}
@@ -49,8 +47,7 @@
* but this can not be counted on. The callback @cb will be freed if this is
* not the case.
*/
-static Ewl_Callback *
-__ewl_callback_register(Ewl_Callback * cb)
+static Ewl_Callback *__ewl_callback_register(Ewl_Callback * cb)
{
Ewl_Callback *found;
@@ -78,8 +75,7 @@
* Returns no value. Checks to see if @cb has nay remaining references, if not
* it is removed from the registration system and freed.
*/
-static void
-__ewl_callback_unregister(Ewl_Callback * cb)
+static void __ewl_callback_unregister(Ewl_Callback * cb)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -230,8 +226,7 @@
* Returns no value. Executes the callback chain for the specified widget @w,
* with event @t.
*/
-void
-ewl_callback_call(Ewl_Widget * w, Ewl_Callback_Type t)
+void ewl_callback_call(Ewl_Widget * w, Ewl_Callback_Type t)
{
Ewl_Callback *cb = NULL;
@@ -295,8 +290,7 @@
*
* Returns no value. Delete all callbacks of type @t from widget @w.
*/
-void
-ewl_callback_del_type(Ewl_Widget * w, Ewl_Callback_Type t)
+void ewl_callback_del_type(Ewl_Widget * w, Ewl_Callback_Type t)
{
Ewl_Callback *rm;
@@ -323,8 +317,7 @@
*
* Returns no value. Delete the specified callback id from the widget @w.
*/
-void
-ewl_callback_del_cb_id(Ewl_Widget * w, Ewl_Callback_Type t, int cb_id)
+void ewl_callback_del_cb_id(Ewl_Widget * w, Ewl_Callback_Type t, int cb_id)
{
Ewl_Callback *cb;
@@ -353,8 +346,7 @@
* Returns no value. Removes and frees all callbacks associated with widget
* @w.
*/
-void
-ewl_callback_clear(Ewl_Widget * w)
+void ewl_callback_clear(Ewl_Widget * w)
{
int i;
@@ -408,8 +400,7 @@
/*
* Hashes the value of a callback based on it's type, function, and user data.
*/
-static unsigned int
-__ewl_callback_hash(void *key)
+static unsigned int __ewl_callback_hash(void *key)
{
Ewl_Callback *cb = EWL_CALLBACK(key);
@@ -425,8 +416,7 @@
* Simple comparison of callbacks, always returns -1 unless there is an exact
* match, in which case it returns 0.
*/
-static int
-__ewl_callback_compare(void *key1, void *key2)
+static int __ewl_callback_compare(void *key1, void *key2)
{
Ewl_Callback *cb1 = EWL_CALLBACK(key1);
Ewl_Callback *cb2 = EWL_CALLBACK(key2);
@@ -434,8 +424,8 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("key1", key1, -1)
- DCHECK_PARAM_PTR_RET("key2", key2, -1)
- if (cb1->func == cb2->func && cb1->user_data == cb2->user_data)
+ DCHECK_PARAM_PTR_RET("key2", key2, -1)
+ if (cb1->func == cb2->func && cb1->user_data == cb2->user_data)
DRETURN_INT(0, DLEVEL_STABLE);
DRETURN_INT(-1, DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_callback.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_callback.h 16 Apr 2002 18:22:56 -0000 1.20
+++ ewl_callback.h 25 May 2002 05:46:40 -0000 1.21
@@ -60,4 +60,4 @@
void ewl_callback_del(Ewl_Widget * w, Ewl_Callback_Type t,
Ewl_Callback_Function f);
-#endif /* __EWL_CALLBACK_H__ */
+#endif /* __EWL_CALLBACK_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_checkbutton.c 16 Apr 2002 18:22:56 -0000 1.26
+++ ewl_checkbutton.c 25 May 2002 05:46:40 -0000 1.27
@@ -2,19 +2,8 @@
#include <Ewl.h>
-void ewl_checkbutton_init(Ewl_CheckButton * cb, char *label);
-
-void __ewl_checkbutton_configure(Ewl_Widget * w, void *ev_data,
- void *user_data);
void __ewl_checkbutton_clicked(Ewl_Widget * w, void *ev_data,
void *user_data);
-void __ewl_checkbutton_update_check(Ewl_Widget * w);
-
-void __ewl_box_configure(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void __ewl_checkbutton_theme_update(Ewl_Widget * w, void *ev_data,
- void *user_data);
-void ewl_button_init(Ewl_Button * b, char *l);
/**
* ewl_checkbutton_new - allocate and initialize a new check button
@@ -22,8 +11,7 @@
*
* Returns the newly allocated checkbutton on success, NULL on failure.
*/
-Ewl_Widget *
-ewl_checkbutton_new(char *label)
+Ewl_Widget *ewl_checkbutton_new(char *label)
{
Ewl_CheckButton *b;
@@ -40,78 +28,6 @@
}
/**
- * ewl_checkbutton_set_checked - change the checked status of the check button
- * @w: the check button to change the status
- * @c: the new status of the check button
- *
- * Returns no value. Changes the checked status of the check button and
- * updates it's appearance to reflect the change.
- */
-void
-ewl_checkbutton_set_checked(Ewl_Widget * w, int c)
-{
- Ewl_CheckButton *cb;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
-
- cb = EWL_CHECKBUTTON(w);
-
- if (c)
- cb->checked = 1;
- else
- cb->checked = 0;
-
- __ewl_checkbutton_update_check(w);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * ewl_checkbutton_is_checked - determine the check state of the check button
- * @w: the check button to examine for it's checked state
- *
- * Returns TRUE if the button is checked, FALSE if not.
- */
-int
-ewl_checkbutton_is_checked(Ewl_Widget * w)
-{
- Ewl_CheckButton *cb;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("w", w, -1);
-
- cb = EWL_CHECKBUTTON(w);
-
- DRETURN_INT(cb->checked, DLEVEL_STABLE);
-}
-
-/**
- * ewl_checkbutton_set_label_position - set the check buttons label position
- * @w: the widget to change the label positioning
- * @p: the new position of the label
- *
- * Returns no value. Changes the position of the label associated with the
- * check button.
- */
-void
-ewl_checkbutton_set_label_position(Ewl_Widget * w, Ewl_Position p)
-{
- Ewl_CheckButton *cb;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
-
- cb = EWL_CHECKBUTTON(w);
-
- cb->label_position = p;
-
- ewl_widget_configure(w);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
* ewl_checkbutton_init - initialize the members and callbacks of a check button
* @cb: the check button to initialize
* @label: the label to give the initialized check button
@@ -119,8 +35,7 @@
* Returns no vlalue.The internal structures and callbacks of the checkbutton
* are initialized ot default values.
*/
-void
-ewl_checkbutton_init(Ewl_CheckButton * cb, char *label)
+void ewl_checkbutton_init(Ewl_CheckButton * cb, char *label)
{
Ewl_Button *b;
Ewl_Widget *w;
@@ -132,24 +47,33 @@
ewl_button_init(b, label);
ewl_widget_set_appearance(w, "/appearance/button/check");
+
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE);
- ewl_object_set_preferred_size(EWL_OBJECT(w), 20, 20);
- ewl_callback_del(w, EWL_CALLBACK_CONFIGURE, __ewl_box_configure);
- ewl_callback_append(w, EWL_CALLBACK_THEME_UPDATE,
- __ewl_checkbutton_theme_update, NULL);
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
- __ewl_checkbutton_configure, NULL);
ewl_callback_append(w, EWL_CALLBACK_CLICKED,
__ewl_checkbutton_clicked, NULL);
cb->label_position = EWL_POSITION_RIGHT;
+ /*
+ * Add the check box first.
+ */
+ cb->check = ewl_check_new();
+ ewl_container_prepend_child(EWL_CONTAINER(cb), cb->check);
+ ewl_widget_show(cb->check);
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_checkbutton_configure(Ewl_Widget * w, void *ev_data, void *user_data)
+/**
+ * ewl_checkbutton_set_label_position - set the check buttons label position
+ * @w: the widget to change the label positioning
+ * @p: the new position of the label
+ *
+ * Returns no value. Changes the position of the label associated with the
+ * check button.
+ */
+void ewl_checkbutton_set_label_position(Ewl_Widget * w, Ewl_Position p)
{
Ewl_Button *b;
Ewl_CheckButton *cb;
@@ -160,75 +84,33 @@
b = EWL_BUTTON(w);
cb = EWL_CHECKBUTTON(w);
- if (b->label_object) {
- if (MINIMUM_H(b->label_object) > CURRENT_H(w)) {
- CURRENT_Y(b->label_object) = CURRENT_Y(w) + 17;
- ewl_object_set_minimum_height(EWL_OBJECT(w),
- MINIMUM_H(b->
- label_object));
- ewl_object_set_maximum_height(EWL_OBJECT(w),
- MINIMUM_H(b->
- label_object));
- } else {
- CURRENT_Y(b->label_object) = CURRENT_Y(w);
- CURRENT_Y(b->label_object) += (CURRENT_H(w) / 2) -
- (CURRENT_H(b->label_object) / 2);
- MINIMUM_H(w) = 17;
- MAXIMUM_H(w) = 17;
- }
-
- MINIMUM_W(w) = 17 + CURRENT_W(b->label_object);
- MAXIMUM_W(w) = 17 + CURRENT_W(b->label_object);
-
- if (cb->label_position == EWL_POSITION_LEFT)
- CURRENT_X(b->label_object) = CURRENT_X(w);
- else
- CURRENT_X(b->label_object) = CURRENT_X(w) + 17;
-
- ewl_widget_configure(b->label_object);
-
- if (w->ebits_object) {
- if (cb->label_position == EWL_POSITION_LEFT)
- ebits_move(w->ebits_object,
- CURRENT_X(w) +
- CURRENT_W(b->label_object),
- CURRENT_Y(w));
- else
- ebits_move(w->ebits_object, CURRENT_X(w),
- CURRENT_Y(w));
+ if (cb->label_position == p)
+ DRETURN(DLEVEL_STABLE);
- }
+ cb->label_position = p;
+ ewl_container_remove_child(EWL_CONTAINER(cb), EWL_WIDGET(b->label));
+ ewl_container_remove_child(EWL_CONTAINER(cb), cb->check);
+
+ /*
+ * Add the label and check back into the checkbutton with the correct
+ * order.
+ */
+ if (p == EWL_POSITION_RIGHT) {
+ ewl_container_append_child(EWL_CONTAINER(cb), cb->check);
+ ewl_container_append_child(EWL_CONTAINER(cb),
+ EWL_WIDGET(b->label));
} else {
- MAXIMUM_W(w) = 17;
- MAXIMUM_H(w) = 17;
+ ewl_container_append_child(EWL_CONTAINER(cb),
+ EWL_WIDGET(b->label));
+ ewl_container_append_child(EWL_CONTAINER(cb), cb->check);
}
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-__ewl_checkbutton_clicked(Ewl_Widget * w, void *ev_data, void *user_data)
-{
- Ewl_CheckButton *cb;
- int oc;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
-
- cb = EWL_CHECKBUTTON(w);
- oc = cb->checked;
-
- cb->checked ^= 1;
-
- __ewl_checkbutton_update_check(w);
-
- ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED);
+ ewl_widget_configure(w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_checkbutton_update_check(Ewl_Widget * w)
+void __ewl_checkbutton_clicked(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_CheckButton *cb;
@@ -237,25 +119,9 @@
cb = EWL_CHECKBUTTON(w);
- if (w->ebits_object) {
- if (cb->checked)
- ebits_set_named_bit_state(w->ebits_object, "Check",
- "clicked");
- else
- ebits_set_named_bit_state(w->ebits_object, "Check",
- "normal");
- }
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-void
-__ewl_checkbutton_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("w", w);
-
- __ewl_checkbutton_update_check(w);
+ ewl_callback_call_with_event_data(cb->check, EWL_CALLBACK_CLICKED,
+ ev_data);
+ ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_checkbutton.h 16 Apr 2002 18:22:56 -0000 1.12
+++ ewl_checkbutton.h 25 May 2002 05:46:40 -0000 1.13
@@ -12,16 +12,32 @@
#define EWL_CHECKBUTTON(button) ((Ewl_CheckButton *) button)
struct _ewl_checkbutton {
+
+ /*
+ * Inherit the basic button properties
+ */
Ewl_Button button;
+
+ /*
+ * Label positition determines packing order of the label and the
+ * check
+ */
Ewl_Position label_position;
- unsigned int checked;
+
+ /*
+ * Public references to the check and label widgets.
+ */
+ Ewl_Widget *check;
};
Ewl_Widget *ewl_checkbutton_new(char *l);
+void ewl_checkbutton_init(Ewl_CheckButton * cb, char *label);
-void ewl_checkbutton_set_checked(Ewl_Widget * w, int c);
-int ewl_checkbutton_is_checked(Ewl_Widget * w);
+#define ewl_checkbutton_set_checked(cb, c) \
+ ewl_check_set_checked(EWL_CHECK(cb->check), c)
+#define ewl_checkbutton_is_checked(cb) \
+ ewl_check_is_checked(EWL_CHECK(cb->check))
void ewl_checkbutton_set_label_position(Ewl_Widget * w,
Ewl_Position p);
-#endif /* __EWL_CHECKBUTTON_H__ */
+#endif /* __EWL_CHECKBUTTON_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_config.c 16 Apr 2002 18:22:56 -0000 1.19
+++ ewl_config.c 25 May 2002 05:46:40 -0000 1.20
@@ -8,8 +8,8 @@
static E_DB_File *config_db = NULL;
-static void __create_user_config(void);
-static void __create_fx_config(void);
+void __create_user_config(void);
+void __create_fx_config(void);
static int __open_config_db(const char *name);
static void __close_config_db(void);
@@ -24,8 +24,7 @@
* Returns true on success, false on failure. This sets up the necessary
* configuration variables.
*/
-int
-ewl_config_init(void)
+int ewl_config_init(void)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -53,8 +52,7 @@
* Returns TRUE on success, FALSE on failure. Sets the string value associated
* with the key @k to @v in the configuration database.
*/
-int
-ewl_config_set_str(char *config, char *k, char *v)
+int ewl_config_set_str(char *config, char *k, char *v)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -79,8 +77,7 @@
* Returns TRUE on success, FALSE on failure. Sets the integer value associated
* with the key @k to @v in the configuration database.
*/
-int
-ewl_config_set_int(char *config, char *k, int v)
+int ewl_config_set_int(char *config, char *k, int v)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -104,8 +101,7 @@
* Returns TRUE on success, FALSE on failure. Sets the float value associated
* with the key @k to @v in the configuration database.
*/
-int
-ewl_config_set_float(char *config, char *k, float v)
+int ewl_config_set_float(char *config, char *k, float v)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -128,8 +124,7 @@
* Returns the string value associated with key @k in the configuration
* database on success, NULL on failure.
*/
-char *
-ewl_config_get_str(char *config, char *k)
+char *ewl_config_get_str(char *config, char *k)
{
char *ret = NULL;
@@ -153,8 +148,7 @@
* Returns the integer value associated with key @k in the configuration
* database on success, 0 on failure.
*/
-int
-ewl_config_get_int(char *config, char *k)
+int ewl_config_get_int(char *config, char *k)
{
int ret = -1;
int v;
@@ -181,8 +175,7 @@
* Returns the float value associated with key @k in the configuration
* database on success, 0.0 on failure.
*/
-float
-ewl_config_get_float(char *config, char *k)
+float ewl_config_get_float(char *config, char *k)
{
int ret = -1;
float v = 0.0;
@@ -206,8 +199,7 @@
*
* Returns the found render method on success, software rendering on failure.
*/
-Evas_Render_Method
-ewl_config_get_render_method()
+Evas_Render_Method ewl_config_get_render_method()
{
Evas_Render_Method method = RENDER_METHOD_ALPHA_SOFTWARE;
char *str = NULL;
@@ -236,8 +228,7 @@
* Returns no value. Reads in the values of the configuration database and
* applies them to the running ewl program.
*/
-void
-ewl_config_reread_and_apply(void)
+void ewl_config_reread_and_apply(void)
{
Ewl_Config nc;
@@ -248,7 +239,7 @@
nc.evas.font_cache = ewl_config_get_int("system", "/evas/font_cache");
nc.evas.image_cache = ewl_config_get_int("system", "/evas/image_cache");
nc.evas.render_method =
- ewl_config_get_str("system", "/evas/render_method");
+ ewl_config_get_str("system", "/evas/render_method");
nc.theme.name = ewl_config_get_str("system", "/theme/name");
nc.theme.cache = ewl_config_get_int("system", "/theme/cache");
@@ -289,8 +280,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-static void
-__create_user_config(void)
+void __create_user_config(void)
{
char *home;
char pe[256];
@@ -326,8 +316,7 @@
DRETURN(DLEVEL_STABLE);
}
-static void
-__create_fx_config(void)
+void __create_fx_config(void)
{
/* Give buttons fade_in & glow & fade_out effects by default */
ewl_config_set_int("fx", "/user/button/count", 2);
@@ -346,8 +335,7 @@
EWL_CALLBACK_HIDE);
}
-static int
-__open_config_db(const char *name)
+static int __open_config_db(const char *name)
{
char *home;
char path[PATH_LEN];
@@ -371,8 +359,7 @@
DRETURN_INT(FALSE, DLEVEL_STABLE);
}
-static void
-__close_config_db()
+static void __close_config_db()
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -386,8 +373,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-static int
-__config_exists(char *name)
+static int __config_exists(char *name)
{
char *home;
char path[PATH_LEN];
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_config.h 16 Apr 2002 18:22:56 -0000 1.15
+++ ewl_config.h 25 May 2002 05:46:40 -0000 1.16
@@ -37,4 +37,4 @@
void ewl_config_reread_and_apply(void);
-#endif /* __EWL_CONFIG_H__ */
+#endif /* __EWL_CONFIG_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_container.c 19 Apr 2002 22:09:57 -0000 1.23
+++ ewl_container.c 25 May 2002 05:46:40 -0000 1.24
@@ -69,8 +69,7 @@
*
* Returns no value. Changes the add nofitier function of @container to @add.
*/
-void
-ewl_container_add_notify(Ewl_Container * container, Ewl_Child_Add add)
+void ewl_container_add_notify(Ewl_Container * container, Ewl_Child_Add add)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -109,8 +108,7 @@
* Returns no value. Attaches the child to the end of the parent containers
* child list.
*/
-void
-ewl_container_append_child(Ewl_Container * pc, Ewl_Widget * child)
+void ewl_container_append_child(Ewl_Container * pc, Ewl_Widget * child)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("pc", pc);
@@ -129,6 +127,7 @@
* it's parent has been changed.
*/
child->parent = EWL_WIDGET(pc);
+ LAYER(child) = LAYER(pc) + 5;
ewd_list_append(pc->children, child);
/*
@@ -161,8 +160,7 @@
* Returns no value. Attaches the child to the start of the parent containers
* child list.
*/
-void
-ewl_container_prepend_child(Ewl_Container * pc, Ewl_Widget * child)
+void ewl_container_prepend_child(Ewl_Container * pc, Ewl_Widget * child)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("pc", pc);
@@ -181,6 +179,7 @@
* it's parent has been changed.
*/
child->parent = EWL_WIDGET(pc);
+ LAYER(child) = LAYER(pc) + 5;
ewd_list_prepend(pc->children, child);
/*
@@ -234,6 +233,7 @@
* notify the child that it's parent has been changed.
*/
child->parent = EWL_WIDGET(pc);
+ LAYER(child) = LAYER(pc) + 5;
ewd_list_goto_index(pc->children, index);
ewd_list_insert(pc->children, child);
@@ -266,8 +266,7 @@
* Returns no value. Removes the specified child from the container without
* destroying the child.
*/
-void
-ewl_container_remove_child(Ewl_Container * pc, Ewl_Widget * child)
+void ewl_container_remove_child(Ewl_Container * pc, Ewl_Widget * child)
{
Ewl_Widget *temp;
@@ -308,8 +307,7 @@
* @size: the amount of change in size
* @o: the orientation of the size change
*/
-void
-ewl_container_resize_child(Ewl_Widget * w, int size, Ewl_Orientation o)
+void ewl_container_resize_child(Ewl_Widget * w, int size, Ewl_Orientation o)
{
int old_w, old_h;
int new_w, new_h;
@@ -335,7 +333,7 @@
*/
if (EWL_CONTAINER(w->parent)->child_resize)
EWL_CONTAINER(w->parent)->
- child_resize(EWL_CONTAINER(w->parent), w, size, o);
+ child_resize(EWL_CONTAINER(w->parent), w, size, o);
/*
* Get the new preferred size of the parent to see if it changed.
@@ -359,8 +357,7 @@
* Returns the found widget on success, NULL on failure. The given container
* is searched to find any child that intersects the given coordinates.
*/
-Ewl_Widget *
-ewl_container_get_child_at(Ewl_Container * widget, int x, int y)
+Ewl_Widget *ewl_container_get_child_at(Ewl_Container * widget, int x, int y)
{
Ewl_Widget *found = NULL;
Ewl_Widget *child = NULL;
@@ -380,7 +377,7 @@
if (x >= CURRENT_X(child) && y >= CURRENT_Y(child)
&& CURRENT_X(child) + CURRENT_W(child) >= x
&& CURRENT_Y(child) + CURRENT_H(child) >= y)
- if ((!found || LAYER(found) < LAYER(child)) &&
+ if ((!found || LAYER(found) <= LAYER(child)) &&
VISIBLE(child))
found = child;
}
@@ -396,12 +393,12 @@
*
* Returns a point to the intersecting widget on success, NULL on failure.
*/
-Ewl_Widget *
-ewl_container_get_child_at_recursive(Ewl_Container * widget, int x, int y)
+Ewl_Widget *ewl_container_get_child_at_recursive(Ewl_Container * widget,
+ int x, int y)
{
/*
- * These 2 temporary variables allow for traversing recursive
- * containers without using high levels of recursion.
+ * These temporary variables allow for traversing recursive
+ * containers without actually making recursive function calls.
*/
Ewl_Widget *child = NULL;
Ewl_Widget *child2 = NULL;
@@ -421,8 +418,8 @@
* Now move down through the tree of widgets until the bottom layer is
* found.
*/
- while ((child2 =
- ewl_container_get_child_at(EWL_CONTAINER(child), x, y))) {
+ while ((child2 = ewl_container_get_child_at(EWL_CONTAINER(child),
+ x, y))) {
if (child2->recursive) {
child = ewl_container_get_child_at(EWL_CONTAINER(child),
x, y);
@@ -443,8 +440,7 @@
* Returns no value. Destroys all the children of the container but not the
* container itself.
*/
-void
-ewl_container_reset(Ewl_Container * c)
+void ewl_container_reset(Ewl_Container * c)
{
Ewl_Widget *w;
@@ -465,8 +461,7 @@
* When reparenting a container, it's children need the updated information
* about the container, such as evas and evas_window.
*/
-void
-__ewl_container_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_container_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Widget *child;
@@ -492,8 +487,7 @@
* creating and showing a clip box, as well as clipping the clip box to parent
* clip boxes.
*/
-void
-__ewl_container_realize(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_container_realize(Ewl_Widget * w, void *ev_data, void *user_data)
{
int i = 0;
Ewl_Window *win;
@@ -571,8 +565,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_container_destroy(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_container_destroy(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Window *win;
Ewl_Container *c;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_container.h 16 Apr 2002 18:22:56 -0000 1.13
+++ ewl_container.h 25 May 2002 05:46:40 -0000 1.14
@@ -69,4 +69,4 @@
Ewl_Widget *ewl_container_get_child_at_recursive(Ewl_Container * widget,
int x, int y);
-#endif /* __EWL_CONTAINER_H__ */
+#endif /* __EWL_CONTAINER_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_cursor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_cursor.c 16 Apr 2002 18:22:56 -0000 1.6
+++ ewl_cursor.c 25 May 2002 05:46:40 -0000 1.7
@@ -7,8 +7,7 @@
*
* Returns a newly allocated cursor widget on success, NULL on failure.
*/
-Ewl_Widget *
-ewl_cursor_new(void)
+Ewl_Widget *ewl_cursor_new(void)
{
Ewl_Cursor *c;
@@ -30,8 +29,7 @@
* Returns no value. Changes the position of the cursor so that the entry
* widget can update it appropriately.
*/
-void
-ewl_cursor_set_position(Ewl_Widget * w, int p)
+void ewl_cursor_set_position(Ewl_Widget * w, int p)
{
Ewl_Cursor *c;
@@ -53,8 +51,7 @@
*
* Returns the current position of the entry widget @w.
*/
-int
-ewl_cursor_get_position(Ewl_Widget * w)
+int ewl_cursor_get_position(Ewl_Widget * w)
{
Ewl_Cursor *c;
@@ -72,8 +69,7 @@
*
* Returns no value. Sets the default values and appearance for the cursor @c.
*/
-void
-ewl_cursor_init(Ewl_Cursor * c)
+void ewl_cursor_init(Ewl_Cursor * c)
{
Ewl_Widget *w;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_cursor.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_cursor.h 16 Apr 2002 18:22:56 -0000 1.5
+++ ewl_cursor.h 25 May 2002 05:46:40 -0000 1.6
@@ -18,4 +18,4 @@
int ewl_cursor_get_position(Ewl_Widget * w);
-#endif /* __EWL_CURSOR_H__ */
+#endif /* __EWL_CURSOR_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_debug.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_debug.h 16 Apr 2002 18:22:56 -0000 1.15
+++ ewl_debug.h 25 May 2002 05:46:40 -0000 1.16
@@ -122,4 +122,4 @@
} \
}
-#endif /* __EWL_DEBUG_H__ */
+#endif /* __EWL_DEBUG_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_entry.c 19 Apr 2002 22:09:57 -0000 1.38
+++ ewl_entry.c 25 May 2002 05:46:40 -0000 1.39
@@ -26,9 +26,12 @@
void __ewl_entry_delete_to_left(Ewl_Widget * w);
void __ewl_entry_delete_to_right(Ewl_Widget * w);
-void
- __ewl_entry_update_selected_region(Ewl_Widget * w, void *user_data,
+void __ewl_entry_update_selected_region(Ewl_Widget * w,
+ void *user_data,
void *ev_data);
+void __ewl_entry_child_resize(Ewl_Container * entry,
+ Ewl_Widget * text, int size,
+ Ewl_Orientation o);
/**
* ewl_entry_new - allocate and initialize a new entry widget
@@ -36,8 +39,7 @@
* Returns a newly allocated and initialized entry widget on success, NULL on
* failure.
*/
-Ewl_Widget *
-ewl_entry_new(void)
+Ewl_Widget *ewl_entry_new(void)
{
Ewl_Entry *e;
@@ -69,8 +71,7 @@
*
* Returns no value. Change the text of the entry widget @e to the string @t.
*/
-void
-ewl_entry_set_text(Ewl_Entry * e, char *t)
+void ewl_entry_set_text(Ewl_Entry * e, char *t)
{
Ewl_Widget *w;
@@ -84,8 +85,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-char *
-ewl_entry_get_text(Ewl_Entry * e)
+char *ewl_entry_get_text(Ewl_Entry * e)
{
Ewl_Widget *w;
@@ -104,8 +104,7 @@
* Returns no value. Initializes the entry widget @e to it's default values
* and callbacks.
*/
-void
-ewl_entry_init(Ewl_Entry * e)
+void ewl_entry_init(Ewl_Entry * e)
{
Ewl_Widget *w;
@@ -115,7 +114,7 @@
w = EWL_WIDGET(e);
ewl_container_init(EWL_CONTAINER(w), "/appearance/entry/default",
- NULL, NULL);
+ NULL, __ewl_entry_child_resize);
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_FILL);
ewl_object_set_minimum_size(EWL_OBJECT(w), 20, 20);
ewl_object_set_maximum_size(EWL_OBJECT(w), 1 << 30, 20);
@@ -149,8 +148,7 @@
/*
* Draw the appearance information for the entry widget
*/
-void
-__ewl_entry_realize(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_realize(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Entry *e;
@@ -166,21 +164,10 @@
ewl_widget_realize(e->selection);
ewl_widget_hide(e->selection);
- /*
- * if (w->ebits_object) {
- * int ww, hh;
- *
- * ebits_get_max_size(w->ebits_object, &ww, &hh);
- *
- * ewl_object_set_maximum_size(EWL_OBJECT(w), ww, hh);
- * }
- */
-
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_configure(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Entry *e;
int xx, yy, ww, hh;
@@ -268,8 +255,7 @@
/*
* Handle key events to modify the text of the entry widget.
*/
-void
-__ewl_entry_key_down(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_key_down(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ecore_Event_Key_Down *ev;
@@ -296,8 +282,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_mouse_down(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_mouse_down(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ecore_Event_Mouse_Down *ev;
Ewl_Entry *e;
@@ -339,8 +324,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_mouse_move(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_mouse_move(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ecore_Event_Mouse_Move *ev;
Ewl_Entry *e;
@@ -392,8 +376,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_select(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_select(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Entry *e;
@@ -407,8 +390,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_deselect(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_deselect(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Entry *e;
@@ -422,8 +404,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_entry_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Entry *e;
char *font, *style;
@@ -450,8 +431,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_move_cursor_to_left(Ewl_Widget * w)
+void __ewl_entry_move_cursor_to_left(Ewl_Widget * w)
{
Ewl_Entry *e;
int pos;
@@ -471,8 +451,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_move_cursor_to_right(Ewl_Widget * w)
+void __ewl_entry_move_cursor_to_right(Ewl_Widget * w)
{
Ewl_Entry *e;
char *str;
@@ -500,8 +479,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_move_cursor_to_home(Ewl_Widget * w)
+void __ewl_entry_move_cursor_to_home(Ewl_Widget * w)
{
Ewl_Entry *e;
@@ -516,8 +494,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_move_cursor_to_end(Ewl_Widget * w)
+void __ewl_entry_move_cursor_to_end(Ewl_Widget * w)
{
Ewl_Entry *e;
char *s;
@@ -540,8 +517,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_insert_text(Ewl_Widget * w, char *s)
+void __ewl_entry_insert_text(Ewl_Widget * w, char *s)
{
Ewl_Entry *e;
char *s2, *s3;
@@ -577,8 +553,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_delete_to_left(Ewl_Widget * w)
+void __ewl_entry_delete_to_left(Ewl_Widget * w)
{
Ewl_Entry *e;
char *s, *s2;
@@ -612,8 +587,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
-__ewl_entry_delete_to_right(Ewl_Widget * w)
+void __ewl_entry_delete_to_right(Ewl_Widget * w)
{
Ewl_Entry *e;
char *s, *s2;
@@ -641,4 +615,18 @@
ewl_widget_configure(w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+void
+__ewl_entry_child_resize(Ewl_Container * entry, Ewl_Widget * text, int size,
+ Ewl_Orientation o)
+{
+ if (o == EWL_ORIENTATION_HORIZONTAL)
+ ewl_object_set_preferred_w(EWL_OBJECT(entry),
+ ewl_object_get_preferred_w(EWL_OBJECT
+ (text)));
+ else
+ ewl_object_set_preferred_h(EWL_OBJECT(entry),
+ ewl_object_get_preferred_h(EWL_OBJECT
+ (text)));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_entry.h 16 Apr 2002 18:22:56 -0000 1.14
+++ ewl_entry.h 25 May 2002 05:46:40 -0000 1.15
@@ -18,4 +18,4 @@
void ewl_entry_set_text(Ewl_Entry * e, char *t);
char *ewl_entry_get_text(Ewl_Entry * e);
-#endif /* __EWL_ENTRY_H__ */
+#endif /* __EWL_ENTRY_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_enums.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_enums.h 19 Apr 2002 22:09:57 -0000 1.23
+++ ewl_enums.h 25 May 2002 05:46:40 -0000 1.24
@@ -94,7 +94,7 @@
EWL_FILL_POLICY_HSHRINK = 1,
EWL_FILL_POLICY_VSHRINK = 2,
EWL_FILL_POLICY_SHRINK =
- EWL_FILL_POLICY_HSHRINK | EWL_FILL_POLICY_VSHRINK,
+ EWL_FILL_POLICY_HSHRINK | EWL_FILL_POLICY_VSHRINK,
EWL_FILL_POLICY_HFILL = 0x10,
EWL_FILL_POLICY_VFILL = 0x20,
EWL_FILL_POLICY_FILL = EWL_FILL_POLICY_HFILL | EWL_FILL_POLICY_VFILL,
@@ -137,12 +137,12 @@
EWL_FX_MODIFIES_GREEN_CHANNEL = (0x1 << 3),
EWL_FX_MODIFIES_BLUE_CHANNEL = (0x1 << 4),
EWL_FX_MODIFIES_ALL_CHANNELS = EWL_FX_MODIFIES_ALPHA_CHANNEL |
- EWL_FX_MODIFIES_RED_CHANNEL | EWL_FX_MODIFIES_GREEN_CHANNEL |
- EWL_FX_MODIFIES_BLUE_CHANNEL,
+ EWL_FX_MODIFIES_RED_CHANNEL | EWL_FX_MODIFIES_GREEN_CHANNEL |
+ EWL_FX_MODIFIES_BLUE_CHANNEL,
EWL_FX_MODIFIES_POSITION = (0x1 << 6),
EWL_FX_MODIFIES_SIZE = (0x1 << 7),
EWL_FX_MODIFIES_GEOMETRY =
- EWL_FX_MODIFIES_POSITION | EWL_FX_MODIFIES_SIZE
+ EWL_FX_MODIFIES_POSITION | EWL_FX_MODIFIES_SIZE
};
typedef enum _ewl_scrollbar_flags Ewl_ScrollBar_Flags;
@@ -161,4 +161,4 @@
EWL_FILEDIALOG_TYPE_CLOSE
};
-#endif /* __EWL_ENUMS_H__ */
+#endif /* __EWL_ENUMS_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_events.c 19 Apr 2002 22:09:57 -0000 1.25
+++ ewl_events.c 25 May 2002 05:46:40 -0000 1.26
@@ -24,8 +24,7 @@
*
* Returns true or false to indicate success in initiating the event filters.
*/
-int
-ewl_ev_init(void)
+int ewl_ev_init(void)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -65,8 +64,7 @@
* Returns no value. Dispatches the expose event to the appropriate window for
* handling.
*/
-static void
-ewl_ev_window_expose(Ecore_Event * _ev)
+static void ewl_ev_window_expose(Ecore_Event * _ev)
{
/*
* Widgets don't need to know about this usually, but we still need to
@@ -96,8 +94,7 @@
* Returns no value. Dispatches a configure even to the appropriate ewl
* window.
*/
-static void
-ewl_ev_window_configure(Ecore_Event * _ev)
+static void ewl_ev_window_configure(Ecore_Event * _ev)
{
/*
* When a configure event occurs, we must update the windows geometry
@@ -132,8 +129,7 @@
* Returns no value. Dispatches the delete event to the appropriate ewl
* window.
*/
-static void
-ewl_ev_window_delete(Ecore_Event * _ev)
+static void ewl_ev_window_delete(Ecore_Event * _ev)
{
/*
* Retrieve the appropriate ewl_window using the x window id that is
@@ -163,8 +159,7 @@
* Returns no value. Dispatches the key down event to the appropriate ewl
* window.
*/
-static void
-ewl_ev_key_down(Ecore_Event * _ev)
+static void ewl_ev_key_down(Ecore_Event * _ev)
{
/*
* Dispatcher of key down events, these get sent to the last widget
@@ -206,8 +201,7 @@
* Returns no value. Dispatches the key up event to the appropriate ewl
* window.
*/
-static void
-ewl_ev_key_up(Ecore_Event * _ev)
+static void ewl_ev_key_up(Ecore_Event * _ev)
{
/*
* Dispatch key up events to the appropriate widget
@@ -242,8 +236,7 @@
* Returns no value. Dispatches the mouse down event to the appropriate ewl
* window. Also determines the widgets clicked state.
*/
-static void
-ewl_ev_mouse_down(Ecore_Event * _ev)
+static void ewl_ev_mouse_down(Ecore_Event * _ev)
{
Ewl_Widget *widget = NULL;
Ewl_Window *window;
@@ -302,8 +295,7 @@
* Returns no value. Dispatches the mouse up event to the appropriate ewl
* window. Also determines the widgets clicked state.
*/
-static void
-ewl_ev_mouse_up(Ecore_Event * _ev)
+static void ewl_ev_mouse_up(Ecore_Event * _ev)
{
Ewl_Window *window;
Ecore_Event_Mouse_Up *ev;
@@ -333,8 +325,7 @@
* Returns no value. Dispatches the mouse move event to the appropriate ewl
* window.
*/
-static void
-ewl_ev_mouse_move(Ecore_Event * _ev)
+static void ewl_ev_mouse_move(Ecore_Event * _ev)
{
Ewl_Widget *widget;
Ewl_Window *window;
@@ -392,8 +383,7 @@
* Returns no value. Dispatches the mouse out event to the appropriate ewl
* window.
*/
-static void
-ewl_ev_mouse_out(Ecore_Event * _ev)
+static void ewl_ev_mouse_out(Ecore_Event * _ev)
{
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_events.h 16 Apr 2002 18:22:56 -0000 1.11
+++ ewl_events.h 25 May 2002 05:46:40 -0000 1.12
@@ -4,4 +4,4 @@
int ewl_ev_init(void);
-#endif /* __EWL_EVENTS_H__ */
+#endif /* __EWL_EVENTS_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_filedialog.c 19 Apr 2002 22:09:57 -0000 1.2
+++ ewl_filedialog.c 25 May 2002 05:46:40 -0000 1.3
@@ -37,9 +37,9 @@
* Returns a pointer to a newly allocated filedialog in success, NULL on
* failure.
*/
-Ewl_Widget *
-ewl_filedialog_new(Ewl_Widget * follows, Ewl_Filedialog_Type type,
- Ewl_Callback_Function cb)
+Ewl_Widget *ewl_filedialog_new(Ewl_Widget * follows,
+ Ewl_Filedialog_Type type,
+ Ewl_Callback_Function cb)
{
Ewl_Filedialog *fd;
@@ -87,8 +87,7 @@
}
-void
-__open_dialog_init(Ewl_Filedialog * fd, Ewl_Callback_Function cb)
+void __open_dialog_init(Ewl_Filedialog * fd, Ewl_Callback_Function cb)
{
Open_Dialog *od;
Ewl_Widget *separator;
@@ -148,8 +147,7 @@
}
-void
-__save_dialog_init(Ewl_Filedialog * fd, Ewl_Callback_Function cb)
+void __save_dialog_init(Ewl_Filedialog * fd, Ewl_Callback_Function cb)
{
Save_Dialog *sd;
@@ -173,8 +171,7 @@
-void
-__destroy_dialog(Ewl_Widget * w, void *ev_data, void *user_data)
+void __destroy_dialog(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Widget *fd;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_fileselector.c 19 Apr 2002 22:09:57 -0000 1.3
+++ ewl_fileselector.c 25 May 2002 05:46:40 -0000 1.4
@@ -17,8 +17,7 @@
* Returns a pointer to a newly allocated fileselector on success, NULL
* on failure.
*/
-Ewl_Widget *
-ewl_fileselector_new(Ewl_Callback_Function file_clicked)
+Ewl_Widget *ewl_fileselector_new(Ewl_Callback_Function file_clicked)
{
Ewl_Fileselector *fs;
@@ -41,8 +40,7 @@
*
* Returns nothing. Initialize the fileselector to default values
*/
-void
-ewl_fileselector_init(Ewl_Fileselector * fs, Ewl_Callback_Function fc)
+void ewl_fileselector_init(Ewl_Fileselector * fs, Ewl_Callback_Function fc)
{
Ewl_Widget *w;
@@ -77,8 +75,7 @@
}
-void
-__ewl_fileselector_realize(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_fileselector_realize(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Fileselector *fs;
char *home;
@@ -113,8 +110,7 @@
}
-void
-__directory_clicked(Ewl_Widget * w, void *ev_data, void *user_data)
+void __directory_clicked(Ewl_Widget * w, void *ev_data, void *user_data)
{
char dir[PATH_MAX];
int index;
@@ -136,8 +132,7 @@
}
-void
-__process_directory(Ewl_Fileselector * fs, char *directory)
+void __process_directory(Ewl_Fileselector * fs, char *directory)
{
char **dir_head, **file_head;
char file[PATH_MAX];
@@ -260,12 +255,12 @@
fs->d_info[d_count].dirEntry = dentries[i];
tc = (Ewl_Table_Child *)
- ewl_table_add_return(EWL_TABLE
- (fs->dirs),
- dentries[i]->
- d_name, 1, 1,
- d_count + 1,
- d_count + 1);
+ ewl_table_add_return(EWL_TABLE
+ (fs->dirs),
+ dentries[i]->
+ d_name, 1, 1,
+ d_count + 1,
+ d_count + 1);
ewl_widget_show(EWL_WIDGET(tc));
@@ -291,12 +286,12 @@
fs->f_info[f_count].status = statBuffer;
tc = (Ewl_Table_Child *)
- ewl_table_add_return(EWL_TABLE
- (fs->files),
- dentries[i]->
- d_name, 1, 1,
- f_count + 1,
- f_count + 1);
+ ewl_table_add_return(EWL_TABLE
+ (fs->files),
+ dentries[i]->
+ d_name, 1, 1,
+ f_count + 1,
+ f_count + 1);
ewl_widget_show(EWL_WIDGET(tc));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fileselector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_fileselector.h 16 Apr 2002 18:22:56 -0000 1.1
+++ ewl_fileselector.h 25 May 2002 05:46:40 -0000 1.2
@@ -48,4 +48,4 @@
char *ewl_fileselector_get_current(Ewl_Fileselector * fs);
-#endif /* __EWL_FILESELECTOR_H__ */
+#endif /* __EWL_FILESELECTOR_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_floater.c 19 Apr 2002 22:09:57 -0000 1.4
+++ ewl_floater.c 25 May 2002 05:46:40 -0000 1.5
@@ -4,19 +4,19 @@
/*
* Local callbacks used for acting based on events to parent widgets.
*/
-static void __ewl_floater_parent_configure(Ewl_Widget * w, void *ev_data,
+void __ewl_floater_parent_configure(Ewl_Widget * w, void *ev_data,
void *user_data);
/*
* Local callbacks for events that occur to the floaters.
*/
-static void __ewl_floater_configure(Ewl_Widget * parent, void *ev_data,
+void __ewl_floater_configure(Ewl_Widget * parent, void *ev_data,
void *user_data);
-static void __ewl_floater_realize(Ewl_Widget * parent, void *ev_data,
+void __ewl_floater_realize(Ewl_Widget * parent, void *ev_data,
void *user_data);
-static void __ewl_floater_destroy(Ewl_Widget * parent, void *ev_data,
+void __ewl_floater_destroy(Ewl_Widget * parent, void *ev_data,
void *user_data);
-static void __ewl_floater_reparent(Ewl_Widget * parent, void *ev_data,
+void __ewl_floater_reparent(Ewl_Widget * parent, void *ev_data,
void *user_data);
extern void __ewl_widget_reparent(Ewl_Widget * parent, void *ev_data,
@@ -30,8 +30,7 @@
* widget on success. The @parent widget should be either a widget to follow
* relative too, or a window for absolute positioning.
*/
-Ewl_Widget *
-ewl_floater_new(Ewl_Widget * parent)
+Ewl_Widget *ewl_floater_new(Ewl_Widget * parent)
{
Ewl_Widget *f;
@@ -58,8 +57,7 @@
* Returns no value. Sets the fields and callbacks of the floater @f to their
* defaults.
*/
-void
-ewl_floater_init(Ewl_Floater * f, Ewl_Widget * parent)
+void ewl_floater_init(Ewl_Floater * f, Ewl_Widget * parent)
{
Ewl_Widget *w;
Ewl_Window *window;
@@ -129,8 +127,7 @@
*
* Returns no value
*/
-void
-ewl_floater_set_position(Ewl_Floater * f, int x, int y)
+void ewl_floater_set_position(Ewl_Floater * f, int x, int y)
{
DENTER_FUNCTION(DLEVEL_UNSTABLE);
@@ -156,8 +153,7 @@
* Returns no value. Sets the floater @f to be positioned relative to the
* position of the widget @w.
*/
-void
-ewl_floater_set_relative(Ewl_Floater * f, Ewl_Widget * w)
+void ewl_floater_set_relative(Ewl_Floater * f, Ewl_Widget * w)
{
DENTER_FUNCTION(DLEVEL_UNSTABLE);
@@ -186,7 +182,7 @@
/*
* Use this to ensure the floater gets configured when the parent/window is.
*/
-static void
+void
__ewl_floater_parent_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
DCHECK_PARAM_PTR("w", w);
@@ -196,8 +192,7 @@
}
-static void
-__ewl_floater_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_floater_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
{
DCHECK_PARAM_PTR("w", w);
DCHECK_PARAM_PTR("user_data", user_data);
@@ -214,8 +209,7 @@
* Configure the floater so that the positioning is relative to a followed
* widget if appropriate.
*/
-static void
-__ewl_floater_configure(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_floater_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
int align, x, y;
Ewl_Floater *f;
@@ -271,8 +265,7 @@
/*
* Grab some necessary information from the parent when realizing this widget
*/
-static void
-__ewl_floater_realize(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_floater_realize(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Floater *f;
@@ -290,8 +283,7 @@
* Be sure to remove the floater from the parent windows list of floaters when
* it gets destroyed.
*/
-static void
-__ewl_floater_destroy(Ewl_Widget * w, void *ev_data, void *user_data)
+void __ewl_floater_destroy(Ewl_Widget * w, void *ev_data, void *user_data)
{
DENTER_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_floater.h 16 Apr 2002 18:22:56 -0000 1.2
+++ ewl_floater.h 25 May 2002 05:46:40 -0000 1.3
@@ -26,4 +26,4 @@
void ewl_floater_init(Ewl_Floater * f, Ewl_Widget * parent);
-#endif /* __EWL_FLOATER_H__ */
+#endif /* __EWL_FLOATER_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fx.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_fx.c 19 Apr 2002 22:09:57 -0000 1.25
+++ ewl_fx.c 25 May 2002 05:46:40 -0000 1.26
@@ -23,8 +23,7 @@
* Returns no value. The programmer should not call this, it is used by
* ewl_init, and nothing else.
*/
-int
-ewl_fx_init(void)
+int ewl_fx_init(void)
{
int count;
@@ -72,8 +71,7 @@
* Returns no value. The programmer should not call this, it is used by
* ewl_deinit, and nothing else.
*/
-int
-ewl_fx_deinit(void)
+int ewl_fx_deinit(void)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -88,8 +86,7 @@
*
* Returns no value. Internal variables for fx to be used are setup on @w.
*/
-void
-ewl_fx_init_widget(Ewl_Widget * w)
+void ewl_fx_init_widget(Ewl_Widget * w)
{
char wname[PATH_LEN];
char key[PATH_LEN];
@@ -204,8 +201,7 @@
*
* Returns no value. Frees fx variables attached to the widget @w.
*/
-void
-ewl_fx_deinit_widget(Ewl_Widget * w)
+void ewl_fx_deinit_widget(Ewl_Widget * w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -271,8 +267,7 @@
*
* Returns TRUE on success, FALSE on failure.
*/
-int
-ewl_fx_del_proto(char *name)
+int ewl_fx_del_proto(char *name)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("name", name, FALSE);
@@ -286,8 +281,7 @@
*
* Returns a pointer to the found fx prototype on success, NULL on failure.
*/
-Ewl_FX_Proto *
-ewl_fx_proto_get(char *name)
+Ewl_FX_Proto *ewl_fx_proto_get(char *name)
{
Ewl_FX_Proto *fxp;
@@ -486,8 +480,7 @@
* Returns no value. Any fx currently running are stopped and all fx are
* deleted from the widget.
*/
-void
-ewl_fx_del_all(Ewl_Widget * w)
+void ewl_fx_del_all(Ewl_Widget * w)
{
Ewl_FX_Pending *pend;
@@ -635,8 +628,7 @@
*
* Returns no value. Removes the timer specified by @name from the widget @w.
*/
-void
-ewl_fx_timer_del(Ewl_Widget * w, char *name)
+void ewl_fx_timer_del(Ewl_Widget * w, char *name)
{
Ewl_FX_Timer *timer;
char name2[PATH_LEN];
@@ -685,8 +677,7 @@
* Returns no value. The RGBA values of @w's fx clip box are stored into any
* non-NULL pointers @r, @g, @b, and @a respectively.
*/
-void
-ewl_fx_clip_box_get_color(Ewl_Widget * w, int *r, int *g...
[truncated message content] |
|
From: <enl...@li...> - 2002-05-25 15:39:33
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/test Added Files: ewl_menu_test.c Log Message: Forgot to add the test for the new menu's. This test does not work right at all yet, so don't be surprised if it looks odd. |
|
From: <enl...@li...> - 2002-05-26 05:02:50
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/tools/ewl_config
Modified Files:
ewl_config.c
Log Message:
Fix new compilation errors as reported by JC Wong.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/tools/ewl_config/ewl_config.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_config.c 16 Apr 2002 18:56:06 -0000 1.18
+++ ewl_config.c 26 May 2002 05:02:49 -0000 1.19
@@ -88,9 +88,10 @@
ewl_config_read_configs();
e_conf.main_win = ewl_window_new();
- ewl_window_resize(e_conf.main_win, 446, 300);
- ewl_window_set_min_size(e_conf.main_win, 446, 300);
- ewl_window_set_title(e_conf.main_win, "EWL Configuration Program");
+ ewl_window_resize(EWL_WINDOW(e_conf.main_win), 446, 300);
+ ewl_window_set_min_size(EWL_WINDOW(e_conf.main_win), 446, 300);
+ ewl_window_set_title(EWL_WINDOW(e_conf.main_win),
+ "EWL Configuration Program");
ewl_callback_append(e_conf.main_win, EWL_CALLBACK_DELETE_WINDOW,
ewl_config_exit_cb, NULL);
ewl_widget_show(e_conf.main_win);
@@ -508,16 +509,18 @@
ewl_spinner_set_value(EWL_SPINNER(e_conf.image_cache),
(double) (c->evas.image_cache) / 1024.0);
- ewl_checkbutton_set_checked(e_conf.enable_debug, c->debug.enable);
+ ewl_checkbutton_set_checked(EWL_CHECKBUTTON(e_conf.enable_debug),
+ c->debug.enable);
ewl_spinner_set_value(EWL_SPINNER(e_conf.debug_level),
(double) (c->debug.level));
ewl_spinner_set_value(EWL_SPINNER(e_conf.global_fps),
(double) (c->fx.fps));
- ewl_entry_set_text(e_conf.theme_name, c->theme.name);
+ ewl_entry_set_text(EWL_ENTRY(e_conf.theme_name), c->theme.name);
- ewl_checkbutton_set_checked(e_conf.theme_cache, c->theme.cache);
+ ewl_checkbutton_set_checked(EWL_CHECKBUTTON(e_conf.theme_cache),
+ c->theme.cache);
}
Ewl_Config *
@@ -542,7 +545,7 @@
(float)(ewl_spinner_get_value(EWL_SPINNER(e_conf.image_cache)))
* 1024.0;
- if (ewl_checkbutton_is_checked(e_conf.enable_debug))
+ if (ewl_checkbutton_is_checked(EWL_CHECKBUTTON(e_conf.enable_debug)))
c->debug.enable = 1;
else
{
@@ -554,12 +557,12 @@
c->debug.level =
(int)(ewl_spinner_get_value(EWL_SPINNER(e_conf.debug_level)));
- c->theme.name = ewl_entry_get_text(e_conf.theme_name);
+ c->theme.name = ewl_entry_get_text(EWL_ENTRY(e_conf.theme_name));
if (!c->theme.name)
c->theme.name = strdup("default");
- c->theme.cache = ewl_checkbutton_is_checked(e_conf.theme_cache);
+ c->theme.cache = ewl_checkbutton_is_checked(EWL_CHECKBUTTON(e_conf.theme_cache));
c->fx.fps = ewl_spinner_get_value(EWL_SPINNER(e_conf.global_fps));
return c;
@@ -675,8 +678,8 @@
ewl_config_create_confirm_dialog(void)
{
confirm.win = ewl_window_new();
- ewl_window_resize(confirm.win, 473, 264);
- ewl_window_set_min_size(confirm.win, 473, 264);
+ ewl_window_resize(EWL_WINDOW(confirm.win), 473, 264);
+ ewl_window_set_min_size(EWL_WINDOW(confirm.win), 473, 264);
ewl_widget_show(confirm.win);
confirm.main_vbox = ewl_vbox_new();
|
|
From: <enl...@li...> - 2002-05-28 17:47:10
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/default/appearance/button/check Modified Files: base.bits.db Log Message: Fix some of the issues with the check bit. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/appearance/button/check/base.bits.db,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 Binary files /tmp/cvsLQLQTv and /tmp/cvsU6CmkR differ |
|
From: <enl...@li...> - 2002-06-03 21:33:55
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_check.c ewl_checkbutton.c Log Message: Couple more updates to the checkbutton code. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_check.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_check.c 25 May 2002 05:46:40 -0000 1.1 +++ ewl_check.c 3 Jun 2002 21:33:54 -0000 1.2 @@ -126,7 +126,7 @@ cb = EWL_CHECK(w); if (cb->checked) - ewl_widget_update_appearance(w, "clicked"); + ewl_widget_update_appearance(w, "checked"); else ewl_widget_update_appearance(w, "normal"); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- ewl_checkbutton.c 25 May 2002 05:46:40 -0000 1.27 +++ ewl_checkbutton.c 3 Jun 2002 21:33:54 -0000 1.28 @@ -47,6 +47,7 @@ ewl_button_init(b, label); ewl_widget_set_appearance(w, "/appearance/button/check"); + RECURSIVE(b) = FALSE; ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE); |
|
From: <enl...@li...> - 2002-06-05 21:59:37
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: README Log Message: Filled in some really basic README info. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- README 1 May 2001 04:00:37 -0000 1.2 +++ README 5 Jun 2002 21:59:35 -0000 1.3 @@ -0,0 +1,7 @@ +EWL README +---------- +EWL stands for Enlightenment Widget Library. It provides a widget abstraction +to creating GUI's using evas and ebits. The use of ebits allows for easy +creation of fairly advanced themes. + +More information can be found at http://www.enlightenment.org/pages/ewl.html |
|
From: <enl...@li...> - 2002-07-19 21:32:57
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_enums.h ewl_floater.c ewl_image.c ewl_imenu.c ewl_menu.c
ewl_menu_base.c ewl_seeker.c ewl_widget.c ewl_window.c
ewl_window.h
Log Message:
Filled out menu support a bit, along with a few minor fixups. Menus do not
quite work yet, but I wanted to commit this before I went on vacation. If
anyone feels motivated to finish them, please feel free. If not I'll finish
them up when I get back around August 1.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_enums.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_enums.h 25 May 2002 05:46:40 -0000 1.24
+++ ewl_enums.h 19 Jul 2002 21:32:56 -0000 1.25
@@ -9,7 +9,8 @@
*/
typedef enum _ewl_callback_type Ewl_Callback_Type;
-enum _ewl_callback_type {
+enum _ewl_callback_type
+{
EWL_CALLBACK_NONE,
EWL_CALLBACK_EXPOSE,
EWL_CALLBACK_REALIZE,
@@ -48,7 +49,8 @@
*/
typedef enum _ewl_orientation Ewl_Orientation;
-enum _ewl_orientation {
+enum _ewl_orientation
+{
EWL_ORIENTATION_HORIZONTAL,
EWL_ORIENTATION_VERTICAL
};
@@ -59,7 +61,8 @@
*/
typedef enum _ewl_state Ewl_State;
-enum _ewl_state {
+enum _ewl_state
+{
EWL_STATE_NORMAL = (0x1 << 0),
EWL_STATE_HILITED = (0x1 << 1),
EWL_STATE_PRESSED = (0x1 << 2),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_floater.c 25 May 2002 05:46:40 -0000 1.5
+++ ewl_floater.c 19 Jul 2002 21:32:56 -0000 1.6
@@ -60,7 +60,7 @@
void ewl_floater_init(Ewl_Floater * f, Ewl_Widget * parent)
{
Ewl_Widget *w;
- Ewl_Window *window;
+ /* Ewl_Window *window; */
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("f", f);
@@ -77,14 +77,18 @@
ewl_widget_set_appearance(w, "/appearance/floater");
f->follows = parent;
+ /*
window = ewl_window_find_window_by_widget(parent);
+ */
/*
* Need to add callbacks to the window that contains it as well the
* widget it follows, if they are not the same.
*/
+ /*
ewl_callback_append(EWL_WIDGET(window), EWL_CALLBACK_CONFIGURE,
__ewl_floater_parent_configure, w);
+ */
/*
@@ -96,22 +100,28 @@
NULL);
ewl_callback_append(w, EWL_CALLBACK_DESTROY, __ewl_floater_destroy,
NULL);
+ /*
ewl_callback_insert_after(w, EWL_CALLBACK_REPARENT,
__ewl_floater_reparent, window,
__ewl_widget_reparent, NULL);
+ */
/*
* add the floater to the window
*/
+ /*
ewl_container_append_child(EWL_CONTAINER(window), w);
+ */
/*
* Set the layer for this floater and increment the windows layering
* for the floaters.
*/
+ /*
LAYER(w) = LAYER(window) + 3000;
LAYER(window)++;
+ */
f->x = CURRENT_X(EWL_OBJECT(parent));
f->y = CURRENT_Y(EWL_OBJECT(parent));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_image.c 25 May 2002 05:46:40 -0000 1.16
+++ ewl_image.c 19 Jul 2002 21:32:56 -0000 1.17
@@ -200,6 +200,8 @@
} else {
evas_move(win->evas, i->image, CURRENT_X(w), CURRENT_Y(w));
evas_resize(win->evas, i->image, CURRENT_W(w), CURRENT_H(w));
+ evas_set_image_fill(win->evas, i->image, CURRENT_X(w),
+ CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_imenu.c 25 May 2002 05:46:40 -0000 1.2
+++ ewl_imenu.c 19 Jul 2002 21:32:56 -0000 1.3
@@ -57,31 +57,14 @@
DCHECK_PARAM_PTR("menu", menu);
/*
- * Create the popup menu portion of the menu. Do this prior to
- * initializing the rest of the fields to avoid the add callback being
- * called.
- */
- menu->popbox = menu->popup = ewl_floater_new(EWL_WIDGET(menu));
- ewl_box_set_orientation(EWL_BOX(menu->popup), EWL_ORIENTATION_VERTICAL);
- ewl_object_set_fill_policy(EWL_OBJECT(menu->popup),
- EWL_FILL_POLICY_NONE);
- ewl_object_set_alignment(EWL_OBJECT(menu->popup),
- EWL_ALIGNMENT_LEFT | EWL_ALIGNMENT_TOP);
-
- /*
* Initialize the defaults of the inherited fields.
*/
ewl_menu_base_init(EWL_MENU_BASE(menu), image, title);
- /*
- * ewl_object_set_fill_policy(EWL_OBJECT(menu), EWL_FILL_POLICY_NONE);
- */
/*
* The realize needs to create the pop-up.
*/
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_REALIZE,
- __ewl_imenu_realize, NULL);
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
+ ewl_callback_prepend(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
__expand_imenu, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -121,10 +104,26 @@
void __expand_imenu(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_IMenu *menu;
+ Ewl_Window *win;
menu = EWL_IMENU(w);
/*
+ * Create the popup menu portion of the menu. Do this prior to
+ * initializing the rest of the fields to avoid the add callback being
+ * called.
+ */
+ menu->popup = ewl_floater_new(EWL_WIDGET(menu));
+ ewl_box_set_orientation(EWL_BOX(menu->popup), EWL_ORIENTATION_VERTICAL);
+ ewl_object_set_fill_policy(EWL_OBJECT(menu->popup),
+ EWL_FILL_POLICY_NONE);
+ ewl_object_set_alignment(EWL_OBJECT(menu->popup),
+ EWL_ALIGNMENT_LEFT | EWL_ALIGNMENT_TOP);
+
+ win = ewl_window_find_window_by_widget(w);
+ ewl_container_append_child(EWL_CONTAINER(win), menu->popup);
+
+ /*
* Position the popup menu relative to the menu.
*/
if (EWL_MENU_ITEM(w)->submenu)
@@ -136,9 +135,6 @@
ewl_object_set_minimum_width(EWL_OBJECT(menu->popup),
CURRENT_W(menu));
}
-
- ewl_widget_show(menu->popup);
- ewl_widget_configure(menu->popup);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu.c 25 May 2002 05:46:40 -0000 1.2
+++ ewl_menu.c 19 Jul 2002 21:32:56 -0000 1.3
@@ -56,37 +56,16 @@
DCHECK_PARAM_PTR("menu", menu);
- /*
- * Create the popup menu portion of the menu. Do this prior to
- * initializing the rest of the fields to avoid the add callback being
- * called.
- */
- menu->popup = ewl_window_new();
- ewl_window_set_auto_size(EWL_WINDOW(menu->popup), TRUE);
- ewl_window_set_borderless(EWL_WINDOW(menu->popup));
- ewl_object_set_fill_policy(EWL_OBJECT(menu->popup),
- EWL_FILL_POLICY_NONE);
-
- /*
- * We need a box for laying out the contents of the menu.
- */
- menu->popbox = ewl_vbox_new();
- ewl_object_set_alignment(EWL_OBJECT(menu->popbox),
- EWL_ALIGNMENT_LEFT | EWL_ALIGNMENT_TOP);
- ewl_container_append_child(EWL_CONTAINER(menu->popup), menu->popbox);
/*
* Initialize the defaults of the inherited fields.
*/
ewl_menu_base_init(EWL_MENU_BASE(menu), image, title);
- /*
- * ewl_object_set_fill_policy(EWL_OBJECT(menu), EWL_FILL_POLICY_NONE);
- */
/*
* The realize needs to create the pop-up.
*/
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
+ ewl_callback_prepend(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
__expand_menu, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -133,14 +112,27 @@
pwin = ewl_window_find_window_by_widget(w);
/*
+ * Create the popup menu portion of the menu. Do this prior to
+ * initializing the rest of the fields to avoid the add callback being
+ * called.
+ */
+ menu->popup = ewl_window_new();
+ ewl_window_set_auto_size(EWL_WINDOW(menu->popup), TRUE);
+ ewl_window_set_borderless(EWL_WINDOW(menu->popup));
+ ewl_object_set_fill_policy(EWL_OBJECT(menu->popup),
+ EWL_FILL_POLICY_NONE);
+
+ ewl_window_get_geometry(pwin, &x, &y, NULL, NULL);
+
+ /*
* Position the popup menu relative to the menu.
*/
if (EWL_MENU_ITEM(w)->submenu) {
- x = CURRENT_X(pwin) + CURRENT_X(w) + CURRENT_W(w);
- y = CURRENT_Y(pwin) + CURRENT_Y(w);
+ x += CURRENT_X(w) + CURRENT_W(w);
+ y += CURRENT_Y(w);
} else {
- x = CURRENT_X(pwin) + CURRENT_X(w);
- y = CURRENT_Y(pwin) + CURRENT_Y(w) + CURRENT_H(w);
+ x += CURRENT_X(w);
+ y += CURRENT_Y(w) + CURRENT_H(w);
ewl_window_set_min_size(EWL_WINDOW(menu->popup),
CURRENT_W(menu),
@@ -149,16 +141,6 @@
ewl_window_move(EWL_WINDOW(menu->popup), x, y);
printf("Moving popup to %d, %d\n", x, y);
-
- ewl_widget_show(menu->popup);
- ewl_widget_configure(menu->popup);
-}
-
-void __ewl_menu_add_child(Ewl_Container * p, Ewl_Widget * c)
-{
- Ewl_Widget *box;
-
- box = ewd_list_goto_first(p->children);
}
void __expand_menu_animator(int val, void *ev_data)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_menu_base.c 25 May 2002 05:46:41 -0000 1.1
+++ ewl_menu_base.c 19 Jul 2002 21:32:56 -0000 1.2
@@ -1,6 +1,9 @@
#include <Ewl.h>
-void __collapse_menu(Ewl_Widget * w, void *ev_data, void *user_data);
+void __expand_menu_base(Ewl_Widget *w, void *ev_data,
+ void *user_data);
+void __collapse_menu_base(Ewl_Widget * w, void *ev_data,
+ void *user_data);
void __ewl_menu_add(Ewl_Container * parent, Ewl_Widget * child);
void __ewl_menu_item_show(Ewl_Widget * w, void *ev_data,
void *user_data);
@@ -24,12 +27,21 @@
* Initialize the defaults of the inherited fields.
*/
ewl_menu_item_init(EWL_MENU_ITEM(menu), image, title);
- /*
- * ewl_object_set_fill_policy(EWL_OBJECT(menu), EWL_FILL_POLICY_NONE);
- */
+ ewl_object_set_fill_policy(EWL_OBJECT(menu), EWL_FILL_POLICY_NONE);
+
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_CLICKED,
+ __expand_menu_base, NULL);
ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_DESELECT,
- __collapse_menu, NULL);
+ __collapse_menu_base, NULL);
+
+ /*
+ * The popbox actually holds the children, and is simply added to the
+ * popup part of the menu when the menu is expanded.
+ */
+ menu->popbox = ewl_vbox_new();
+ ewl_object_set_alignment(EWL_OBJECT(menu->popbox),
+ EWL_ALIGNMENT_LEFT | EWL_ALIGNMENT_TOP);
/*
* The add notifier makes sure newly added children go in the popup
@@ -72,6 +84,12 @@
/**
* ewl_menu_item_init - initialize the fields of a menu item to their defaults
+ * @item: the item to be initialized
+ * @image: the path to image to be used, NULL for no image
+ * @text: the text for this menuitem
+ *
+ * Returns no value. Initializes a menu item to default values and adds the
+ * image pointed to by the path @image, and adds the text in @text.
*/
void ewl_menu_item_init(Ewl_Menu_Item * item, char *image, char *text)
{
@@ -133,24 +151,47 @@
void __ewl_menu_item_show(Ewl_Widget * w, void *ev_data, void *user_data)
{
- Ewl_Menu_Item *menu;
+ Ewl_Menu_Item *item;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ item = EWL_MENU_ITEM(w);
+
+ if (item->icon)
+ ewl_widget_show(item->icon);
+ ewl_widget_show(item->text);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+void __expand_menu_base(Ewl_Widget *w, void *ev_data, void *user_data)
+{
+ Ewl_Menu_Base *menu = EWL_MENU_BASE(w);
DENTER_FUNCTION(DLEVEL_STABLE);
- menu = EWL_MENU_ITEM(w);
+ if (!menu->popup)
+ DRETURN(DLEVEL_STABLE);
- if (menu->icon)
- ewl_widget_show(menu->icon);
- ewl_widget_show(menu->text);
+ ewl_widget_show(menu->popup);
+ ewl_widget_realize(menu->popup);
+ ewl_widget_show(menu->popbox);
+
+ ewl_container_append_child(EWL_CONTAINER(menu->popup), menu->popbox);
+ ewl_widget_show(menu->popbox);
+ ewl_widget_configure(menu->popup);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __collapse_menu(Ewl_Widget * w, void *ev_data, void *user_data)
+void __collapse_menu_base(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_IMenu *menu;
menu = EWL_IMENU(w);
- ewl_widget_hide(menu->popup);
+ ewl_widget_hide(menu->popbox);
+ ewl_container_remove_child(EWL_CONTAINER(menu->popup), menu->popbox);
+ ewl_widget_destroy(menu->popup);
+ menu->popup = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_seeker.c 25 May 2002 05:46:42 -0000 1.28
+++ ewl_seeker.c 19 Jul 2002 21:32:56 -0000 1.29
@@ -47,8 +47,6 @@
ewl_seeker_init(s, o);
- ewl_container_append_child(EWL_CONTAINER(s), s->dragbar);
-
DRETURN_PTR(EWL_WIDGET(s), DLEVEL_STABLE);
}
@@ -69,8 +67,6 @@
w = EWL_WIDGET(s);
- s->dragbar = ewl_button_new(NULL);
-
/*
* Initialize the widget fields and set appropriate orientation and
* type
@@ -108,6 +104,12 @@
s->range = 100.0;
s->value = 0.0;
s->step = 5.0;
+
+ /*
+ * Create and add the dragbar portion of the seeker
+ */
+ s->dragbar = ewl_button_new(NULL);
+ ewl_container_append_child(EWL_CONTAINER(s), s->dragbar);
/*
* Add necessary configuration callbacks
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_widget.c 25 May 2002 05:46:42 -0000 1.40
+++ ewl_widget.c 19 Jul 2002 21:32:56 -0000 1.41
@@ -713,18 +713,6 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
- /*
- * No parent so give it the empty values.
- */
- /*
- * if (!w->parent) {
- * if (w->fx_clip_box)
- * LAYER(w) = 0;
- *
- * DRETURN(DLEVEL_STABLE);
- * }
- */
-
win = ewl_window_find_window_by_widget(w);
/*
@@ -735,10 +723,6 @@
evas_set_clip(win->evas, w->fx_clip_box,
EWL_CONTAINER(w->parent)->clip_box);
}
-
- /*
- * LAYER(w) = LAYER(w->parent) + 5;
- */
if (REALIZED(w))
ewl_widget_theme_update(w);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_window.c 25 May 2002 05:46:42 -0000 1.37
+++ ewl_window.c 19 Jul 2002 21:32:56 -0000 1.38
@@ -188,6 +188,7 @@
DCHECK_PARAM_PTR("win", win);
ecore_window_get_geometry(win->window, x, y, w, h);
+ ecore_window_get_root_relative_location(win->window, x, y);
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_window.h 25 May 2002 05:46:42 -0000 1.15
+++ ewl_window.h 19 Jul 2002 21:32:56 -0000 1.16
@@ -8,7 +8,8 @@
*/
typedef struct _ewl_window Ewl_Window;
-struct _ewl_window {
+struct _ewl_window
+{
Ewl_Container widget;
Window window;
|
|
From: <enl...@li...> - 2002-08-14 02:05:38
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/tools/ewl_config
Modified Files:
ewl_config.c
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/tools/ewl_config/ewl_config.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_config.c 26 May 2002 05:02:49 -0000 1.19
+++ ewl_config.c 14 Aug 2002 02:05:37 -0000 1.20
@@ -155,8 +155,7 @@
/* Evas Page */
- e_conf.page_evas_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.page_evas_label), "Evas Settings");
+ e_conf.page_evas_label = ewl_text_new("Evas Settings");
ewl_text_set_font_size(EWL_TEXT(e_conf.page_evas_label), 8);
ewl_widget_show(e_conf.page_evas_label);
@@ -165,9 +164,7 @@
ewl_object_set_padding(EWL_OBJECT(e_conf.page_evas), 10, 5, 5, 0);
ewl_widget_show(e_conf.page_evas);
- e_conf.render_method_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.render_method_label),
- "Render Method");
+ e_conf.render_method_label = ewl_text_new("Render Method");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_evas),
e_conf.render_method_label);
ewl_widget_show(e_conf.render_method_label);
@@ -193,8 +190,7 @@
e_conf.render_method_x11);
ewl_widget_show(e_conf.render_method_x11);
- e_conf.font_cache_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.font_cache_label), "Font Cache (kB)");
+ e_conf.font_cache_label = ewl_text_new("Font Cache (kB)");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_evas),
e_conf.font_cache_label);
ewl_widget_show(e_conf.font_cache_label);
@@ -208,9 +204,7 @@
e_conf.font_cache);
ewl_widget_show(e_conf.font_cache);
- e_conf.image_cache_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.image_cache_label),
- "Image Cache (kB)");
+ e_conf.image_cache_label = ewl_text_new("Image Cache (kB)");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_evas),
e_conf.image_cache_label);
ewl_widget_show(e_conf.image_cache_label);
@@ -231,8 +225,7 @@
/* Debug Page */
- e_conf.page_debug_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.page_debug_label), "Debug Settings");
+ e_conf.page_debug_label = ewl_text_new("Debug Settings");
ewl_text_set_font_size(EWL_TEXT(e_conf.page_debug_label), 8);
ewl_widget_show(e_conf.page_debug_label);
@@ -246,8 +239,7 @@
e_conf.enable_debug);
ewl_widget_show(e_conf.enable_debug);
- e_conf.debug_level_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.debug_level_label), "Debug Level");
+ e_conf.debug_level_label = ewl_text_new("Debug Level");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_debug),
e_conf.debug_level_label);
ewl_widget_show(e_conf.debug_level_label);
@@ -265,8 +257,7 @@
e_conf.page_debug, e_conf.page_debug_label);
/* FX Page */
- e_conf.page_fx_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.page_fx_label), "FX Settings");
+ e_conf.page_fx_label = ewl_text_new("FX Settings");
ewl_text_set_font_size(EWL_TEXT(e_conf.page_fx_label), 8);
ewl_widget_show(e_conf.page_fx_label);
@@ -276,15 +267,12 @@
ewl_widget_show(e_conf.page_fx);
- e_conf.global_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.global_label), "Global Settings");
+ e_conf.global_label = ewl_text_new("Global Settings");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_fx),
e_conf.global_label);
ewl_widget_show(e_conf.global_label);
- e_conf.global_fps_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.global_fps_label),
- "Frames Per Second");
+ e_conf.global_fps_label = ewl_text_new("Frames Per Second");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_fx),
e_conf.global_fps_label);
ewl_widget_show(e_conf.global_fps_label);
@@ -312,8 +300,7 @@
e_conf.fx_separator1);
ewl_widget_show(e_conf.fx_separator1);
- e_conf.plugins_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.plugins_label), "Plugins");
+ e_conf.plugins_label = ewl_text_new("Plugins");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_fx),
e_conf.plugins_label);
ewl_widget_show(e_conf.plugins_label);
@@ -341,8 +328,7 @@
continue;
}
- label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(label), name);
+ label = ewl_text_new(name);
ewl_grid_add(EWL_GRID(e_conf.effects_table),
label, 1, 1, i, i);
ewl_widget_show(label);
@@ -395,8 +381,7 @@
e_conf.page_fx_label);
/* Theme Page */
- e_conf.page_theme_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.page_theme_label), "Theme Settings");
+ e_conf.page_theme_label = ewl_text_new("Theme Settings");
ewl_text_set_font_size(EWL_TEXT(e_conf.page_theme_label), 8);
ewl_widget_show(e_conf.page_theme_label);
@@ -406,13 +391,12 @@
ewl_widget_show(e_conf.page_theme);
- e_conf.theme_name_label = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(e_conf.theme_name_label), "Theme Name");
+ e_conf.theme_name_label = ewl_text_new("Theme Name");
ewl_container_append_child(EWL_CONTAINER(e_conf.page_theme),
e_conf.theme_name_label);
ewl_widget_show(e_conf.theme_name_label);
- e_conf.theme_name = ewl_entry_new();
+ e_conf.theme_name = ewl_entry_new(NULL);
ewl_container_append_child(EWL_CONTAINER(e_conf.page_theme),
e_conf.theme_name);
ewl_widget_show(e_conf.theme_name);
@@ -687,13 +671,11 @@
confirm.main_vbox);
ewl_widget_show(confirm.main_vbox);
- confirm.text = ewl_text_new();
+ confirm.text = ewl_text_new("You have made modifications, what would you "
+ "like to do ?");
ewl_object_set_padding(EWL_OBJECT(confirm.text), 0, 0, 20, 20);
ewl_object_set_alignment(EWL_OBJECT(confirm.text),
EWL_ALIGNMENT_CENTER);
- ewl_text_set_text(EWL_TEXT(confirm.text),
- "You have made modifications, what would you "
- "like to do ?");
ewl_container_append_child(EWL_CONTAINER(confirm.main_vbox),
confirm.text);
ewl_widget_show(confirm.text);
|
|
From: <enl...@li...> - 2002-08-14 02:06:06
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
ChangeLog
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ChangeLog 16 Apr 2002 18:30:24 -0000 1.47
+++ ChangeLog 14 Aug 2002 02:05:35 -0000 1.48
@@ -1,15 +1,22 @@
-Thu Apr 11 09:38:57 2001 Nathan Ingersoll <ningerso@d.umn.edu>
- + Added a preferred size field to objects, and removed the requested
+Thu Aug 12 19:39:57 2002 Nathan Ingersoll <ningerso@d.umn.edu>
+ * Shortened theme keys, this will eventually be replaced with keys
+ based on inheritance mapping type strings.
+ * Updated API documentation comments.
+ * Changed ewl_text_new and ewl_entry_new to take a string argument.
+ * Layers are now adjusted in the __ewl_widget_reparent function.
+
+Thu Apr 11 09:38:57 2002 Nathan Ingersoll <ningerso@d.umn.edu>
+ * Added a preferred size field to objects, and removed the requested
size field. Originally the requested size would be the preferred
size, but that detail got lost along the way.
* Documented large sections of code.
- + Added add, and resize notifiers to the containers, the resize
+ * Added add, and resize notifiers to the containers, the resize
notifier is called when a child's preferred size changes.
- + Expanded the possible fill policies and implemented them within the
+ * Expanded the possible fill policies and implemented them within the
object sizing functions.
- + ymer started a widget called selectionbook that is essentially a
+ * ymer started a widget called selectionbook that is essentially a
prettier notebook.
- + Worked with ymer to develop an internal menu, this may eventually be
+ * Worked with ymer to develop an internal menu, this may eventually be
the basis for global menus.
Mon Nov 12 20:28:57 2001 Christopher Rosendahl <cro...@tr...>
|
|
From: <enl...@li...> - 2002-08-14 02:06:06
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/scripts
Modified Files:
theme.sh
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/scripts/theme.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- theme.sh 25 May 2002 05:46:39 -0000 1.7
+++ theme.sh 14 Aug 2002 02:05:35 -0000 1.8
@@ -7,145 +7,145 @@
# Add keys for boxes
echo -n "."
-edb_ed $DB add "/appearance/box/horizontal/base" str "/appearance/button/default/base.bits.db"
-edb_ed $DB add "/appearance/box/horizontal/base/visible" str "no"
-edb_ed $DB add "/appearance/box/vertical/base" str "/appearance/button/default/base.bits.db"
-edb_ed $DB add "/appearance/box/vertical/base/visible" str "no"
+edb_ed $DB add "/box/horizontal/base" str "appearance/button/default/base.bits.db"
+edb_ed $DB add "/box/horizontal/base/visible" str "no"
+edb_ed $DB add "/box/vertical/base" str "appearance/button/default/base.bits.db"
+edb_ed $DB add "/box/vertical/base/visible" str "no"
# Add keys for buttons
echo -n "."
-edb_ed $DB add "/appearance/button/default/base" str "/appearance/button/default/base.bits.db"
-edb_ed $DB add "/appearance/button/default/base/visible" str "yes"
-edb_ed $DB add "/appearance/button/default/label/font" str "borzoib"
-edb_ed $DB add "/appearance/button/default/label/font_size" int 8
-edb_ed $DB add "/appearance/button/default/label/style" str "shadow"
-
-edb_ed $DB add "/appearance/check/base" str "/appearance/button/check/base.bits.db"
-edb_ed $DB add "/appearance/check/base/visible" str "yes"
-
-edb_ed $DB add "/appearance/button/check/base" str "/appearance/button/check/base.bits.db"
-edb_ed $DB add "/appearance/button/check/base/visible" str "no"
-
-edb_ed $DB add "/appearance/button/check/label/font" str "borzoib"
-edb_ed $DB add "/appearance/button/check/label/font_size" int 8
-edb_ed $DB add "/appearance/button/check/label/style" str "shadow"
-
-edb_ed $DB add "/appearance/radio/base" str "/appearance/button/radio/base.bits.db"
-edb_ed $DB add "/appearance/radio/base/visible" str "yes"
-
-edb_ed $DB add "/appearance/button/radio/base" str "/appearance/button/radio/base.bits.db"
-edb_ed $DB add "/appearance/button/radio/base/visible" str "no"
-
-edb_ed $DB add "/appearance/button/radio/label/font" str "borzoib"
-edb_ed $DB add "/appearance/button/radio/label/font_size" int 8
-edb_ed $DB add "/appearance/button/radio/label/style" str "shadow"
+edb_ed $DB add "/button/default/base" str "appearance/button/default/base.bits.db"
+edb_ed $DB add "/button/default/base/visible" str "yes"
+edb_ed $DB add "/button/default/label/font" str "nationff"
+edb_ed $DB add "/button/default/label/font_size" int 12
+edb_ed $DB add "/button/default/label/style" str "shadow"
+
+edb_ed $DB add "/check/base" str "appearance/button/check/base.bits.db"
+edb_ed $DB add "/check/base/visible" str "yes"
+
+edb_ed $DB add "/button/check/base" str "appearance/button/check/base.bits.db"
+edb_ed $DB add "/button/check/base/visible" str "no"
+
+edb_ed $DB add "/button/check/label/font" str "nationff"
+edb_ed $DB add "/button/check/label/font_size" int 12
+edb_ed $DB add "/button/check/label/style" str "shadow"
+
+edb_ed $DB add "/radio/base" str "appearance/button/radio/base.bits.db"
+edb_ed $DB add "/radio/base/visible" str "yes"
+
+edb_ed $DB add "/button/radio/base" str "appearance/button/radio/base.bits.db"
+edb_ed $DB add "/button/radio/base/visible" str "no"
+
+edb_ed $DB add "/button/radio/label/font" str "nationff"
+edb_ed $DB add "/button/radio/label/font_size" int 12
+edb_ed $DB add "/button/radio/label/style" str "shadow"
# Add keys for text entry widgets
echo -n "."
-edb_ed $DB add "/appearance/cursor/default/base" str "/appearance/cursor/default/base.bits.db"
-edb_ed $DB add "/appearance/cursor/default/base/visible" str "yes"
-edb_ed $DB add "/appearance/selection/default/base" str "/appearance/selection/default/base.bits.db"
-edb_ed $DB add "/appearance/selection/default/base/visible" str "yes"
-
-edb_ed $DB add "/appearance/entry/default/base" str "/appearance/entry/default/base.bits.db"
-edb_ed $DB add "/appearance/entry/default/base/visible" str "yes"
-edb_ed $DB add "/appearance/entry/default/text/font" str "borzoib"
-edb_ed $DB add "/appearance/entry/default/text/font_size" int 8
-edb_ed $DB add "/appearance/entry/default/text/style" str "shadow"
+edb_ed $DB add "/cursor/default/base" str "appearance/cursor/default/base.bits.db"
+edb_ed $DB add "/cursor/default/base/visible" str "yes"
+edb_ed $DB add "/selection/default/base" str "appearance/selection/default/base.bits.db"
+edb_ed $DB add "/selection/default/base/visible" str "yes"
+
+edb_ed $DB add "/entry/default/base" str "appearance/entry/default/base.bits.db"
+edb_ed $DB add "/entry/default/base/visible" str "yes"
+edb_ed $DB add "/entry/default/text/font" str "nationff"
+edb_ed $DB add "/entry/default/text/font_size" int 12
+edb_ed $DB add "/entry/default/text/style" str "shadow"
# Add keys for image widget
echo -n "."
-edb_ed $DB add "/appearance/image/default/404" str "/appearance/image/default/404.bits.db"
-edb_ed $DB add "/appearance/image/default/404/visible" str "yes"
+edb_ed $DB add "/image/default/404" str "appearance/image/default/404.bits.db"
+edb_ed $DB add "/image/default/404/visible" str "yes"
# Add keys for list widget
echo -n "."
-edb_ed $DB add "/appearance/list/default/base" str "/appearance/list/default/base.bits.db"
-edb_ed $DB add "/appearance/list/default/base/visible" str "yes"
-edb_ed $DB add "/appearance/list/marker/base" str "/appearance/list/marker/base.bits.db"
-edb_ed $DB add "/appearance/list/marker/base/visible" str "yes"
+edb_ed $DB add "/list/default/base" str "appearance/list/default/base.bits.db"
+edb_ed $DB add "/list/default/base/visible" str "yes"
+edb_ed $DB add "/list/marker/base" str "appearance/list/marker/base.bits.db"
+edb_ed $DB add "/list/marker/base/visible" str "yes"
# Add keys for notebook widget
echo -n "."
-edb_ed $DB add "/appearance/notebook/default/base" str "/appearance/notebook/default/base.bits.db"
-edb_ed $DB add "/appearance/notebook/default/base/visible" str "yes"
-edb_ed $DB add "/appearance/notebook/content_box/base" str "/appearance/notebook/content_box/base.bits.db"
-edb_ed $DB add "/appearance/notebook/content_box/base/visible" str "no"
-edb_ed $DB add "/appearance/notebook/tab_box/base" str "/appearance/notebook/tab_box/base.bits.db"
-edb_ed $DB add "/appearance/notebook/tab_box/base/visible" str "no"
-edb_ed $DB add "/appearance/notebook/tab_button/base" str "/appearance/notebook/tab_button/base-top.bits.db"
-edb_ed $DB add "/appearance/notebook/tab_button/base/visible" str "yes"
-edb_ed $DB add "/appearance/notebook/tab_button/label/font" str "borzoib"
-edb_ed $DB add "/appearance/notebook/tab_button/label/font_size" int 8
-edb_ed $DB add "/appearance/notebook/tab_button/label/style" str "shadow"
+edb_ed $DB add "/notebook/default/base" str "appearance/notebook/default/base.bits.db"
+edb_ed $DB add "/notebook/default/base/visible" str "yes"
+edb_ed $DB add "/notebook/content_box/base" str "appearance/notebook/content_box/base.bits.db"
+edb_ed $DB add "/notebook/content_box/base/visible" str "no"
+edb_ed $DB add "/notebook/tab_box/base" str "appearance/notebook/tab_box/base.bits.db"
+edb_ed $DB add "/notebook/tab_box/base/visible" str "no"
+edb_ed $DB add "/notebook/tab_button/base" str "appearance/notebook/tab_button/base-top.bits.db"
+edb_ed $DB add "/notebook/tab_button/base/visible" str "yes"
+edb_ed $DB add "/notebook/tab_button/label/font" str "nationff"
+edb_ed $DB add "/notebook/tab_button/label/font_size" int 12
+edb_ed $DB add "/notebook/tab_button/label/style" str "shadow"
# Add keys for seeker widget
echo -n "."
-edb_ed $DB add "/appearance/seeker/horizontal/base" str "/appearance/seeker/horizontal/base.bits.db"
-edb_ed $DB add "/appearance/seeker/horizontal/base/visible" str "yes"
-edb_ed $DB add "/appearance/seeker/horizontal/dragbar/base" str "/appearance/seeker/horizontal/dragbar/base.bits.db"
-edb_ed $DB add "/appearance/seeker/horizontal/dragbar/base/visible" str "yes"
-
-edb_ed $DB add "/appearance/seeker/vertical/base" str "/appearance/seeker/vertical/base.bits.db"
-edb_ed $DB add "/appearance/seeker/vertical/base/visible" str "yes"
-edb_ed $DB add "/appearance/seeker/vertical/dragbar/base" str "/appearance/seeker/vertical/dragbar/base.bits.db"
-edb_ed $DB add "/appearance/seeker/vertical/dragbar/base/visible" str "yes"
+edb_ed $DB add "/seeker/horizontal/base" str "appearance/seeker/horizontal/base.bits.db"
+edb_ed $DB add "/seeker/horizontal/base/visible" str "yes"
+edb_ed $DB add "/seeker/horizontal/dragbar/base" str "appearance/seeker/horizontal/dragbar/base.bits.db"
+edb_ed $DB add "/seeker/horizontal/dragbar/base/visible" str "yes"
+
+edb_ed $DB add "/seeker/vertical/base" str "appearance/seeker/vertical/base.bits.db"
+edb_ed $DB add "/seeker/vertical/base/visible" str "yes"
+edb_ed $DB add "/seeker/vertical/dragbar/base" str "appearance/seeker/vertical/dragbar/base.bits.db"
+edb_ed $DB add "/seeker/vertical/dragbar/base/visible" str "yes"
# Add keys for scrollbar widget
echo -n "."
-edb_ed $DB add "/appearance/scrollbar/horizontal/base" str "/appearance/scrollbar/horizontal/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/horizontal/base/visible" str "yes"
-edb_ed $DB add "/appearance/scrollbar/horizontal/dragbar/base" str "/appearance/scrollbar/horizontal/dragbar/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/horizontal/dragbar/base/visible" str "yes"
-edb_ed $DB add "/appearance/scrollbar/horizontal/button_increment/base" str "/appearance/scrollbar/horizontal/button_increment/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/horizontal/button_increment/base/visible" str "yes"
-edb_ed $DB add "/appearance/scrollbar/horizontal/button_decrement/base" str "/appearance/scrollbar/horizontal/button_decrement/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/horizontal/button_decrement/base/visible" str "yes"
-
-edb_ed $DB add "/appearance/scrollbar/vertical/base" str "/appearance/scrollbar/vertical/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/vertical/base/visible" str "yes"
-edb_ed $DB add "/appearance/scrollbar/vertical/dragbar/base" str "/appearance/scrollbar/vertical/dragbar/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/vertical/dragbar/base/visible" str "yes"
-edb_ed $DB add "/appearance/scrollbar/vertical/button_increment/base" str "/appearance/scrollbar/vertical/button_increment/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/vertical/button_increment/base/visible" str "yes"
-edb_ed $DB add "/appearance/scrollbar/vertical/button_decrement/base" str "/appearance/scrollbar/vertical/button_decrement/base.bits.db"
-edb_ed $DB add "/appearance/scrollbar/vertical/button_decrement/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/horizontal/base" str "appearance/scrollbar/horizontal/base.bits.db"
+edb_ed $DB add "/scrollbar/horizontal/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/horizontal/dragbar/base" str "appearance/scrollbar/horizontal/dragbar/base.bits.db"
+edb_ed $DB add "/scrollbar/horizontal/dragbar/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/horizontal/button_increment/base" str "appearance/scrollbar/horizontal/button_increment/base.bits.db"
+edb_ed $DB add "/scrollbar/horizontal/button_increment/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/horizontal/button_decrement/base" str "appearance/scrollbar/horizontal/button_decrement/base.bits.db"
+edb_ed $DB add "/scrollbar/horizontal/button_decrement/base/visible" str "yes"
+
+edb_ed $DB add "/scrollbar/vertical/base" str "appearance/scrollbar/vertical/base.bits.db"
+edb_ed $DB add "/scrollbar/vertical/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/vertical/dragbar/base" str "appearance/scrollbar/vertical/dragbar/base.bits.db"
+edb_ed $DB add "/scrollbar/vertical/dragbar/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/vertical/button_increment/base" str "appearance/scrollbar/vertical/button_increment/base.bits.db"
+edb_ed $DB add "/scrollbar/vertical/button_increment/base/visible" str "yes"
+edb_ed $DB add "/scrollbar/vertical/button_decrement/base" str "appearance/scrollbar/vertical/button_decrement/base.bits.db"
+edb_ed $DB add "/scrollbar/vertical/button_decrement/base/visible" str "yes"
# Add keys for separator widget
echo -n "."
-edb_ed $DB add "/appearance/separator/horizontal/base" str "/appearance/separator/horizontal/base.bits.db"
-edb_ed $DB add "/appearance/separator/horizontal/base/visible" str "yes"
+edb_ed $DB add "/separator/horizontal/base" str "appearance/separator/horizontal/base.bits.db"
+edb_ed $DB add "/separator/horizontal/base/visible" str "yes"
-edb_ed $DB add "/appearance/separator/vertical/base" str "/appearance/separator/vertical/base.bits.db"
-edb_ed $DB add "/appearance/separator/vertical/base/visible" str "yes"
+edb_ed $DB add "/separator/vertical/base" str "appearance/separator/vertical/base.bits.db"
+edb_ed $DB add "/separator/vertical/base/visible" str "yes"
# Add keys for table widget
echo -n "."
-edb_ed $DB add "/appearance/table/default/base" str "/appearance/button/default/base.bits.db"
-edb_ed $DB add "/appearance/table/default/base/visible" str "no"
+edb_ed $DB add "/table/default/base" str "appearance/button/default/base.bits.db"
+edb_ed $DB add "/table/default/base/visible" str "no"
# Add keys for text widget
echo -n "."
-edb_ed $DB add "/appearance/text/default/font" str "borzoib"
-edb_ed $DB add "/appearance/text/default/font_size" int 8
-edb_ed $DB add "/appearance/text/default/style" str "shadow"
+edb_ed $DB add "/text/default/font" str "nationff"
+edb_ed $DB add "/text/default/font_size" int 12
+edb_ed $DB add "/text/default/style" str "shadow"
# Add keys for the textarea widget
echo -n "."
-edb_ed $DB add "/appearance/textarea/default/base" str "/appearance/textarea/default/base.bits.db"
-edb_ed $DB add "/appearance/textarea/default/base/visible" str "yes"
-edb_ed $DB add "/appearance/textarea/default/base/style" str "shadow"
-edb_ed $DB add "/appearance/textarea/default/base/r" int 255
-edb_ed $DB add "/appearance/textarea/default/base/g" int 255
-edb_ed $DB add "/appearance/textarea/default/base/b" int 255
-edb_ed $DB add "/appearance/textarea/default/base/a" int 255
+edb_ed $DB add "/textarea/default/base" str "appearance/textarea/default/base.bits.db"
+edb_ed $DB add "/textarea/default/base/visible" str "yes"
+edb_ed $DB add "/textarea/default/base/style" str "shadow"
+edb_ed $DB add "/textarea/default/base/r" int 255
+edb_ed $DB add "/textarea/default/base/g" int 255
+edb_ed $DB add "/textarea/default/base/b" int 255
+edb_ed $DB add "/textarea/default/base/a" int 255
# Add keys for window widget
echo -n "."
-edb_ed $DB add "/appearance/window/default/base" str "/appearance/window/default/base.bits.db"
-edb_ed $DB add "/appearance/window/default/base/visible" str "yes"
+edb_ed $DB add "/window/default/base" str "appearance/window/default/base.bits.db"
+edb_ed $DB add "/window/default/base/visible" str "yes"
# Setup author, licence and theme name.
echo -n "."
@@ -155,8 +155,8 @@
# Add keys for floater widget
echo -n "."
-edb_ed $DB add "/appearance/floater/base" str "/appearance/box/horizontal/base.bits.db"
-edb_ed $DB add "/appearance/floater/base/visible" str "yes"
+edb_ed $DB add "/floater/base" str "appearance/box/horizontal/base.bits.db"
+edb_ed $DB add "/floater/base/visible" str "yes"
echo
echo "Theme regeneration complete."
|
|
From: <enl...@li...> - 2002-08-14 02:06:06
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/default
Modified Files:
theme.db
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/default/theme.db,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
Binary files /tmp/cvs4RP4yf and /tmp/cvse0YvLk differ
|
|
From: <enl...@li...> - 2002-08-14 02:06:07
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/plugins/fx/fade_in
Modified Files:
fade_in.c
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/plugins/fx/fade_in/fade_in.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- fade_in.c 14 Nov 2001 00:30:15 -0000 1.4
+++ fade_in.c 14 Aug 2002 02:05:37 -0000 1.5
@@ -120,17 +120,15 @@
create_about_dialog(void)
{
about_dialog.window = ewl_window_new();
- ewl_window_resize(about_dialog.window, 370, 150);
- ewl_window_set_title(about_dialog.window,
+ ewl_window_resize(EWL_WINDOW(about_dialog.window), 370, 150);
+ ewl_window_set_title(EWL_WINDOW(about_dialog.window),
"EWL Fade In Plugin: About");
ewl_object_set_custom_size(EWL_OBJECT(about_dialog.window), 370, 150);
ewl_callback_append(about_dialog.window, EWL_CALLBACK_DELETE_WINDOW,
close_about_dialog, NULL);
ewl_widget_realize(about_dialog.window);
- about_dialog.text = ewl_text_new();
- ewl_text_set_text(about_dialog.text,
- " EWL Fade In Plugin\n\n"
+ about_dialog.text = ewl_text_new(" EWL Fade In Plugin\n\n"
"Created by Christopher 'smugg' Rosendahl");
ewl_object_set_alignment(EWL_OBJECT(about_dialog.text),
EWL_ALIGNMENT_CENTER);
|
|
From: <enl...@li...> - 2002-08-14 02:06:07
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/plugins/fx/fade_out
Modified Files:
fade_out.c
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/plugins/fx/fade_out/fade_out.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- fade_out.c 14 Nov 2001 00:30:15 -0000 1.4
+++ fade_out.c 14 Aug 2002 02:05:37 -0000 1.5
@@ -111,17 +111,15 @@
create_about_dialog(void)
{
about_dialog.window = ewl_window_new();
- ewl_window_resize(about_dialog.window, 370, 150);
- ewl_window_set_title(about_dialog.window,
+ ewl_window_resize(EWL_WINDOW(about_dialog.window), 370, 150);
+ ewl_window_set_title(EWL_WINDOW(about_dialog.window),
"EWL Fade Out Plugin: About");
ewl_object_set_custom_size(EWL_OBJECT(about_dialog.window), 370, 150);
ewl_callback_append(about_dialog.window, EWL_CALLBACK_DELETE_WINDOW,
close_about_dialog, NULL);
ewl_widget_realize(about_dialog.window);
- about_dialog.text = ewl_text_new();
- ewl_text_set_text(about_dialog.text,
- " EWL Fade Out Plugin\n\n"
+ about_dialog.text = ewl_text_new(" EWL Fade Out Plugin\n\n"
"Created by Christopher 'smugg' Rosendahl");
ewl_object_set_alignment(EWL_OBJECT(about_dialog.text),
EWL_ALIGNMENT_CENTER);
|
|
From: <enl...@li...> - 2002-08-14 02:06:07
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/plugins/fx/glow
Modified Files:
glow.c
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/plugins/fx/glow/glow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- glow.c 14 Nov 2001 00:30:15 -0000 1.3
+++ glow.c 14 Aug 2002 02:05:37 -0000 1.4
@@ -115,16 +115,15 @@
create_about_dialog(void)
{
about_dialog.window = ewl_window_new();
- ewl_window_resize(about_dialog.window, 370, 150);
- ewl_window_set_title(about_dialog.window, "EWL Glow Plugin: About");
+ ewl_window_resize(EWL_WINDOW(about_dialog.window), 370, 150);
+ ewl_window_set_title(EWL_WINDOW(about_dialog.window),
+ "EWL Glow Plugin: About");
ewl_object_set_custom_size(EWL_OBJECT(about_dialog.window), 370, 150);
ewl_callback_append(about_dialog.window, EWL_CALLBACK_DELETE_WINDOW,
close_about_dialog, NULL);
ewl_widget_realize(about_dialog.window);
- about_dialog.text = ewl_text_new();
- ewl_text_set_text(about_dialog.text,
- " EWL Glow Plugin\n\n"
+ about_dialog.text = ewl_text_new(" EWL Glow Plugin\n\n"
"Created by Christopher 'smugg' Rosendahl");
ewl_object_set_alignment(EWL_OBJECT(about_dialog.text),
EWL_ALIGNMENT_CENTER);
|
|
From: <enl...@li...> - 2002-08-14 02:06:08
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Makefile.am ewl_box.c ewl_button.c ewl_button.h ewl_callback.c
ewl_check.c ewl_checkbutton.c ewl_container.c ewl_cursor.c
ewl_entry.c ewl_entry.h ewl_floater.c ewl_fx.c ewl_grid.c
ewl_imenu.c ewl_list.c ewl_menu.c ewl_menu_base.c ewl_misc.c
ewl_notebook.c ewl_object.c ewl_radiobutton.c ewl_scrollbar.c
ewl_scrollpane.c ewl_seeker.c ewl_selection.c
ewl_selectionbar.c ewl_selectionbook.c ewl_separator.c
ewl_spinner.c ewl_table.c ewl_text.c ewl_text.h ewl_textarea.c
ewl_theme.c ewl_widget.c ewl_window.c
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- Makefile.am 25 May 2002 05:46:39 -0000 1.27
+++ Makefile.am 14 Aug 2002 02:05:35 -0000 1.28
@@ -87,9 +87,7 @@
ewl_textarea.c \
ewl_theme.c \
ewl_widget.c \
- ewl_window.c \
- getopt.c \
- getopt1.c
+ ewl_window.c
libewl_la_LIBADD = @ebits_libs@ @ecore_libs@ @edb_libs@ @evas_libs@ @ewd_libs@ @etox_libs@ -lm
libewl_la_LDFLAGS = -version-info 0:0:0
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_box.c 25 May 2002 05:46:39 -0000 1.38
+++ ewl_box.c 14 Aug 2002 02:05:35 -0000 1.39
@@ -117,11 +117,11 @@
*/
if (o == EWL_ORIENTATION_VERTICAL)
ewl_container_init(EWL_CONTAINER(b),
- "/appearance/box/vertical",
+ "/box/vertical",
__ewl_box_add, __ewl_box_child_resize);
else
ewl_container_init(EWL_CONTAINER(b),
- "/appearance/box/horizontal",
+ "/box/horizontal",
__ewl_box_add, __ewl_box_child_resize);
ewl_callback_prepend(w, EWL_CALLBACK_CONFIGURE, __ewl_box_configure,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_button.c 25 May 2002 05:46:39 -0000 1.36
+++ ewl_button.c 14 Aug 2002 02:05:36 -0000 1.37
@@ -52,7 +52,7 @@
w = EWL_WIDGET(b);
ewl_box_init(EWL_BOX(b), EWL_ORIENTATION_HORIZONTAL);
- ewl_widget_set_appearance(w, "/appearance/button/default");
+ ewl_widget_set_appearance(w, "/button/default");
/*
* Override the default recursive setting on containers. This prevents
@@ -80,12 +80,11 @@
* Create and setup the label for the button if it's desired.
*/
if (label) {
- b->label_object = ewl_text_new();
+ b->label_object = ewl_text_new(label);
ewl_widget_set_appearance(b->label_object,
- "/appearance/button/label");
+ "/button/default/label");
ewl_object_set_alignment(EWL_OBJECT(b->label_object),
EWL_ALIGNMENT_CENTER);
- ewl_text_set_text(EWL_TEXT(b->label_object), label);
ewl_container_append_child(EWL_CONTAINER(b), b->label_object);
}
@@ -192,7 +191,6 @@
DRETURN(DLEVEL_STABLE);
snprintf(appearance, PATH_LEN, "%s/label", w->appearance);
-
ewl_widget_set_appearance(b->label_object, appearance);
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_button.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_button.h 25 May 2002 05:46:40 -0000 1.15
+++ ewl_button.h 14 Aug 2002 02:05:36 -0000 1.16
@@ -13,8 +13,6 @@
struct _ewl_button {
Ewl_Box box;
-
- char *label;
Ewl_Widget *label_object;
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_callback.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_callback.c 25 May 2002 05:46:40 -0000 1.29
+++ ewl_callback.c 14 Aug 2002 02:05:36 -0000 1.30
@@ -175,6 +175,8 @@
* @t: the type of the callback that is being attached
* @f: the function to attach as a callback
* @user_data: the data to be passed to the callback function
+ * @after: the function of the callback to append after
+ * @after_data: the user data of the callback to append after
*
* Returns 0 on failure, the id of the new callback on success. Same
* functionality as ewl_callback_append, but the callback is placed after the
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_check.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_check.c 3 Jun 2002 21:33:54 -0000 1.2
+++ ewl_check.c 14 Aug 2002 02:05:36 -0000 1.3
@@ -85,7 +85,7 @@
w = EWL_WIDGET(cb);
- ewl_widget_init(w, "/appearance/check");
+ ewl_widget_init(w, "/check");
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE);
ewl_object_set_preferred_size(EWL_OBJECT(w), 20, 20);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_checkbutton.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_checkbutton.c 3 Jun 2002 21:33:54 -0000 1.28
+++ ewl_checkbutton.c 14 Aug 2002 02:05:36 -0000 1.29
@@ -46,7 +46,7 @@
w = EWL_WIDGET(cb);
ewl_button_init(b, label);
- ewl_widget_set_appearance(w, "/appearance/button/check");
+ ewl_widget_set_appearance(w, "/button/check");
RECURSIVE(b) = FALSE;
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE);
@@ -89,7 +89,8 @@
DRETURN(DLEVEL_STABLE);
cb->label_position = p;
- ewl_container_remove_child(EWL_CONTAINER(cb), EWL_WIDGET(b->label));
+ ewl_container_remove_child(EWL_CONTAINER(cb),
+ EWL_WIDGET(b->label_object));
ewl_container_remove_child(EWL_CONTAINER(cb), cb->check);
/*
@@ -99,10 +100,10 @@
if (p == EWL_POSITION_RIGHT) {
ewl_container_append_child(EWL_CONTAINER(cb), cb->check);
ewl_container_append_child(EWL_CONTAINER(cb),
- EWL_WIDGET(b->label));
+ EWL_WIDGET(b->label_object));
} else {
ewl_container_append_child(EWL_CONTAINER(cb),
- EWL_WIDGET(b->label));
+ EWL_WIDGET(b->label_object));
ewl_container_append_child(EWL_CONTAINER(cb), cb->check);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_container.c 25 May 2002 05:46:40 -0000 1.24
+++ ewl_container.c 14 Aug 2002 02:05:36 -0000 1.25
@@ -17,6 +17,8 @@
* ewl_container_init - initialize a containers default fields and callbacks
* @c: the container to initialize
* @appearance: the appearance key for this container
+ * @add: the function to call when children added to container
+ * @rs: the function to call when children of container are resized
*
* Returns no value. Initializes the default values of the container, this
* also sets up the widget fields of the container, so the @appearance string
@@ -127,7 +129,6 @@
* it's parent has been changed.
*/
child->parent = EWL_WIDGET(pc);
- LAYER(child) = LAYER(pc) + 5;
ewd_list_append(pc->children, child);
/*
@@ -179,7 +180,6 @@
* it's parent has been changed.
*/
child->parent = EWL_WIDGET(pc);
- LAYER(child) = LAYER(pc) + 5;
ewd_list_prepend(pc->children, child);
/*
@@ -233,7 +233,6 @@
* notify the child that it's parent has been changed.
*/
child->parent = EWL_WIDGET(pc);
- LAYER(child) = LAYER(pc) + 5;
ewd_list_goto_index(pc->children, index);
ewd_list_insert(pc->children, child);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_cursor.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_cursor.c 25 May 2002 05:46:40 -0000 1.7
+++ ewl_cursor.c 14 Aug 2002 02:05:36 -0000 1.8
@@ -78,7 +78,7 @@
w = EWL_WIDGET(c);
- ewl_widget_init(w, "/appearance/cursor/default");
+ ewl_widget_init(w, "/cursor/default");
c->position = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_entry.c 25 May 2002 05:46:40 -0000 1.39
+++ ewl_entry.c 14 Aug 2002 02:05:36 -0000 1.40
@@ -39,7 +39,7 @@
* Returns a newly allocated and initialized entry widget on success, NULL on
* failure.
*/
-Ewl_Widget *ewl_entry_new(void)
+Ewl_Widget *ewl_entry_new(char *text)
{
Ewl_Entry *e;
@@ -51,7 +51,7 @@
ZERO(e, Ewl_Entry, 1);
- e->text = ewl_text_new();
+ e->text = ewl_text_new(text);
e->cursor = ewl_cursor_new();
e->selection = ewl_selection_new();
@@ -73,13 +73,9 @@
*/
void ewl_entry_set_text(Ewl_Entry * e, char *t)
{
- Ewl_Widget *w;
-
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("e", e);
- w = EWL_WIDGET(e);
-
ewl_text_set_text(EWL_TEXT(e->text), t);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -113,7 +109,7 @@
w = EWL_WIDGET(e);
- ewl_container_init(EWL_CONTAINER(w), "/appearance/entry/default",
+ ewl_container_init(EWL_CONTAINER(w), "/entry/default",
NULL, __ewl_entry_child_resize);
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_FILL);
ewl_object_set_minimum_size(EWL_OBJECT(w), 20, 20);
@@ -139,7 +135,7 @@
ewl_callback_append(w, EWL_CALLBACK_THEME_UPDATE,
__ewl_entry_theme_update, NULL);
- ewl_widget_set_appearance(e->text, "/appearance/entry/default/text");
+ ewl_widget_set_appearance(e->text, "/entry/default/text");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -415,11 +411,9 @@
e = EWL_ENTRY(w);
- font = ewl_theme_data_get_str(w, "/appearance/entry/default/text/font");
- size = ewl_theme_data_get_int(w,
- "/appearance/entry/default/text/font_size");
- style = ewl_theme_data_get_str(w,
- "/appearance/entry/default/text/style");
+ font = ewl_theme_data_get_str(w, "/entry/default/text/font");
+ size = ewl_theme_data_get_int(w, "/entry/default/text/font_size");
+ style = ewl_theme_data_get_str(w, "/entry/default/text/style");
if (font)
ewl_text_set_font(EWL_TEXT(e->text), font);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_entry.h 25 May 2002 05:46:40 -0000 1.15
+++ ewl_entry.h 14 Aug 2002 02:05:36 -0000 1.16
@@ -14,7 +14,7 @@
Ewl_Widget *selection;
};
-Ewl_Widget *ewl_entry_new(void);
+Ewl_Widget *ewl_entry_new(char *text);
void ewl_entry_set_text(Ewl_Entry * e, char *t);
char *ewl_entry_get_text(Ewl_Entry * e);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_floater.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_floater.c 19 Jul 2002 21:32:56 -0000 1.6
+++ ewl_floater.c 14 Aug 2002 02:05:36 -0000 1.7
@@ -74,7 +74,7 @@
*/
ewl_box_init(EWL_BOX(w), EWL_ORIENTATION_VERTICAL);
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NORMAL);
- ewl_widget_set_appearance(w, "/appearance/floater");
+ ewl_widget_set_appearance(w, "/floater");
f->follows = parent;
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fx.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_fx.c 25 May 2002 05:46:40 -0000 1.26
+++ ewl_fx.c 14 Aug 2002 02:05:36 -0000 1.27
@@ -115,17 +115,19 @@
/*
* Check for an error in the appearance string.
*/
+ /*
if (strncmp(w->appearance, "/appearance/", 12)) {
D(DLEVEL_STABLE,
"Widget %p has this:\n\n\t%s\n\nWierd appearance string\n",
w, w->appearance);
DRETURN(DLEVEL_STABLE);
}
+ */
/*
* Determine the key for fx to load for this widget.
*/
- sscanf(w->appearance, "/appearance/%[^/]/", wname);
+ sscanf(w->appearance, "/%[^/]/", wname);
/*
* Now determine how many fx to apply to this widget.
@@ -1087,17 +1089,19 @@
/*
* Check for a valid appearance string.
*/
+ /*
if (strncmp(w->appearance, "/appearance/", 12)) {
DWARNING
("Widget %p has this:\n\n\t%s\n\nWierd appearance string\n",
w, w->appearance);
DRETURN(DLEVEL_STABLE);
}
+ */
/*
* Determine the number of fx that need to be setup for the widgets.
*/
- sscanf(w->appearance, "/appearance/%[^/]/", wname);
+ sscanf(w->appearance, "/%[^/]/", wname);
snprintf(key, PATH_LEN, "/user/%s/count", wname);
count = ewl_config_get_int("fx", key);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_grid.c 25 May 2002 05:46:40 -0000 1.3
+++ ewl_grid.c 14 Aug 2002 02:05:36 -0000 1.4
@@ -54,7 +54,7 @@
* Initialize the grids inherited fields
*/
ewl_container_init(EWL_CONTAINER(g),
- "/appearance/box/vertical", __ewl_grid_add,
+ "/box/vertical", __ewl_grid_add,
__ewl_grid_auto_resize);
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_imenu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_imenu.c 19 Jul 2002 21:32:56 -0000 1.3
+++ ewl_imenu.c 14 Aug 2002 02:05:36 -0000 1.4
@@ -138,26 +138,6 @@
}
-void __expand_imenu_animator(int val, void *ev_data)
-{
-}
-
-
-void __collapse_imenu_animator(int val, void *ev_data)
-{
-}
-
-
-void __expand_imenu_and_title_animator(int val, void *ev_data)
-{
-}
-
-
-void __collapse_imenu_and_title_animator(int val, void *ev_data)
-{
-}
-
-
void __ewl_imenu_realize(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_IMenu *menu;
@@ -167,8 +147,4 @@
ewl_container_append_child(EWL_CONTAINER
(ewl_window_find_window_by_widget(w)),
menu->popup);
-}
-
-void __ewl_imenu_start(Ewl_Widget * w)
-{
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_list.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_list.c 25 May 2002 05:46:40 -0000 1.22
+++ ewl_list.c 14 Aug 2002 02:05:36 -0000 1.23
@@ -82,8 +82,7 @@
Ewl_Widget *text_widgets[EWL_TABLE(table)->columns];
for (i = 0; i < EWL_TABLE(table)->columns; i++) {
- text_widgets[i] = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text_widgets[i]), text[i]);
+ text_widgets[i] = ewl_text_new(text[i]);
ewl_text_set_font_size(EWL_TEXT(text_widgets[i]), 8);
/* ewl_table_attach(table, text_widgets[i],
@@ -166,7 +165,7 @@
/*
* Initialize the list widget
*/
- ewl_container_init(EWL_CONTAINER(w), "/appearance/list/default",
+ ewl_container_init(EWL_CONTAINER(w), "/list/default",
NULL, NULL);
ewl_callback_append(w, EWL_CALLBACK_REALIZE, __ewl_list_realize, NULL);
@@ -284,7 +283,7 @@
sel = NEW(Ewl_List_Selection, 1);
sel->row = row;
- image = ewl_theme_image_get(l, "/appearance/list/default/selection");
+ image = ewl_theme_image_get(l, "/list/default/selection");
sel->ebits_object = ebits_load(image);
FREE(image);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_menu.c 19 Jul 2002 21:32:56 -0000 1.3
+++ ewl_menu.c 14 Aug 2002 02:05:36 -0000 1.4
@@ -72,36 +72,6 @@
}
-/**
- * ewl_menu_set_title_expandable - allow title to be expanded/contracted
- * @menu: the menu
- *
- * Returns nothing.
- */
-void ewl_menu_set_title_expandable(Ewl_Menu * menu)
-{
-
- DENTER_FUNCTION(DLEVEL_STABLE);
-
- menu->t_expand = 1;
-
- /*
- * ewl_object_set_maximum_size (EWL_OBJECT(menu->corner), 30, 22);
- * ewl_object_set_minimum_size (EWL_OBJECT(menu->corner), 30, 22);
- */
-
- /*
- * ewl_callback_append(menu->corner_button, EWL_CALLBACK_MOUSE_UP,
- * __expand_menu, menu);
- * ewl_container_append_child(EWL_CONTAINER(menu->corner),
- * menu->corner_button);
- *
- * ewl_widget_configure(EWL_WIDGET(menu->corner));
- */
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
void __expand_menu(Ewl_Widget * w, void *ev_data, void *user_data)
{
int x, y;
@@ -141,28 +111,4 @@
ewl_window_move(EWL_WINDOW(menu->popup), x, y);
printf("Moving popup to %d, %d\n", x, y);
-}
-
-void __expand_menu_animator(int val, void *ev_data)
-{
-}
-
-
-void __collapse_menu_animator(int val, void *ev_data)
-{
-}
-
-
-void __expand_menu_and_title_animator(int val, void *ev_data)
-{
-}
-
-
-void __collapse_menu_and_title_animator(int val, void *ev_data)
-{
-}
-
-
-void __ewl_menu_start(Ewl_Widget * w)
-{
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu_base.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu_base.c 19 Jul 2002 21:32:56 -0000 1.2
+++ ewl_menu_base.c 14 Aug 2002 02:05:36 -0000 1.3
@@ -29,7 +29,7 @@
ewl_menu_item_init(EWL_MENU_ITEM(menu), image, title);
ewl_object_set_fill_policy(EWL_OBJECT(menu), EWL_FILL_POLICY_NONE);
- ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_CLICKED,
+ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_SELECT,
__expand_menu_base, NULL);
ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_DESELECT,
@@ -118,8 +118,7 @@
* Create the text object for the menu item.
*/
if (text) {
- item->text = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(item->text), text);
+ item->text = ewl_text_new(text);
ewl_container_append_child(EWL_CONTAINER(item), item->text);
}
@@ -175,7 +174,6 @@
ewl_widget_show(menu->popup);
ewl_widget_realize(menu->popup);
- ewl_widget_show(menu->popbox);
ewl_container_append_child(EWL_CONTAINER(menu->popup), menu->popbox);
ewl_widget_show(menu->popbox);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_misc.c 25 May 2002 05:46:41 -0000 1.25
+++ ewl_misc.c 14 Aug 2002 02:05:36 -0000 1.26
@@ -1,6 +1,5 @@
#include <Ewl.h>
-#include "getopt.h"
void ewl_idle_render(void *data);
@@ -193,6 +192,7 @@
*/
void __ewl_parse_option_array(int argc, char **argv)
{
+ /*
char stropts[] =
"a:A:b:BcC:dD:e:f:Fg:hH:iIklL:mM:nNo:O:pPqQrR:sS:tT:uUvVwW:xXy:zZ1:2:3:4:56:78:90:";
@@ -201,11 +201,13 @@
{0, 0, 0, 0}
};
int optch = 0, cmdx = 0;
+ */
DENTER_FUNCTION(DLEVEL_STABLE);
+ /*
while ((optch =
- getopt_long_only(argc, argv, stropts, lopts, &cmdx)) != EOF) {
+ getopt_long_only(argc, argv, stropts, lopts, &cmdx)) != EOF) {
switch (optch) {
case 0:
break;
@@ -216,6 +218,7 @@
break;
}
}
+ */
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_notebook.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_notebook.c 25 May 2002 05:46:41 -0000 1.16
+++ ewl_notebook.c 14 Aug 2002 02:05:36 -0000 1.17
@@ -465,28 +465,27 @@
switch (n->tabs_position) {
case EWL_POSITION_LEFT:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-left.bits.db");
+ "/notebook/tab_button/base-left.bits.db");
break;
case EWL_POSITION_RIGHT:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-right.bits.db");
+ "/notebook/tab_button/base-right.bits.db");
break;
case EWL_POSITION_BOTTOM:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-bottom.bits.db");
+ "/notebook/tab_button/base-bottom.bits.db");
break;
case EWL_POSITION_TOP:
default:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-top.bits.db");
+ "/notebook/tab_button/base-top.bits.db");
break;
}
ewd_list_goto_first(n->pages);
while ((np = ewd_list_next(n->pages)) != NULL)
- ewl_theme_data_set_str(np->tab,
- "/appearance/notebook/tab_button/base",
+ ewl_theme_data_set_str(np->tab, "/notebook/tab_button/base",
file);
ewl_widget_configure(w);
@@ -555,8 +554,7 @@
* Initialize the container portion of the notebook and set the fill
* policy to fill the area available.
*/
- ewl_container_init(EWL_CONTAINER(w),
- "/appearance/notebook/default", NULL, NULL);
+ ewl_container_init(EWL_CONTAINER(w), "/notebook/default", NULL, NULL);
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_FILL);
@@ -565,7 +563,7 @@
* notebook.
*/
n->tab_box = ewl_hbox_new();
- ewl_widget_set_appearance(n->tab_box, "/appearance/notebook/tab_box");
+ ewl_widget_set_appearance(n->tab_box, "/notebook/tab_box");
ewl_object_set_fill_policy(EWL_OBJECT(n->tab_box),
EWL_FILL_POLICY_FILL);
@@ -1021,32 +1019,32 @@
switch (n->tabs_position) {
case EWL_POSITION_LEFT:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-left.bits.db");
+ "/notebook/tab_button/base-left.bits.db");
break;
case EWL_POSITION_RIGHT:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-right.bits.db");
+ "/notebook/tab_button/base-right.bits.db");
break;
case EWL_POSITION_BOTTOM:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-bottom.bits.db");
+ "/notebook/tab_button/base-bottom.bits.db");
break;
case EWL_POSITION_TOP:
default:
snprintf(file, PATH_LEN,
- "/appearance/notebook/tab_button/base-top.bits.db");
+ "/notebook/tab_button/base-top.bits.db");
break;
}
box = ewl_vbox_new();
- ewl_widget_set_appearance(box, "/appearance/notebook/content_box");
+ ewl_widget_set_appearance(box, "/notebook/content_box");
ewl_container_append_child(EWL_CONTAINER(box), c);
ewl_object_request_position(EWL_OBJECT(box), 1 << 15, 1 << 15);
ewl_widget_configure(box);
button = ewl_button_new(NULL);
- ewl_widget_set_appearance(button, "/appearance/notebook/tab_button");
+ ewl_widget_set_appearance(button, "/notebook/tab_button");
ewl_callback_append(button, EWL_CALLBACK_CONFIGURE,
__ewl_notebook_tab_button_configure, NULL);
ewl_callback_append(button, EWL_CALLBACK_MOUSE_DOWN,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_object.c 25 May 2002 05:46:41 -0000 1.23
+++ ewl_object.c 14 Aug 2002 02:05:36 -0000 1.24
@@ -78,9 +78,9 @@
/**
* ewl_object_get_current_w - get the current width of the object
- * @ob: the object to retrieve the current width
+ * @o: the object to retrieve the current width
*
- * Returns the current width of the object @ob.
+ * Returns the current width of the object @o.
*/
int ewl_object_get_current_w(Ewl_Object * o)
{
@@ -91,9 +91,9 @@
/**
* ewl_object_get_current_h - get the current height of the object
- * @ob: the object to retrieve the current height
+ * @o: the object to retrieve the current height
*
- * Returns the current height of the object @ob.
+ * Returns the current height of the object @o.
*/
int ewl_object_get_current_h(Ewl_Object * o)
{
@@ -128,6 +128,7 @@
/**
* ewl_object_set_preferred_w - set the preferred width of the object
* @o: the object to change preferred width
+ * @w: the value to use as the preferred width
*
* Returns no value. Sets the preferred of @o width to @w or as close as
* possible according to the bounds.
@@ -168,6 +169,7 @@
/**
* ewl_object_set_preferred_h - set the preferred height of the object
* @o: the object to change preferred height
+ * @h: the value to use as the preferred height
*
* Returns no value. Sets the preferred of @o height to @w or as close as
* possible according to the bounds.
@@ -226,9 +228,9 @@
/**
* ewl_object_get_preferred_w - get the preferred width of the object
- * @ob: the object to retrieve the preferred width
+ * @o: the object to retrieve the preferred width
*
- * Returns the preferred width of the object @ob.
+ * Returns the preferred width of the object @o.
*/
int ewl_object_get_preferred_w(Ewl_Object * o)
{
@@ -239,9 +241,9 @@
/**
* ewl_object_get_preferred_h - get the preferred height of the object
- * @ob: the object to retrieve the preferred height
+ * @o: the object to retrieve the preferred height
*
- * Returns the preferred height of the object @ob.
+ * Returns the preferred height of the object @o.
*/
int ewl_object_get_preferred_h(Ewl_Object * o)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_radiobutton.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_radiobutton.c 25 May 2002 05:46:41 -0000 1.21
+++ ewl_radiobutton.c 14 Aug 2002 02:05:36 -0000 1.22
@@ -93,8 +93,8 @@
w = EWL_WIDGET(rb);
ewl_checkbutton_init(cb, label);
- ewl_widget_set_appearance(w, "/appearance/button/radio");
- ewl_widget_set_appearance(cb->check, "/appearance/radio");
+ ewl_widget_set_appearance(w, "/button/radio");
+ ewl_widget_set_appearance(cb->check, "/radio");
ewl_callback_del(w, EWL_CALLBACK_CLICKED, __ewl_checkbutton_clicked);
ewl_callback_append(w, EWL_CALLBACK_CLICKED,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_scrollbar.c 25 May 2002 05:46:42 -0000 1.11
+++ ewl_scrollbar.c 14 Aug 2002 02:05:36 -0000 1.12
@@ -131,17 +131,17 @@
* Set the appearance strings for the parts of the scrollbar
*/
ewl_widget_set_appearance(s->button_decrement,
- "/appearance/scrollbar/horizontal/button_increment");
+ "/scrollbar/horizontal/button_increment");
ewl_widget_set_appearance(s->seeker,
- "/appearance/scrollbar/horizontal");
+ "/scrollbar/horizontal");
ewl_widget_set_appearance(s->button_increment,
- "/appearance/scrollbar/horizontal/button_decrement");
+ "/scrollbar/horizontal/button_decrement");
/*
* Set the alignment of the buttons to the seeker.
*/
s->buttons_alignment = ewl_theme_data_get_int(EWL_WIDGET(s),
- "/appearance/scrollbar/horizontal/button_order");
+ "/scrollbar/horizontal/button_order");
if (s->buttons_alignment & EWL_ALIGNMENT_LEFT) {
@@ -185,17 +185,17 @@
* Set the appearances for the parts of the scrollbar.
*/
ewl_widget_set_appearance(s->button_decrement,
- "/appearance/scrollbar/vertical/button_increment");
+ "/scrollbar/vertical/button_increment");
ewl_widget_set_appearance(s->seeker,
- "/appearance/scrollbar/vertical");
+ "/scrollbar/vertical");
ewl_widget_set_appearance(s->button_increment,
- "/appearance/scrollbar/vertical/button_decrement");
+ "/scrollbar/vertical/button_decrement");
/*
* Set the alignment of the buttons to the seeker.
*/
s->buttons_alignment = ewl_theme_data_get_int(EWL_WIDGET(s),
- "/appearance/scrollbar/vertical/button_order");
+ "/scrollbar/vertical/button_order");
if (s->buttons_alignment & EWL_ALIGNMENT_TOP) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_scrollpane.c 25 May 2002 05:46:42 -0000 1.5
+++ ewl_scrollpane.c 14 Aug 2002 02:05:36 -0000 1.6
@@ -60,7 +60,7 @@
w = EWL_WIDGET(s);
- ewl_container_init(EWL_CONTAINER(s), "/appearance/scrollpane/default",
+ ewl_container_init(EWL_CONTAINER(s), "/scrollpane/default",
__ewl_scrollpane_add, __ewl_scrollpane_child_resize);
/*
@@ -70,7 +70,7 @@
s->box = NEW(Ewl_Container, 1);
ZERO(s->box, Ewl_Container, 1);
ewl_container_init(EWL_CONTAINER(s->box),
- "/appearance/scrollpane/default/box",
+ "/scrollpane/default/box",
__ewl_scrollpane_box_add,
__ewl_scrollpane_box_resize);
@@ -420,14 +420,12 @@
*/
if (o == EWL_ORIENTATION_HORIZONTAL)
ewl_object_set_preferred_w(EWL_OBJECT(parent),
- ewl_object_get_preferred_w(EWL_OBJECT
- (s->
- box)));
+ ewl_object_get_preferred_w(EWL_OBJECT(s->box))
+ + ewl_object_get_preferred_w(EWL_OBJECT(s->vscrollbar)));
else
ewl_object_set_preferred_h(EWL_OBJECT(parent),
- ewl_object_get_preferred_h(EWL_OBJECT
- (s->
- box)));
+ ewl_object_get_preferred_h(EWL_OBJECT(s->box))
+ + ewl_object_get_preferred_h(EWL_OBJECT(s->hscrollbar)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_seeker.c 19 Jul 2002 21:32:56 -0000 1.29
+++ ewl_seeker.c 14 Aug 2002 02:05:36 -0000 1.30
@@ -72,29 +72,34 @@
* type
*/
if (orientation == EWL_ORIENTATION_HORIZONTAL) {
- ewl_container_init(EWL_CONTAINER(w),
- "/appearance/seeker/horizontal", NULL, NULL);
-
- /*
- * Override the buttons default appearance
- */
- ewl_widget_set_appearance(s->dragbar,
- "/appearance/seeker/horizontal/dragbar");
+ ewl_container_init(EWL_CONTAINER(w), "/seeker/horizontal",
+ NULL, NULL);
ewl_object_set_custom_height(EWL_OBJECT(w), 16);
ewl_object_set_preferred_h(EWL_OBJECT(w), 16);
- } else {
+ }
+ else {
ewl_container_init(EWL_CONTAINER(w),
- "/appearance/seeker/vertical", NULL, NULL);
-
- /*
- * Override the buttons default appearance
- */
- ewl_widget_set_appearance(s->dragbar,
- "/appearance/seeker/vertical/dragbar");
+ "/seeker/vertical", NULL, NULL);
ewl_object_set_custom_width(EWL_OBJECT(w), 16);
ewl_object_set_preferred_w(EWL_OBJECT(w), 16);
}
+ /*
+ * Create and add the dragbar portion of the seeker
+ */
+ s->dragbar = ewl_button_new(NULL);
+ ewl_container_append_child(EWL_CONTAINER(s), s->dragbar);
+
+ /*
+ * Override the buttons default appearance
+ */
+ if (orientation == EWL_ORIENTATION_HORIZONTAL)
+ ewl_widget_set_appearance(s->dragbar,
+ "/seeker/horizontal/dragbar");
+ else
+ ewl_widget_set_appearance(s->dragbar,
+ "/seeker/vertical/dragbar");
+
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_FILL);
/*
@@ -104,12 +109,6 @@
s->range = 100.0;
s->value = 0.0;
s->step = 5.0;
-
- /*
- * Create and add the dragbar portion of the seeker
- */
- s->dragbar = ewl_button_new(NULL);
- ewl_container_append_child(EWL_CONTAINER(s), s->dragbar);
/*
* Add necessary configuration callbacks
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selection.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_selection.c 25 May 2002 05:46:42 -0000 1.7
+++ ewl_selection.c 14 Aug 2002 02:05:36 -0000 1.8
@@ -84,7 +84,7 @@
w = EWL_WIDGET(s);
- ewl_widget_init(w, "/appearance/selection/default");
+ ewl_widget_init(w, "/selection/default");
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbar.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_selectionbar.c 25 May 2002 05:46:42 -0000 1.4
+++ ewl_selectionbar.c 14 Aug 2002 02:05:36 -0000 1.5
@@ -80,15 +80,14 @@
ewl_callback_append(w, EWL_CALLBACK_SHOW, __ewl_selectionbar_show,
NULL);
ewl_theme_data_set_str(EWL_WIDGET(s),
- "/appearance/box/vertical/base/visible", "no");
+ "/box/vertical/base/visible", "no");
s->bar = NEW(Ewl_Container, 1);
memset(s->bar, 0, sizeof(Ewl_Container));
- ewl_container_init(EWL_CONTAINER(s->bar), "/appearance/box/vertical",
- NULL, NULL);
+ ewl_container_init(EWL_CONTAINER(s->bar), "/box/vertical", NULL, NULL);
ewl_object_set_fill_policy(EWL_OBJECT(s->bar), EWL_FILL_POLICY_NORMAL);
ewl_container_append_child(EWL_CONTAINER(w), EWL_WIDGET(s->bar));
ewl_callback_append(EWL_WIDGET(s->bar), EWL_CALLBACK_FOCUS_OUT,
@@ -96,7 +95,7 @@
ewl_callback_append(EWL_WIDGET(s->bar), EWL_CALLBACK_FOCUS_IN,
__focus_in, w);
ewl_theme_data_set_str(EWL_WIDGET(s->bar),
- "/appearance/box/vertical/base/visible", "yes");
+ "/box/vertical/base/visible", "yes");
window = ewl_window_find_window_by_widget(parent);
@@ -110,9 +109,9 @@
/* ewl_callback_append(s->scroller.top, EWL_CALLBACK_MOUSE_MOVE,
__mouse_move_over_children, s);
-*/ ewl_theme_data_set_str(s->scroller.top,
- "/appearance/box/vertical/base/visible",
- "yes");
+*/
+ ewl_theme_data_set_str(s->scroller.top, "/box/vertical/base/visible",
+ "yes");
s->scroller.bottom = ewl_vbox_new();
@@ -121,9 +120,9 @@
/* ewl_callback_append(s->scroller.bottom, EWL_CALLBACK_MOUSE_MOVE,
__mouse_move_over_children, s);
-*/ ewl_theme_data_set_str(s->scroller.bottom,
- "/appearance/box/vertical/base/visible",
- "yes");
+*/
+ ewl_theme_data_set_str(s->scroller.bottom, "/box/vertical/base/visible",
+ "yes");
ewl_container_add_notify(EWL_CONTAINER(w), __child_add);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbook.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_selectionbook.c 25 May 2002 05:46:42 -0000 1.4
+++ ewl_selectionbook.c 14 Aug 2002 02:05:36 -0000 1.5
@@ -67,8 +67,7 @@
__ewl_selectionbook_realize, NULL);
ewl_callback_append(w, EWL_CALLBACK_DESTROY,
__ewl_selectionbook_destroy, NULL);
- ewl_theme_data_set_str(w, "/appearance/box/vertical/base/visible",
- "no");
+ ewl_theme_data_set_str(w, "/box/vertical/base/visible", "no");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_separator.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_separator.c 25 May 2002 05:46:42 -0000 1.15
+++ ewl_separator.c 14 Aug 2002 02:05:36 -0000 1.16
@@ -41,9 +41,9 @@
w = EWL_WIDGET(s);
if (o == EWL_ORIENTATION_HORIZONTAL)
- ewl_widget_init(w, "/appearance/separator/horizontal");
+ ewl_widget_init(w, "/separator/horizontal");
else
- ewl_widget_init(w, "/appearance/separator/vertical");
+ ewl_widget_init(w, "/separator/vertical");
ewl_object_set_alignment(EWL_OBJECT(s), EWL_ALIGNMENT_LEFT);
ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FILL_POLICY_FILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_spinner.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_spinner.c 25 May 2002 05:46:42 -0000 1.31
+++ ewl_spinner.c 14 Aug 2002 02:05:36 -0000 1.32
@@ -48,7 +48,7 @@
ZERO(s, Ewl_Spinner, 1);
- s->entry = ewl_entry_new();
+ s->entry = ewl_entry_new("0");
s->button_increase = ewl_button_new(NULL);
s->button_decrease = ewl_button_new(NULL);
@@ -171,7 +171,7 @@
w = EWL_WIDGET(s);
- ewl_container_init(EWL_CONTAINER(w), "/appearance/spinner", NULL, NULL);
+ ewl_container_init(EWL_CONTAINER(w), "/spinner", NULL, NULL);
ewl_object_set_minimum_size(EWL_OBJECT(w), 30, 20);
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_FILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_table.c 25 May 2002 05:46:42 -0000 1.30
+++ ewl_table.c 14 Aug 2002 02:05:36 -0000 1.31
@@ -80,10 +80,10 @@
* Iniitialize the tables inherited fields
*/
ewl_container_init(EWL_CONTAINER(t),
- "/appearance/box/vertical", NULL, NULL);
+ "/box/vertical", NULL, NULL);
ewl_object_set_fill_policy(EWL_OBJECT(t), EWL_FILL_POLICY_FILL);
- ewl_theme_data_set_str(EWL_WIDGET(t),
- "/appearance/box/vertical/base/visible", "no");
+ ewl_theme_data_set_str(EWL_WIDGET(t), "/box/vertical/base/visible",
+ "no");
/*
@@ -92,7 +92,7 @@
t->grid = (Ewl_Grid *) ewl_grid_new(cols, rows);
ewl_container_append_child(EWL_CONTAINER(t), EWL_WIDGET(t->grid));
ewl_theme_data_set_str(EWL_WIDGET(t->grid),
- "/appearance/box/vertical/base/visible", "no");
+ "/box/vertical/base/visible", "no");
/*
@@ -135,7 +135,7 @@
/**
* ewl_table_add - add a child widget to the table
- * @t: the table
+ * @table: the table
* @text: the text to add
* @dm_click: callback function to be called on double mouse click
* @start_col: the start column
@@ -180,7 +180,7 @@
/**
* ewl_table_add_return - add a child widget to the table
- * @t: the table
+ * @table: the table
* @text: the text to add
* @start_col: the start column
* @end_col: the end columnt
@@ -212,8 +212,7 @@
}
txt = ewl_button_new(text);
- ewl_theme_data_set_str(txt,
- "/appearance/button/default/base/visible", "no");
+ ewl_theme_data_set_str(txt, "/button/default/base/visible", "no");
child = __ewl_table_create_child(txt);
ewl_grid_add(table->grid, EWL_WIDGET(child),
start_col, end_col, start_row, end_row);
@@ -230,6 +229,7 @@
/**
* ewl_table_get_col_row - get the column and row of a widget
* @t: the table
+ * @text: the text to add
* @w: the widget to find
* @start_col: integer pointer to store the start column
* @end_col: integer pointer to store the end column in
@@ -339,7 +339,7 @@
/**
* ewl_table_set_col_w - set the width of a table column
- * @t: the table
+ * @table: the table
* @col: the column
* @width: the new width
*
@@ -364,7 +364,7 @@
/**
* ewl_table_get_col_w - get the width of a table column
- * @t: the table
+ * @table: the table
* @col: the column
* @width: integer pointer to store the width in
*
@@ -389,7 +389,7 @@
/**
* ewl_table_set_row_h - set the height of a table row
- * @t: the table
+ * @table: the table
* @row: the row
* @height: the new height
*
@@ -414,7 +414,7 @@
/**
* ewl_table_get_row_h - get the height of a table row
- * @t: the table
+ * @table: the table
* @row: the row
* @height: integer pointer to store the height in
*
@@ -543,8 +543,7 @@
/*
* Initialize the inherited fields
*/
- ewl_container_init(EWL_CONTAINER(child),
- "/appearance/box/vertical", NULL, NULL);
+ ewl_container_init(EWL_CONTAINER(child), "/box/vertical", NULL, NULL);
ewl_object_set_fill_policy(EWL_OBJECT(child), EWL_FILL_POLICY_FILL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_text.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_text.c 25 May 2002 05:46:42 -0000 1.41
+++ ewl_text.c 14 Aug 2002 02:05:36 -0000 1.42
@@ -2,7 +2,7 @@
#include <Ewl.h>
#include <Estyle.h>
-void ewl_text_init(Ewl_Text * t);
+void ewl_text_init(Ewl_Text * t, char *text);
void __ewl_text_realize(Ewl_Widget * w, void *ev_data,
void *user_data);
void __ewl_text_destroy(Ewl_Widget * w, void *ev_data,
@@ -17,11 +17,13 @@
/**
* ewl_text_new - allocate a new text widget
+ * @text: the text to display
*
* Returns a pointer to a newly allocated text widget on success, NULL on
* failure.
*/
-Ewl_Widget *ewl_text_new()
+Ewl_Widget *
+ewl_text_new(char *text)
{
Ewl_Text *t;
@@ -30,7 +32,7 @@
t = NEW(Ewl_Text, 1);
ZERO(t, Ewl_Text, 1);
- ewl_text_init(t);
+ ewl_text_init(t, text);
DRETURN_PTR(EWL_WIDGET(t), DLEVEL_STABLE);
}
@@ -42,33 +44,20 @@
* Returns no value. Sets the fields and callbacks of the text widget @t to
* their defaults.
*/
-void ewl_text_init(Ewl_Text * t)
+void
+ewl_text_init(Ewl_Text * t, char *text)
{
Ewl_Widget *w;
- char key[PATH_MAX];
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("t", t);
w = EWL_WIDGET(t);
- ewl_widget_init(w, "/appearance/text/default");
+ ewl_widget_init(w, "/text/default");
ewl_object_set_fill_policy(EWL_OBJECT(w), EWL_FILL_POLICY_NONE);
- /*
- * Setup the default font.
- */
- snprintf(key, PATH_LEN, "%s/font", w->appearance);
- t->font = ewl_theme_data_get_str(w, key);
-
- snprintf(key, PATH_LEN, "%s/font_size", w->appearance);
- t->font_size = ewl_theme_data_get_int(w, key);
-
- /*
- * Setup the default style alignment and text.
- */
- t->text = strdup("");
- t->style = ewl_theme_data_get_str(w, "/appearance/text/default/style");
+ t->text = (text ? strdup(text) : strdup(""));
t->align = EWL_ALIGNMENT_TOP | EWL_ALIGNMENT_LEFT;
/*
@@ -83,6 +72,11 @@
ewl_callback_append(w, EWL_CALLBACK_REPARENT, __ewl_text_reparent,
NULL);
+ t->r = 255;
+ t->g = 255;
+ t->b = 255;
+ t->a = 255;
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -93,7 +87,8 @@
*
* Returns no value. Sets the text of the text widget @t to @text.
*/
-void ewl_text_set_text(Ewl_Text * t, char *text)
+void
+ewl_text_set_text(Ewl_Text * t, char *text)
{
Ewl_Widget *w;
@@ -133,7 +128,8 @@
*
* Returns a pointer to a copy of the text in @t on success, NULL on failure.
*/
-char *ewl_text_get_text(Ewl_Text * t)
+char *
+ewl_text_get_text(Ewl_Text * t)
{
Ewl_Widget *w;
@@ -153,7 +149,8 @@
* Returns no value. Sets the name of the font for text widget @t to @f and
* updates the display to use that font.
*/
-void ewl_text_set_font(Ewl_Text * t, char *f)
+void
+ewl_text_set_font(Ewl_Text * t, char *f)
{
Ewl_Widget *w;
@@ -190,7 +187,8 @@
* Returns a pointer to a copy of the font name used by @t on success, NULL on
* failure.
*/
-char *ewl_text_get_font(Ewl_Text * t)
+char *
+ewl_text_get_font(Ewl_Text * t)
{
Ewl_Widget *w;
@@ -209,7 +207,8 @@
*
* Returns no value. Sets the font size for the text widget @t to @s.
*/
-void ewl_text_set_font_size(Ewl_Text * t, int s)
+void
+ewl_text_set_font_size(Ewl_Text * t, int s)
{
Ewl_Widget *w;
@@ -242,7 +241,8 @@
*
* Returns the font size of the text widget on success, 0 on failure.
*/
-int ewl_text_get_font_size(Ewl_Text * t)
+int
+ewl_text_get_font_size(Ewl_Text * t)
{
Ewl_Widget *w;
@@ -265,7 +265,8 @@
* Returns no value. Sets the color of the text in the text widget @t to the
* new color values specified.
*/
-void ewl_text_set_color(Ewl_Text * t, int r, int g, int b, int a)
+void
+ewl_text_set_color(Ewl_Text * t, int r, int g, int b, int a)
{
Ewl_Widget *w;
@@ -277,6 +278,11 @@
if (t->estyle)
estyle_set_color(t->estyle, r, g, b, a);
+ t->r = r;
+ t->g = g;
+ t->b = b;
+ t->a = a;
+
ewl_widget_configure(w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -292,7 +298,8 @@
*
* Returns no value. Stores the color values into any non-NULL color pointers.
*/
-void ewl_text_get_color(Ewl_Text * t, int *r, int *g, int *b, int *a)
+void
+ewl_text_get_color(Ewl_Text * t, int *r, int *g, int *b, int *a)
{
Ewl_Widget *w;
@@ -324,7 +331,8 @@
* Returns no value. Changes the text style of the text widget @t to the style
* identified by the name @s.
*/
-void ewl_text_set_style(Ewl_Text * t, char *s)
+void
+ewl_text_set_style(Ewl_Text * t, char *s)
{
Ewl_Widget *w;
@@ -464,7 +472,8 @@
*
* Returns no value. Changes the alignment of the text in @t to @a.
*/
-void ewl_text_set_alignment(Ewl_Text * t, Ewl_Alignment a)
+void
+ewl_text_set_alignment(Ewl_Text * t, Ewl_Alignment a)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("t", t);
@@ -485,7 +494,8 @@
* Returns the index of the letter at the coordinates @x, @y in the text
* widget @t.
*/
-int ewl_text_get_index_at(Ewl_Text * t, int x, int y)
+int
+ewl_text_get_index_at(Ewl_Text * t, int x, int y)
{
Ewl_Widget *w;
@@ -501,7 +511,8 @@
DLEVEL_STABLE);
}
-void __ewl_text_realize(Ewl_Widget * w, void *ev_data, void *user_data)
+void
+__ewl_text_realize(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Text *t;
Ewl_Window *win;
@@ -516,7 +527,8 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_text_destroy(Ewl_Widget * w, void *ev_data, void *user_data)
+void
+__ewl_text_destroy(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Text *t;
@@ -534,7 +546,8 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_text_configure(Ewl_Widget * w, void *ev_data, void *user_data)
+void
+__ewl_text_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Text *t;
@@ -544,16 +557,17 @@
t = EWL_TEXT(w);
if (t->estyle)
- estyle_move(t->estyle, CURRENT_X(t) + INSET_LEFT(w) +
- PADDING_LEFT(w), CURRENT_Y(t) + INSET_TOP(w) +
- PADDING_TOP(w));
+ estyle_move(t->estyle, CURRENT_X(t) + INSET_LEFT(w),
+ CURRENT_Y(t) + INSET_TOP(w));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_text_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
+void
+__ewl_text_theme_update(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Text *t;
+ char key[PATH_MAX];
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -566,17 +580,39 @@
/*
* Set the correct font and size.
*/
+ if (!t->font) {
+ /*
+ * Setup the default font.
+ */
+ snprintf(key, PATH_MAX, "%s/font", w->appearance);
+ t->font = ewl_theme_data_get_str(w, key);
+
+ snprintf(key, PATH_MAX, "%s/font_size", w->appearance);
+ t->font_size = ewl_theme_data_get_int(w, key);
+ }
+
estyle_set_font(t->estyle, t->font, t->font_size);
+ if (!t->style) {
+ /*
+ * Setup the default style alignment and text.
+ */
+ snprintf(key, PATH_MAX, "%s/style", w->appearance);
+ t->style = ewl_theme_data_get_str(w, key);
+ }
+
+ estyle_set_style(t->estyle, t->style);
+
/*
* Set move it into the correct position.
*/
- estyle_set_layer(t->estyle, LAYER(w));
+ estyle_set_color(t->estyle, t->r, t->g, t->b, t->a);
/*
* Adjust the clip box for the estyle and then display it.
*/
estyle_set_clip(t->estyle, w->fx_clip_box);
+ estyle_set_layer(t->estyle, LAYER(w));
estyle_show(t->estyle);
__ewl_text_update_size(t);
@@ -584,7 +620,8 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_text_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
+void
+__ewl_text_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Text *t;
@@ -596,12 +633,15 @@
if (!t->estyle)
DRETURN(DLEVEL_STABLE);
+
estyle_set_clip(t->estyle, w->fx_clip_box);
+ estyle_set_layer(t->estyle, LAYER(w));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void __ewl_text_update_size(Ewl_Text * t)
+void
+__ewl_text_update_size(Ewl_Text * t)
{
int x, y, width, height;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_text.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_text.h 16 Apr 2002 18:22:57 -0000 1.18
+++ ewl_text.h 14 Aug 2002 02:05:36 -0000 1.19
@@ -19,7 +19,7 @@
int r, g, b, a;
};
-Ewl_Widget *ewl_text_new();
+Ewl_Widget *ewl_text_new(char *text);
void ewl_text_set_text(Ewl_Text * t, char *text);
char *ewl_text_get_text(Ewl_Text * t);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_textarea.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_textarea.c 25 May 2002 05:46:42 -0000 1.5
+++ ewl_textarea.c 14 Aug 2002 02:05:37 -0000 1.6
@@ -33,6 +33,7 @@
/**
* ewl_textarea_init - initialize the fields and callbacks of a text area
* @ta: the text area to be initialized
+ * @text: the text to be displayed initially in the text area
*
* Returns no value. Sets the internal fields and callbacks of a text area to
* their defaults.
@@ -46,7 +47,7 @@
w = EWL_WIDGET(ta);
- ewl_widget_init(EWL_WIDGET(w), "/appearance/textarea/default");
+ ewl_widget_init(EWL_WIDGET(w), "/textarea/default");
ewl_callback_append(w, EWL_CALLBACK_REALIZE, __ewl_textarea_realize,
NULL);
@@ -187,15 +188,11 @@
* Get the default style and color based on the theme.
*/
style = ewl_theme_data_get_str(w,
- "/appearance/textarea/default/base/style");
- r = ewl_theme_data_get_int(w,
- "/appearance/textarea/default/base/r");
- g = ewl_theme_data_get_int(w,
- "/appearance/textarea/default/base/g");
- b = ewl_theme_data_get_int(w,
- "/appearance/textarea/default/base/b");
- a = ewl_theme_data_get_int(w,
- "/appearance/textarea/default/base/a");
+ "/textarea/default/base/style");
+ r = ewl_theme_data_get_int(w, "/textarea/default/base/r");
+ g = ewl_theme_data_get_int(w, "/textarea/default/base/g");
+ b = ewl_theme_data_get_int(w, "/textarea/default/base/b");
+ a = ewl_theme_data_get_int(w, "/textarea/default/base/a");
/*
* Set the default style
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_theme.c 25 May 2002 05:46:42 -0000 1.35
+++ ewl_theme.c 14 Aug 2002 02:05:37 -0000 1.36
@@ -43,7 +43,7 @@
if (!home) {
DERROR("Environment variable HOME not defined\n"
"Try export HOME=/home/user in a bash like environemnt or\n"
- "setenv HOME=/home/user in a sh like environment.\n");
+ "setenv HOME=/home/user in a csh like environment.\n");
exit(-1);
}
@@ -113,7 +113,7 @@
/*
* We only want to destroy the hash if its not def_theme_data
- * * We destroy def_theme_data from else where..
+ * We destroy def_theme_data from else where..
*/
if (w->theme && w->theme != def_theme_data)
ewd_hash_destroy(w->theme);
@@ -148,7 +148,7 @@
if (!font_path) {
font_path = NEW(char, PATH_LEN);
- snprintf(font_path, PATH_LEN, "%s/appearance/fonts",
+ snprintf(font_path, PATH_LEN, "%s/fonts",
theme_path);
}
@@ -177,10 +177,10 @@
if (!data)
DRETURN_PTR(NULL, DLEVEL_STABLE);
- if (!strncmp(data, "/appearance", 11)) {
+ if (*data != '/') {
path = NEW(char, PATH_LEN);
- snprintf(path, PATH_LEN, "%s%s", theme_path, data);
+ snprintf(path, PATH_LEN, "%s/%s", theme_path, data);
FREE(data);
} else /* Absolute path given, so return it */
@@ -346,40 +346,3 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
-
-/* This isn't needed yet...
-void
-ewl_theme_data_gen_default_theme_db(char *f)
-{
- E_DB_File *db;
- char str[7], key[512], val[512];
- int i = -1, j, jj, l;
-
- db = e_db_open(f);
-
- while (theme_keys[++i]) {
- snprintf(key, 512, "%s", (char *) theme_keys[i]);
-
- l = strlen(key);
-
- jj = 0;
-
- for (j = l - 7; j < l; j++)
- str[jj++] = key[j];
-
- if (!strncasecmp(str, "visible", 7))
- snprintf(val, 512, "yes");
- else
- snprintf(val, 512, "%s.bits.db", theme_keys[i]);
-
- e_db_str_set(db, key, val);
-
- ++i;
- }
-
- e_db_flush();
-
- e_db_close(db);
-}
-*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_widget.c 19 Jul 2002 21:32:56 -0000 1.41
+++ ewl_widget.c 14 Aug 2002 02:05:37 -0000 1.42
@@ -713,6 +713,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
+ LAYER(w) = LAYER(w->parent) + 5;
win = ewl_window_find_window_by_widget(w);
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_window.c 19 Jul 2002 21:32:56 -0000 1.38
+++ ewl_window.c 14 Aug 2002 02:05:37 -0000 1.39
@@ -118,14 +118,14 @@
if (!win->window)
DRETURN(DLEVEL_STABLE);
- ecore_window_resize(win->window, w, h);
+ ecore_window_resize(win->window, CURRENT_W(win), CURRENT_H(win));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
* ewl_window_set_min_size - set the minimum size a window can attain
- * @widget: the window to change the minimum size
+ * @win: the window to change the minimum size
* @w: the minimum width the window can attain
* @h: the minimum height the window can attain
*
@@ -150,7 +150,7 @@
/**
* ewl_window_set_max_size - set the maximum size a window can attain
- * @widget: the window to change the maximum size
+ * @win: the window to change the maximum size
* @w: the maximum width the window can attain
* @h: the maximum height the window can attain
*
@@ -193,7 +193,7 @@
/**
* ewl_window_set_geometry - set the current size and position of a window
- * @widget: the window to change geometry
+ * @win: the window to change geometry
* @x: the new x position of the window
* @y: the new y position of the window
* @w: the new width of the window
@@ -211,7 +211,7 @@
/**
* ewl_window_set_title - set the title of the specified window
- * @w: the window to change the title
+ * @win: the window to change the title
* @title: the title to set for the window
*
* Returns no value. Sets the title of window @w to @title and calls the
@@ -237,7 +237,7 @@
/**
* ewl_window_get_title - retrieve the title of the specified window
- * @widget: the window to retrieve the window
+ * @win: the window to retrieve the window
*
* Returns a pointer to a newly allocated copy of the title, NULL on failure.
* The returned title should be freed.
@@ -252,7 +252,7 @@
/**
* ewl_window_set_borderless - remove the border from the specified window
- * @w: the window to remove the border
+ * @win: the window to remove the border
*
* Returns no value. Remove the border from the specified widget and call the
* necessary X lib functions to update the appearance.
@@ -287,7 +287,7 @@
/**
* ewl_window_move - move the specified window to the given position
- * @w: the window to move
+ * @win: the window to move
* @x: the x coordinate of the new position
* @y: the y coordinate of the new position
*
@@ -348,7 +348,7 @@
/*
* Initialize the fields of the inherited container class
*/
- ewl_container_init(EWL_CONTAINER(w), "/appearance/window/default",
+ ewl_container_init(EWL_CONTAINER(w), "/window/default",
__ewl_window_child_add, NULL);
ewl_object_request_size(EWL_OBJECT(w), 256, 256);
ewl_object_request_size(EWL_OBJECT(w), 256, 256);
@@ -489,40 +489,46 @@
/*
* Resize to fit the preferred size of the contents.
*/
- if (win->auto_resize) {
- ewl_object_set_preferred_size(EWL_OBJECT(w), 0, 0);
+ ewl_object_set_preferred_size(EWL_OBJECT(w), 0, 0);
- ewd_list_goto_first(EWL_CONTAINER(win)->children);
- while ((child = ewd_list_next(EWL_CONTAINER(win)->children))) {
- int ws;
- int cs;
-
- ws = ewl_object_get_preferred_w(EWL_OBJECT(win));
- cs = CURRENT_X(child) +
- ewl_object_get_preferred_w(child);
-
- /*
- * Check the width and x position vs. window width.
- */
- if (ws < cs)
- ewl_object_set_preferred_w(EWL_OBJECT(win), cs);
-
- ws = ewl_object_get_preferred_h(EWL_OBJECT(win));
- cs = CURRENT_Y(child) +
- ewl_object_get_preferred_h(child);
-
- /*
- * Check the height and y position vs. window height.
- */
- if (ws < cs)
- ewl_object_set_preferred_h(EWL_OBJECT(win), cs);
+ ewd_list_goto_first(EWL_CONTAINER(win)->children);
+ while ((child = ewd_list_next(EWL_CONTAINER(win)->children))) {
+ int ws;
+ int cs;
- }
+ ws = ewl_object_get_preferred_w(EWL_OBJECT(win));
+ /*
+ * Adjust children for insets
+ */
+ if (CURRENT_X(child) < INSET_LEFT(win))
+ ewl_object_request_x(child, INSET_LEFT(win));
+ if (CURRENT_Y(child) < INSET_TOP(win))
+ ewl_object_request_y(child, INSET_TOP(win));
+
+ cs = CURRENT_X(child) + ewl_object_get_preferred_w(child);
+
+ /*
+ * Check the width and x position vs. window width.
+ */
+ if (ws < cs)
+ ewl_object_set_preferred_w(EWL_OBJECT(win), cs);
+
+ ws = ewl_object_get_preferred_h(EWL_OBJECT(win));
+ cs = CURRENT_Y(child) + ewl_object_get_preferred_h(child);
+
+ /*
+ * Check the height and y position vs. window height.
+ */
+ if (ws < cs)
+ ewl_object_set_preferred_h(EWL_OBJECT(win), cs);
+
+ }
+
+ if (win->auto_resize)
ewl_window_resize(win,
ewl_object_get_preferred_w(EWL_OBJECT(w)),
ewl_object_get_preferred_h(EWL_OBJECT(w)));
- }
if (win->bg_rect) {
evas_move(win->evas, win->bg_rect, 0, 0);
@@ -542,11 +548,14 @@
/*
* Try to give the child the full size of the window from it's
* base position. The object will constrict it based on the
- * fill policy.
+ * fill policy. Don't add the TOP and LEFT insets since
+ * they've already been accounted for.
*/
ewl_object_request_size(child,
- CURRENT_W(w) - CURRENT_X(child),
- CURRENT_H(w) - CURRENT_Y(child));
+ CURRENT_W(w) - (CURRENT_X(child) +
+ INSET_RIGHT(win)),
+ CURRENT_H(w) - (CURRENT_Y(child) +
+ INSET_BOTTOM(win)));
/*
* Now configure the widget.
|
|
From: <enl...@li...> - 2002-08-14 02:06:08
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/test
Modified Files:
ewl_box_test.c ewl_entry_test.c ewl_filedialog_test.c
ewl_fileselector_test.c ewl_floater_test.c ewl_image_test.c
ewl_imenu_test.c ewl_menu_test.c ewl_notebook_test.c
ewl_selectionbar_test.c ewl_selectionbook_test.c
ewl_spinner_test.c ewl_table_test.c ewl_test.c ewl_text_test.c
Log Message:
This commit includes:
* Change to theme keys in preparation for a major change
* Rearrangement of text code
* ewl_text_new and ewl_entry_new now take string arguments
* Windows now use their insets for laying out contained widgets.
* A variety of minor fixes and code rearrangements.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_box_test.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_box_test.c 16 Apr 2002 18:24:59 -0000 1.16
+++ ewl_box_test.c 14 Aug 2002 02:05:37 -0000 1.17
@@ -223,6 +223,10 @@
ewl_container_append_child(EWL_CONTAINER(vbox[1]), vbox_button[1][0]);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[1][0]),
EWL_FILL_POLICY_NONE);
+ ewl_box_set_orientation(EWL_BOX(vbox_button[1][0]),
+ EWL_ORIENTATION_VERTICAL);
+ ewl_object_set_alignment(EWL_OBJECT(EWL_BUTTON(vbox_button[1][0])->label_object),
+ EWL_ALIGNMENT_CENTER);
ewl_callback_append(vbox_button[1][0], EWL_CALLBACK_CLICKED,
__toggle_child_fill, NULL);
ewl_widget_show(vbox_button[1][0]);
@@ -232,8 +236,12 @@
*/
vbox_button[1][1] = ewl_button_new("Fill");
ewl_container_append_child(EWL_CONTAINER(vbox[1]), vbox_button[1][1]);
+ ewl_box_set_orientation(EWL_BOX(vbox_button[1][1]),
+ EWL_ORIENTATION_VERTICAL);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[1][1]),
EWL_FILL_POLICY_FILL);
+ ewl_object_set_alignment(EWL_OBJECT(EWL_BUTTON(vbox_button[1][1])->label_object),
+ EWL_ALIGNMENT_CENTER);
ewl_callback_append(vbox_button[1][1], EWL_CALLBACK_CLICKED,
__toggle_child_fill, NULL);
ewl_widget_show(vbox_button[1][1]);
@@ -243,8 +251,12 @@
*/
vbox_button[1][2] = ewl_button_new("None");
ewl_container_append_child(EWL_CONTAINER(vbox[1]), vbox_button[1][2]);
+ ewl_box_set_orientation(EWL_BOX(vbox_button[1][2]),
+ EWL_ORIENTATION_VERTICAL);
ewl_object_set_fill_policy(EWL_OBJECT(vbox_button[1][2]),
EWL_FILL_POLICY_NONE);
+ ewl_object_set_alignment(EWL_OBJECT(EWL_BUTTON(vbox_button[1][2])->label_object),
+ EWL_ALIGNMENT_CENTER);
ewl_callback_append(vbox_button[1][2], EWL_CALLBACK_CLICKED,
__toggle_child_fill, NULL);
ewl_widget_show(vbox_button[1][2]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_entry_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_entry_test.c 16 Apr 2002 18:25:00 -0000 1.11
+++ ewl_entry_test.c 14 Aug 2002 02:05:37 -0000 1.12
@@ -24,11 +24,11 @@
{
char *s;
- s = ewl_entry_get_text(entry[0]);
+ s = ewl_entry_get_text(EWL_ENTRY(entry[0]));
printf("First entry covers: %s\n", s);
FREE(s);
- s = ewl_entry_get_text(entry[1]);
+ s = ewl_entry_get_text(EWL_ENTRY(entry[1]));
printf("Second entry covers: %s\n", s);
FREE(s);
@@ -42,8 +42,8 @@
void
__set_entry_text(Ewl_Widget * w, void *ev_data, void *user_data)
{
- ewl_entry_set_text(entry[0], "Play with me ?");
- ewl_entry_set_text(entry[1], "E W L ! ! !");
+ ewl_entry_set_text(EWL_ENTRY(entry[0]), "Play with me ?");
+ ewl_entry_set_text(EWL_ENTRY(entry[1]), "E W L ! ! !");
return;
w = NULL;
@@ -64,8 +64,8 @@
entry_button = w;
entry_win = ewl_window_new();
- ewl_window_resize(entry_win, 371, 96);
- ewl_window_set_min_size(entry_win, 371, 96);
+ ewl_window_resize(EWL_WINDOW(entry_win), 371, 96);
+ ewl_window_set_min_size(EWL_WINDOW(entry_win), 371, 96);
ewl_callback_append(entry_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_entry_test_window, NULL);
ewl_widget_show(entry_win);
@@ -78,14 +78,12 @@
ewl_box_set_spacing(EWL_BOX(entry_box), 10);
ewl_widget_show(entry_box);
- entry[0] = ewl_entry_new();
- ewl_entry_set_text(entry[0], "Play with me ?");
+ entry[0] = ewl_entry_new("Play with me ?");
ewl_object_set_padding(EWL_OBJECT(entry[0]), 5, 5, 5, 0);
ewl_container_append_child(EWL_CONTAINER(entry_box), entry[0]);
ewl_widget_show(entry[0]);
- entry[1] = ewl_entry_new();
- ewl_entry_set_text(entry[1], "E W L ! ! !");
+ entry[1] = ewl_entry_new("E W L ! ! !");
ewl_object_set_padding(EWL_OBJECT(entry[1]), 5, 5, 0, 0);
ewl_container_append_child(EWL_CONTAINER(entry_box), entry[1]);
ewl_widget_show(entry[1]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_filedialog_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_filedialog_test.c 17 Apr 2002 22:29:59 -0000 1.1
+++ ewl_filedialog_test.c 14 Aug 2002 02:05:37 -0000 1.2
@@ -36,8 +36,8 @@
fd_win = ewl_window_new();
- ewl_window_resize(fd_win, 400, 300);
- ewl_window_set_min_size(fd_win, 145, 230);
+ ewl_window_resize(EWL_WINDOW(fd_win), 400, 300);
+ ewl_window_set_min_size(EWL_WINDOW(fd_win), 145, 230);
ewl_callback_append(fd_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_filedialog_test_window, NULL);
ewl_widget_show(fd_win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_fileselector_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_fileselector_test.c 16 Apr 2002 18:54:32 -0000 1.1
+++ ewl_fileselector_test.c 14 Aug 2002 02:05:37 -0000 1.2
@@ -35,8 +35,8 @@
fs_win = ewl_window_new();
- ewl_window_resize(fs_win, 400, 300);
- ewl_window_set_min_size(fs_win, 145, 230);
+ ewl_window_resize(EWL_WINDOW(fs_win), 400, 300);
+ ewl_window_set_min_size(EWL_WINDOW(fs_win), 145, 230);
ewl_callback_append(fs_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_fileselector_test_window, NULL);
ewl_widget_show(fs_win);
@@ -58,4 +58,9 @@
__file_clicked(Ewl_Widget * w, void *ev_data, void *user_data)
{
printf("file clicked");
+
+ return;
+ w = NULL;
+ ev_data = NULL;
+ user_data = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_floater_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_floater_test.c 16 Apr 2002 18:25:00 -0000 1.2
+++ ewl_floater_test.c 14 Aug 2002 02:05:37 -0000 1.3
@@ -23,6 +23,7 @@
{
Ewl_Widget *floater;
Ewl_Widget *floater_win;
+ Ewl_Widget *floater_box;
Ewl_Widget *separator;
Ewl_Widget *button[2];
Ewl_Widget *check_button[2];
@@ -33,27 +34,31 @@
floater_button = w;
floater_win = ewl_window_new();
- ewl_window_resize(floater_win, 145, 230);
- ewl_window_set_min_size(floater_win, 145, 230);
- ewl_box_set_spacing(EWL_BOX(floater_win), 10);
+ ewl_window_resize(EWL_WINDOW(floater_win), 145, 230);
+ ewl_window_set_min_size(EWL_WINDOW(floater_win), 145, 230);
ewl_callback_append(floater_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_floater_test_window, NULL);
ewl_widget_show(floater_win);
+ floater_box = ewl_vbox_new();
+ ewl_container_append_child(EWL_CONTAINER(floater_win), floater_box);
+ ewl_widget_show(floater_box);
+
radio_button[0] = ewl_radiobutton_new("With Label");
- ewl_container_append_child(EWL_CONTAINER(floater_win), radio_button[0]);
+ ewl_container_append_child(EWL_CONTAINER(floater_box), radio_button[0]);
ewl_object_set_alignment(EWL_OBJECT(radio_button[0]),
EWL_ALIGNMENT_LEFT);
ewl_widget_show(radio_button[0]);
radio_button[1] = ewl_radiobutton_new(NULL);
ewl_radiobutton_set_chain(radio_button[1], radio_button[0]);
- ewl_container_append_child(EWL_CONTAINER(floater_win), radio_button[1]);
+ ewl_container_append_child(EWL_CONTAINER(floater_box), radio_button[1]);
ewl_object_set_alignment(EWL_OBJECT(radio_button[1]),
EWL_ALIGNMENT_LEFT);
ewl_widget_show(radio_button[1]);
floater = ewl_floater_new(radio_button[1]);
+ ewl_container_append_child(EWL_CONTAINER(floater_box), floater);
ewl_floater_set_position(EWL_FLOATER(floater), 20, 20);
ewl_widget_show(floater);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_image_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_image_test.c 16 Apr 2002 18:25:00 -0000 1.8
+++ ewl_image_test.c 14 Aug 2002 02:05:37 -0000 1.9
@@ -63,8 +63,8 @@
else
hh += 100;
- ewl_window_resize(image_win, ww, hh);
- ewl_window_set_min_size(image_win, ww, hh);
+ ewl_window_resize(EWL_WINDOW(image_win), ww, hh);
+ ewl_window_set_min_size(EWL_WINDOW(image_win), ww, hh);
}
void
@@ -78,7 +78,7 @@
if (!img)
img = ewd_dlist_goto_last(images);
- ewl_entry_set_text(entry_path, img);
+ ewl_entry_set_text(EWL_ENTRY(entry_path), img);
ewl_image_set_file(EWL_IMAGE(image), img);
ewl_widget_configure(image_win);
@@ -96,7 +96,7 @@
{
char *img = NULL;
- img = ewl_entry_get_text(entry_path);
+ img = ewl_entry_get_text(EWL_ENTRY(entry_path));
if (img && __image_exists(img)) {
ewd_dlist_append(images, img);
@@ -127,7 +127,7 @@
if (!img)
img = ewd_dlist_goto_first(images);
- ewl_entry_set_text(entry_path, img);
+ ewl_entry_set_text(EWL_ENTRY(entry_path), img);
ewl_image_set_file(EWL_IMAGE(image), img);
ewl_widget_configure(image_win);
@@ -155,8 +155,8 @@
images = ewd_dlist_new();
image_win = ewl_window_new();
- ewl_window_resize(image_win, 390, 297);
- ewl_window_set_min_size(image_win, 390, 297);
+ ewl_window_resize(EWL_WINDOW(image_win), 390, 297);
+ ewl_window_set_min_size(EWL_WINDOW(image_win), 390, 297);
ewl_callback_append(image_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_image_test_window, NULL);
ewl_widget_show(image_win);
@@ -189,9 +189,7 @@
if (image_file)
ewd_dlist_append(images, image_file);
- entry_path = ewl_entry_new();
- if (image_file)
- ewl_entry_set_text(entry_path, image_file);
+ entry_path = ewl_entry_new(image_file);
ewl_container_append_child(EWL_CONTAINER(image_box), entry_path);
ewl_widget_show(entry_path);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_imenu_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_imenu_test.c 25 May 2002 05:46:42 -0000 1.3
+++ ewl_imenu_test.c 14 Aug 2002 02:05:37 -0000 1.4
@@ -49,7 +49,7 @@
imenu_button = w;
imenu_win = ewl_window_new();
- ewl_window_resize(imenu_win, 300, 300);
+ ewl_window_resize(EWL_WINDOW(imenu_win), 300, 300);
ewl_callback_append(imenu_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_imenu_test_window, NULL);
ewl_widget_show(imenu_win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_menu_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu_test.c 25 May 2002 15:39:32 -0000 1.2
+++ ewl_menu_test.c 14 Aug 2002 02:05:37 -0000 1.3
@@ -49,7 +49,7 @@
menu_button = w;
menu_win = ewl_window_new();
- ewl_window_resize(menu_win, 300, 300);
+ ewl_window_resize(EWL_WINDOW(menu_win), 300, 300);
ewl_callback_append(menu_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_menu_test_window, NULL);
ewl_widget_show(menu_win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_notebook_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_notebook_test.c 16 Apr 2002 18:25:00 -0000 1.9
+++ ewl_notebook_test.c 14 Aug 2002 02:05:37 -0000 1.10
@@ -83,8 +83,7 @@
n = NEW(Ewl_Widget, 2);
- tab = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(tab), "Main");
+ tab = ewl_text_new("Main");
ewl_text_set_font_size(EWL_TEXT(tab), 8);
ewl_widget_show(tab);
@@ -92,8 +91,7 @@
ewl_box_set_spacing(EWL_BOX(main_vbox), 10);
ewl_widget_show(main_vbox);
- text = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text), "Main");
+ text = ewl_text_new("Main");
ewl_object_set_alignment(EWL_OBJECT(text), EWL_ALIGNMENT_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), text);
ewl_widget_show(text);
@@ -104,8 +102,7 @@
ewl_container_append_child(EWL_CONTAINER(main_vbox), avbox);
ewl_widget_show(avbox);
- alabel = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(alabel), "Tabs Alignment");
+ alabel = ewl_text_new("Tabs Alignment");
ewl_container_append_child(EWL_CONTAINER(avbox), alabel);
ewl_widget_show(alabel);
@@ -150,8 +147,7 @@
ewl_container_append_child(EWL_CONTAINER(main_vbox), pvbox);
ewl_widget_show(pvbox);
- plabel = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(plabel), "Tabs Position");
+ plabel = ewl_text_new("Tabs Position");
ewl_container_append_child(EWL_CONTAINER(pvbox), plabel);
ewl_widget_show(plabel);
@@ -204,8 +200,7 @@
n = NEW(Ewl_Widget, 2);
- tab = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(tab), label);
+ tab = ewl_text_new(label);
ewl_text_set_font_size(EWL_TEXT(tab), 8);
ewl_widget_show(tab);
@@ -213,8 +208,7 @@
ewl_box_set_spacing(EWL_BOX(main_vbox), 10);
ewl_widget_show(main_vbox);
- text = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text), label);
+ text = ewl_text_new(label);
ewl_object_set_alignment(EWL_OBJECT(text), EWL_ALIGNMENT_CENTER);
ewl_container_append_child(EWL_CONTAINER(main_vbox), text);
ewl_widget_show(text);
@@ -318,8 +312,8 @@
notebook_button = w;
notebook_win = ewl_window_new();
- ewl_window_resize(notebook_win, 305, 256);
- ewl_window_set_min_size(notebook_win, 305, 256);
+ ewl_window_resize(EWL_WINDOW(notebook_win), 305, 256);
+ ewl_window_set_min_size(EWL_WINDOW(notebook_win), 305, 256);
ewl_callback_append(notebook_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_notebook_test_window, NULL);
ewl_widget_show(notebook_win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_selectionbar_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_selectionbar_test.c 17 Apr 2002 22:29:59 -0000 1.1
+++ ewl_selectionbar_test.c 14 Aug 2002 02:05:37 -0000 1.2
@@ -38,8 +38,8 @@
sbar_win = ewl_window_new();
- ewl_window_resize(sbar_win, 400, 300);
- ewl_window_set_min_size(sbar_win, 145, 230);
+ ewl_window_resize(EWL_WINDOW(sbar_win), 400, 300);
+ ewl_window_set_min_size(EWL_WINDOW(sbar_win), 145, 230);
ewl_callback_append(sbar_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_selectionbar_test_window, NULL);
ewl_widget_show(sbar_win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_selectionbook_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_selectionbook_test.c 16 Apr 2002 18:54:32 -0000 1.1
+++ ewl_selectionbook_test.c 14 Aug 2002 02:05:37 -0000 1.2
@@ -39,8 +39,8 @@
sbook_win = ewl_window_new();
- ewl_window_resize(sbook_win, 400, 300);
- ewl_window_set_min_size(sbook_win, 145, 230);
+ ewl_window_resize(EWL_WINDOW(sbook_win), 400, 300);
+ ewl_window_set_min_size(EWL_WINDOW(sbook_win), 145, 230);
ewl_callback_append(sbook_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_selectionbook_test_window, NULL);
ewl_widget_show(sbook_win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_spinner_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_spinner_test.c 16 Apr 2002 18:25:00 -0000 1.8
+++ ewl_spinner_test.c 14 Aug 2002 02:05:37 -0000 1.9
@@ -39,8 +39,8 @@
ewl_callback_del(tmp_win, EWL_CALLBACK_CONFIGURE,
__spinner_main_window_configure);
- ewl_window_move(tmp_win, xx, yy);
- ewl_window_resize(tmp_win, ww, hh);
+ ewl_window_move(EWL_WINDOW(tmp_win), xx, yy);
+ ewl_window_resize(EWL_WINDOW(tmp_win), ww, hh);
ewl_callback_append(tmp_win, EWL_CALLBACK_CONFIGURE,
__spinner_main_window_configure, NULL);
@@ -102,7 +102,7 @@
spinner_win = ewl_window_new();
ewl_box_set_spacing(EWL_BOX(spinner_win), 10);
- ewl_window_set_min_size(spinner_win, 151, 316);
+ ewl_window_set_min_size(EWL_WINDOW(spinner_win), 151, 316);
ewl_callback_append(spinner_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_spinner_test_window, NULL);
ewl_widget_show(spinner_win);
@@ -119,14 +119,13 @@
ewl_callback_append(tmp_win, EWL_CALLBACK_CONFIGURE,
__spinner_main_window_configure, NULL);
ewl_widget_show(tmp_win);
- ewl_window_set_borderless(tmp_win);
+ ewl_window_set_borderless(EWL_WINDOW(tmp_win));
ewl_object_get_current_geometry(EWL_OBJECT(tmp_win), &xx, &yy, &ww,
&hh);
ewl_object_get_minimum_size(EWL_OBJECT(tmp_win), &mw, &mh);
- text[0] = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text[0]), "X");
+ text[0] = ewl_text_new("X");
ewl_container_append_child(EWL_CONTAINER(spinner_box), text[0]);
ewl_widget_show(text[0]);
@@ -145,8 +144,7 @@
ewl_container_append_child(EWL_CONTAINER(spinner_box), separator[0]);
ewl_widget_show(separator[0]);
- text[1] = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text[1]), "Y");
+ text[1] = ewl_text_new("Y");
ewl_container_append_child(EWL_CONTAINER(spinner_box), text[1]);
ewl_widget_show(text[1]);
@@ -165,8 +163,7 @@
ewl_container_append_child(EWL_CONTAINER(spinner_box), separator[1]);
ewl_widget_show(separator[1]);
- text[2] = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text[2]), "W");
+ text[2] = ewl_text_new("W");
ewl_container_append_child(EWL_CONTAINER(spinner_box), text[2]);
ewl_widget_show(text[2]);
@@ -185,8 +182,7 @@
ewl_container_append_child(EWL_CONTAINER(spinner_box), separator[2]);
ewl_widget_show(separator[2]);
- text[3] = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text[3]), "H");
+ text[3] = ewl_text_new("H");
ewl_container_append_child(EWL_CONTAINER(spinner_box), text[3]);
ewl_widget_show(text[3]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_table_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_table_test.c 16 Apr 2002 18:25:00 -0000 1.12
+++ ewl_table_test.c 14 Aug 2002 02:05:37 -0000 1.13
@@ -36,7 +36,7 @@
table_button = w;
table_win = ewl_window_new();
- ewl_window_resize(table_win, 300, 300);
+ ewl_window_resize(EWL_WINDOW(table_win), 300, 300);
ewl_callback_append(table_win, EWL_CALLBACK_DELETE_WINDOW,
__destroy_table_test_window, NULL);
ewl_widget_show(table_win);
@@ -63,7 +63,7 @@
button[0] = ewl_button_new("FIRST");
- ewl_table_add(EWL_TABLE(table), button[0], 3, 4, 2, 3);
+ /* ewl_table_add(EWL_TABLE(table), button[0], 3, 4, 2, 3); */
ewl_widget_show(button[0]);
/*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_test.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_test.c 25 May 2002 05:46:42 -0000 1.36
+++ ewl_test.c 14 Aug 2002 02:05:37 -0000 1.37
@@ -59,6 +59,10 @@
void
__close_main_window(Ewl_Widget * w, void *ev_data, void *user_data)
{
+ int x, y, width, height;
+
+ ewl_window_get_geometry(EWL_WINDOW(w), &x, &y, &width, &height);
+
ewl_widget_destroy(w);
ewl_main_quit();
@@ -82,12 +86,12 @@
ewl_init(argc, argv);
main_win = ewl_window_new();
- ewl_window_set_title(main_win,
+ ewl_window_set_title(EWL_WINDOW(main_win),
"The Enlightenment Widget Library Developer Test Program");
ewl_callback_append(main_win, EWL_CALLBACK_DELETE_WINDOW,
__close_main_window, NULL);
- ewl_window_resize(main_win, 237, 450);
- ewl_window_set_min_size(main_win, 237, 390);
+ ewl_window_resize(EWL_WINDOW(main_win), 237, 450);
+ ewl_window_set_auto_size(EWL_WINDOW(main_win), TRUE);
ewl_widget_show(main_win);
i = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_text_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_text_test.c 16 Apr 2002 18:25:00 -0000 1.11
+++ ewl_text_test.c 14 Aug 2002 02:05:37 -0000 1.12
@@ -43,9 +43,7 @@
ewl_container_append_child(EWL_CONTAINER(text_win), text_box);
ewl_widget_show(text_box);
- text = ewl_text_new();
- ewl_text_set_text(EWL_TEXT(text),
- "Enlightenment Widget Library\n"
+ text = ewl_text_new("Enlightenment Widget Library\n"
"\n"
"Bla bla bla bla bla bla bla bla bla\n"
"Bla bla bla bla bla bla bla bla bla\n"
|
|
From: <enl...@li...> - 2002-08-15 00:33:13
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
Ewl.h Makefile.am ewl_box.c ewl_grid.c ewl_image.c ewl_menu.c
ewl_separator.c
Added Files:
ewl_spacer.c ewl_spacer.h
Removed Files:
getopt.c getopt.h getopt1.c
Log Message:
Added a spacer widget for tweaking layout, removed unnecessary getopt code,
minor update for improved padding awareness in box code, and switched the
separators so their orientations are correct with respect to their names.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Ewl.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- Ewl.h 25 May 2002 05:46:39 -0000 1.22
+++ Ewl.h 15 Aug 2002 00:33:12 -0000 1.23
@@ -56,6 +56,7 @@
#include <ewl_seeker.h>
#include <ewl_scrollbar.h>
+#include <ewl_spacer.h>
#include <ewl_spinner.h>
#include <ewl_list.h>
#include <ewl_image.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- Makefile.am 14 Aug 2002 02:05:35 -0000 1.28
+++ Makefile.am 15 Aug 2002 00:33:12 -0000 1.29
@@ -42,6 +42,7 @@
ewl_selectionbar.h \
ewl_selectionbook.h \
ewl_separator.h \
+ ewl_spacer.h \
ewl_spinner.h \
ewl_text.h \
ewl_textarea.h \
@@ -81,6 +82,7 @@
ewl_selectionbar.c \
ewl_selectionbook.c \
ewl_separator.c \
+ ewl_spacer.c \
ewl_spinner.c \
ewl_table.c \
ewl_text.c \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_box.c 14 Aug 2002 02:05:35 -0000 1.39
+++ ewl_box.c 15 Aug 2002 00:33:12 -0000 1.40
@@ -493,26 +493,33 @@
* orientation. The first one is the simplest as it it a
* direct use of the current coordinates.
*/
- if (ewl_object_get_alignment(c) & info->a1_align)
+ if (ewl_object_get_alignment(c) & info->a1_align) {
+ *align += info->align_pad1(c);
ewl_object_request_position(c, *x, *y);
+ *align -= info->align_pad1(c);
+ }
/*
* The second one is aligned against the furthest edge, so
* there is some calculation to be made.
*/
else if (ewl_object_get_alignment(c) & info->a3_align) {
- *align += *align_size - info->align_ask(c);
+ *align += *align_size -
+ (info->align_ask(c) + info->align_pad2(c));
ewl_object_request_position(c, *x, *y);
- *align -= *align_size - info->align_ask(c);
+ *align -= *align_size -
+ (info->align_ask(c) + info->align_pad2(c));
}
/*
* The final one is for centering the child.
*/
else {
- *align += (*align_size - info->align_ask(c)) / 2;
+ *align += (*align_size + info->align_pad1(c) +
+ info->align_pad2(c) - info->align_ask(c)) / 2;
ewl_object_request_position(c, *x, *y);
- *align -= (*align_size - info->align_ask(c)) / 2;
+ *align -= (*align_size + info->align_pad1(c) +
+ info->align_pad2(c) - info->align_ask(c)) / 2;
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -524,6 +531,7 @@
void __ewl_box_add(Ewl_Container * c, Ewl_Widget * w)
{
int max_size = 0;
+ int temp;
Box_Orientation *info;
DCHECK_PARAM_PTR("c", c);
@@ -532,29 +540,38 @@
/*
* Base the info used on the orientation of the box.
*/
- if (EWL_BOX(c)->orientation == EWL_ORIENTATION_HORIZONTAL)
+ if (EWL_BOX(c)->orientation == EWL_ORIENTATION_HORIZONTAL) {
info = horizontal;
- else
+ }
+ else {
info = vertical;
+ }
/*
* If there already is a max widget, compare size to that one.
*/
if (EWL_BOX(c)->max_align)
max_size =
- info->pref_align_ask(EWL_OBJECT(EWL_BOX(c)->max_align));
+ info->pref_align_ask(EWL_OBJECT(EWL_BOX(c)->max_align)) +
+ info->align_pad1(EWL_OBJECT(EWL_BOX(c)->max_align)) +
+ info->align_pad2(EWL_OBJECT(EWL_BOX(c)->max_align));
else
- max_size = info->pref_align_ask(EWL_OBJECT(w));
+ max_size = info->pref_align_ask(EWL_OBJECT(w)) +
+ info->align_pad1(EWL_OBJECT(w)) +
+ info->align_pad2(EWL_OBJECT(w));
+
+ temp = info->pref_align_ask(EWL_OBJECT(w)) +
+ info->align_pad1(EWL_OBJECT(w)) +
+ info->align_pad2(EWL_OBJECT(w));
/*
* Use a <= here so we don't need as many cases in the previous if
* statement. If this widget is the largest so far, mark it as the
* largest in the box.
*/
- if (max_size <= info->pref_align_ask(EWL_OBJECT(w))) {
+ if (max_size <= temp) {
EWL_BOX(c)->max_align = w;
- info->pref_align_set(EWL_OBJECT(c),
- info->pref_align_ask(EWL_OBJECT(w)));
+ info->pref_align_set(EWL_OBJECT(c), temp);
}
/*
@@ -562,8 +579,7 @@
* any other widgets in the box.
*/
info->pref_fill_set(EWL_OBJECT(c),
- info->pref_fill_ask(EWL_OBJECT(c)) +
- info->pref_fill_ask(EWL_OBJECT(w)) +
+ info->pref_fill_ask(EWL_OBJECT(c)) + temp +
(ewd_list_nodes(c->children) > 1 ?
EWL_BOX(c)->spacing : 0));
}
@@ -628,7 +644,9 @@
*/
info->pref_align_set(EWL_OBJECT(c),
info->pref_align_ask(EWL_OBJECT(c)) +
- (size - align_insets));
+ (size - align_insets) +
+ info->align_pad1(EWL_OBJECT(c)) +
+ info->align_pad2(EWL_OBJECT(c)));
}
/*
@@ -640,14 +658,19 @@
ewd_list_goto_first(c->children);
while ((child = ewd_list_next(c->children))) {
+ int temp;
+
+ temp = info->pref_align_ask(child) +
+ info->align_pad1(child) +
+ info->align_pad2(child);
/*
* Found a larger widget than the previous largest, so
* store it size as the new max size.
*/
- if (info->pref_align_ask(child) > max_size) {
+ if (temp > max_size) {
EWL_BOX(c)->max_align = EWL_WIDGET(child);
- max_size = info->pref_align_ask(child);
+ max_size = temp;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_grid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_grid.c 14 Aug 2002 02:05:36 -0000 1.4
+++ ewl_grid.c 15 Aug 2002 00:33:12 -0000 1.5
@@ -9,6 +9,7 @@
void __ewl_grid_auto_resize(Ewl_Container * p, Ewl_Widget * child,
int size, Ewl_Orientation o);
+
/**
* ewl_grid_new - create a new grid
* @cols: number of columns
@@ -33,7 +34,6 @@
DRETURN_PTR(EWL_WIDGET(g), DLEVEL_STABLE);
}
-
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_image.c 19 Jul 2002 21:32:56 -0000 1.17
+++ ewl_image.c 15 Aug 2002 00:33:12 -0000 1.18
@@ -36,11 +36,10 @@
ZERO(image, Ewl_Image, 1);
ewl_image_init(image);
- /*
- * Determine the type of image to be loaded.
- */
- image->type = __ewl_image_get_type(i);
- image->path = strdup(i);
+ if (!image->image) {
+ ewl_widget_destroy(EWL_WIDGET(image));
+ image = NULL;
+ }
DRETURN_PTR(EWL_WIDGET(image), DLEVEL_STABLE);
}
@@ -53,7 +52,7 @@
* Returns no value. Set the image displayed by @i to the one found at the
* path @im.
*/
-void ewl_image_set_file(Ewl_Image * i, const char *im)
+int ewl_image_set_file(Ewl_Image * i, const char *im)
{
int old_type;
Ewl_Widget *w;
@@ -138,6 +137,12 @@
NULL);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, __ewl_image_mouse_move,
NULL);
+
+ /*
+ * Determine the type of image to be loaded.
+ */
+ image->type = __ewl_image_get_type(i);
+ image->path = strdup(i);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_menu.c 14 Aug 2002 02:05:36 -0000 1.4
+++ ewl_menu.c 15 Aug 2002 00:33:12 -0000 1.5
@@ -61,6 +61,7 @@
* Initialize the defaults of the inherited fields.
*/
ewl_menu_base_init(EWL_MENU_BASE(menu), image, title);
+ ewl_widget_set_appearance(EWL_WIDGET(menu), "/menu/default");
/*
* The realize needs to create the pop-up.
@@ -109,6 +110,6 @@
MINIMUM_H(menu->popup));
}
+ ewl_widget_realize(EWL_WIDGET(menu->popup));
ewl_window_move(EWL_WINDOW(menu->popup), x, y);
- printf("Moving popup to %d, %d\n", x, y);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_separator.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_separator.c 14 Aug 2002 02:05:36 -0000 1.16
+++ ewl_separator.c 15 Aug 2002 00:33:12 -0000 1.17
@@ -70,6 +70,7 @@
ebits_get_max_size(w->ebits_object, &ww, &hh);
+ /* ewl_object_set_preferred_size(EWL_OBJECT(w), ww, hh); */
ewl_object_set_maximum_size(EWL_OBJECT(w), ww, hh);
}
|
|
From: <enl...@li...> - 2002-08-15 00:33:43
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: ChangeLog Log Message: Added a spacer widget for tweaking layout, removed unnecessary getopt code, minor update for improved padding awareness in box code, and switched the separators so their orientations are correct with respect to their names. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- ChangeLog 14 Aug 2002 02:05:35 -0000 1.48 +++ ChangeLog 15 Aug 2002 00:33:12 -0000 1.49 @@ -1,4 +1,11 @@ -Thu Aug 12 19:39:57 2002 Nathan Ingersoll <ningerso@d.umn.edu> +Wed Aug 14 19:39:57 2002 Nathan Ingersoll <ningerso@d.umn.edu> + * Added a spacer widget for tweaking layout + * Updated box layout to take padding into consideration + * Removed getopt files, no need to duplicate such heavyweight files + for functionality we don't use. + * Fixed previous changelog entry to have the correct day of the week. + +Mon Aug 12 19:39:57 2002 Nathan Ingersoll <ningerso@d.umn.edu> * Shortened theme keys, this will eventually be replaced with keys based on inheritance mapping type strings. * Updated API documentation comments. |
|
From: <enl...@li...> - 2002-08-15 00:43:10
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_image.c
Log Message:
Note to self: compile BEFORE commit :(
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_image.c 15 Aug 2002 00:33:12 -0000 1.18
+++ ewl_image.c 15 Aug 2002 00:43:10 -0000 1.19
@@ -36,6 +36,12 @@
ZERO(image, Ewl_Image, 1);
ewl_image_init(image);
+ /*
+ * Determine the type of image to be loaded.
+ */
+ image->type = __ewl_image_get_type(i);
+ image->path = strdup(i);
+
if (!image->image) {
ewl_widget_destroy(EWL_WIDGET(image));
image = NULL;
@@ -52,7 +58,7 @@
* Returns no value. Set the image displayed by @i to the one found at the
* path @im.
*/
-int ewl_image_set_file(Ewl_Image * i, const char *im)
+void ewl_image_set_file(Ewl_Image * i, const char *im)
{
int old_type;
Ewl_Widget *w;
@@ -137,12 +143,6 @@
NULL);
ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, __ewl_image_mouse_move,
NULL);
-
- /*
- * Determine the type of image to be loaded.
- */
- image->type = __ewl_image_get_type(i);
- image->path = strdup(i);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
|
|
From: <enl...@li...> - 2002-08-19 15:35:39
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_image.c ewl_image.h ewl_scrollpane.c ewl_selectionbook.c
Log Message:
A few minor fixes, as well as filling out the Image widget API a bit more.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_image.c 15 Aug 2002 00:43:10 -0000 1.19
+++ ewl_image.c 19 Aug 2002 15:35:38 -0000 1.20
@@ -42,11 +42,6 @@
image->type = __ewl_image_get_type(i);
image->path = strdup(i);
- if (!image->image) {
- ewl_widget_destroy(EWL_WIDGET(image));
- image = NULL;
- }
-
DRETURN_PTR(EWL_WIDGET(image), DLEVEL_STABLE);
}
@@ -105,7 +100,7 @@
}
/*
- * Now draw the new
+ * Now draw the new image
*/
__ewl_image_realize(w, NULL, NULL);
}
@@ -114,6 +109,101 @@
}
/**
+ * ewl_image_set_proportional - set boolean to determine how to scale
+ * @i: the image to change proportional setting
+ * @p: the boolean indicator of proportionality
+ *
+ * Returns no value. Changes the flag indicating if the image is scaled
+ * proportionally.
+ */
+void
+ewl_image_set_proportional(Ewl_Image *i, char p)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ DCHECK_PARAM_PTR("i", i);
+
+ i->proportional = p;
+ ewl_widget_configure(EWL_WIDGET(i));
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * ewl_image_scale - scale image dimensions by a percentage
+ * @i: the image to scale
+ * @wp: the percentage to scale width
+ * @hp: the percentage to scale height
+ *
+ * Returns no value. Scales the given image to @wp percent of preferred width
+ * by @hp percent of preferred height. If @i->proportional is set to TRUE, the
+ * lesser of @wp and @hp is applied for both directions.
+ */
+void
+ewl_image_scale(Ewl_Image *i, double wp, double hp)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("i", i);
+
+ if (i->proportional) {
+ if (wp < hp)
+ hp = wp;
+ else
+ wp = hp;
+ }
+
+ i->sw = wp;
+ i->sh = hp;
+
+ ewl_object_set_preferred_w(EWL_OBJECT(i), wp * i->ow);
+ ewl_object_set_preferred_h(EWL_OBJECT(i), hp * i->oh);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * ewl_image_scale_to - scale image dimensions to a specific size
+ * @i: the image to scale
+ * @w: the size to scale width
+ * @h: the size to scale height
+ *
+ * Returns no value. Scales the given image to @w by @hp. If @i->proportional
+ * is set to TRUE, the image is scaled proportional to the lesser scale
+ * percentage of preferred size.
+ */
+void
+ewl_image_scale_to(Ewl_Image *i, int w, int h)
+{
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("i", i);
+
+ /*
+ * Scale the image to be proportional inside the available space.
+ */
+ if (i->ow && i->oh && i->proportional) {
+ double wp, hp;
+
+ wp = (double)w / (double)i->ow;
+ hp = (double)h / (double)i->oh;
+
+ if (wp < hp)
+ hp = wp;
+ else
+ wp = hp;
+
+ w = wp * i->ow;
+ h = hp * i->oh;
+ }
+
+ i->sw = 1.0;
+ i->sh = 1.0;
+ ewl_object_set_preferred_size(EWL_OBJECT(i), w, h);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
* ewl_image_init - initialize an image widget to default values and callbacks
* @i: the image widget to initialize
*
@@ -144,6 +234,9 @@
ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, __ewl_image_mouse_move,
NULL);
+ i->sw = 1.0;
+ i->sh = 1.0;
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -151,7 +244,6 @@
{
Ewl_Image *i;
Ewl_Window *win;
- int ww = 0, hh = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -168,45 +260,87 @@
*/
if (i->type == EWL_IMAGE_TYPE_EBITS) {
i->image = ebits_load(i->path);
+ if (!i->image)
+ return;
+
ebits_add_to_evas(i->image, win->evas);
ebits_set_layer(i->image, LAYER(w));
ebits_set_clip(i->image, w->fx_clip_box);
+ ebits_get_min_size(i->image, &i->ow, &i->oh);
ebits_show(i->image);
+
} else {
i->image = evas_add_image_from_file(win->evas, i->path);
+ if (!i->image)
+ return;
+
evas_set_layer(win->evas, i->image, LAYER(w));
evas_set_clip(win->evas, i->image, w->fx_clip_box);
- evas_get_image_size(win->evas, i->image, &ww, &hh);
+ evas_get_image_size(win->evas, i->image, &i->ow, &i->oh);
evas_show(win->evas, i->image);
}
- ewl_object_set_preferred_size(EWL_OBJECT(w), ww, hh);
+ if (!i->ow)
+ i->ow = 256;
+ if (!i->oh)
+ i->oh = 256;
+
+ if (ewl_object_get_preferred_w(EWL_OBJECT(i)))
+ ewl_image_scale_to(i, ewl_object_get_preferred_w(EWL_OBJECT(i)),
+ ewl_object_get_preferred_h(EWL_OBJECT(i)));
+ else
+ ewl_image_scale(i, i->sw, i->sh);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+void __ewl_image_reparent(Ewl_Widget * w, void *ev_data, void *user_data)
+{
+ Ewl_Image *i;
+ Ewl_Window *win;
+
+ i = EWL_IMAGE(w);
+ if (!i->image)
+ return;
+
+ win = ewl_window_find_window_by_widget(w);
+
+ if (i->type == EWL_IMAGE_TYPE_EBITS)
+ ebits_set_layer(i->image, LAYER(w));
+ else
+ evas_set_layer(win->evas, i->image, LAYER(w));
+}
+
void __ewl_image_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
Ewl_Image *i;
Ewl_Window *win;
+ int ww, hh;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
i = EWL_IMAGE(w);
+ if (!i->image)
+ return;
+
win = ewl_window_find_window_by_widget(w);
+ ww = CURRENT_W(w) - (INSET_LEFT(w) + INSET_RIGHT(w));
+ hh = CURRENT_H(w) - (INSET_TOP(w) + INSET_BOTTOM(w));
+
/*
* Move the image into place based on type.
*/
if (i->type == EWL_IMAGE_TYPE_EBITS) {
- ebits_move(i->image, CURRENT_X(w), CURRENT_Y(w));
- ebits_resize(i->image, CURRENT_W(w), CURRENT_H(w));
+ ebits_move(i->image, CURRENT_X(w) + INSET_LEFT(w),
+ CURRENT_Y(w) + INSET_TOP(w));
+ ebits_resize(i->image, i->sw * ww, i->sh * hh);
} else {
evas_move(win->evas, i->image, CURRENT_X(w), CURRENT_Y(w));
- evas_resize(win->evas, i->image, CURRENT_W(w), CURRENT_H(w));
- evas_set_image_fill(win->evas, i->image, CURRENT_X(w),
- CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w));
+ evas_resize(win->evas, i->image, ww, hh);
+ evas_set_image_fill(win->evas, i->image, 0, 0, i->sw * ww,
+ i->sh * hh);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_image.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_image.h 25 May 2002 05:46:40 -0000 1.11
+++ ewl_image.h 19 Aug 2002 15:35:38 -0000 1.12
@@ -18,10 +18,16 @@
Ewl_Image_Type type;
void *image;
char *path;
+ char proportional;
+ int ow, oh;
+ double sw, sh;
};
Ewl_Widget *ewl_image_load(const char *i);
void ewl_image_init(Ewl_Image * i);
void ewl_image_set_file(Ewl_Image * i, const char *im);
+void ewl_image_set_proportional(Ewl_Image * i, char p);
+void ewl_image_scale(Ewl_Image *i, double wp, double hp);
+void ewl_image_scale_to(Ewl_Image *i, int w, int h);
#endif /* __EWL_IMAGE_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_scrollpane.c 14 Aug 2002 02:05:36 -0000 1.6
+++ ewl_scrollpane.c 19 Aug 2002 15:35:38 -0000 1.7
@@ -196,10 +196,10 @@
*/
void __ewl_scrollpane_configure(Ewl_Widget * w, void *ev_data, void *user_data)
{
+ int b_width, b_height;
+ Ewl_ScrollPane *s;
int vs_width = 0;
int hs_height = 0;
- int b_width, b_height;
- Ewl_ScrollPane *s;
int content_w, content_h;
/* Ewl_ScrollBar_Flags hf, vf; */
@@ -238,20 +238,17 @@
content_h);
/*
- * Base the sizing on the preferred size of the box.
- */
- ewl_object_get_preferred_size(EWL_OBJECT(s->box), &b_width, &b_height);
-
- /*
* Update the fill percentage on the scrollbars based on available space
* for the content.
*/
+ b_width = ewl_object_get_preferred_w(EWL_OBJECT(s->box));
+ b_height = ewl_object_get_preferred_h(EWL_OBJECT(s->box));
ewl_scrollbar_set_fill_percentage(EWL_SCROLLBAR(s->hscrollbar),
(double) content_w /
(double) b_width);
ewl_scrollbar_set_fill_percentage(EWL_SCROLLBAR(s->vscrollbar),
(double) content_h /
- (double) b_height);
+ (double) b_width);
/*
* Now move the box into position. For the scrollpane to work we move
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_selectionbook.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_selectionbook.c 14 Aug 2002 02:05:36 -0000 1.5
+++ ewl_selectionbook.c 19 Aug 2002 15:35:38 -0000 1.6
@@ -132,7 +132,7 @@
void ewl_selectionbook_rem_page(Ewl_Selectionbook * s, int num, int destroy)
{
- Ewl_SbookPage *p;;
+ Ewl_SbookPage *p;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("s", s);
|
|
From: <enl...@li...> - 2002-11-07 01:54:35
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/default/appearance
Added Files:
Tag: SPLIT
button.bits.db check.bits.db cursor.bits.db entry.bits.db
list-selection.bits.db list.bits.db menu.bits.db
menu_bar-submenu.bits.db menu_bar.bits.db
menu_item-submenu.bits.db menu_item.bits.db notebook.bits.db
radio.bits.db scrollbar-horizontal.bits.db
scrollbar-vertical.bits.db scrollbar_dec-horizontal.bits.db
scrollbar_dec-vertical.bits.db
scrollbar_inc-horizontal.bits.db
scrollbar_inc-vertical.bits.db seeker-horizontal.bits.db
seeker-vertical.bits.db seeker_drag-horizontal.bits.db
seeker_drag-vertical.bits.db table.bits.db text_cursor.bits.db
textarea.bits.db window.bits.db
Log Message:
Finally finished porting EWL from HEAD to Evas2. The theme structure changed
slightly, and the default theme is the one that was already in SPLIT. I may
have missed adding some files, so shout if you find a problem.
|
|
From: <enl...@li...> - 2002-11-07 01:54:40
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/tools
Added Files:
Tag: SPLIT
Makefile.am
Log Message:
Finally finished porting EWL from HEAD to Evas2. The theme structure changed
slightly, and the default theme is the one that was already in SPLIT. I may
have missed adding some files, so shout if you find a problem.
|
Thanks for helping keep SourceForge clean.
X