Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_imenu_test.c ewl_menu_bar_test.c ewl_menu_test.c
ewl_combo_test.c ewl_theme_test.c
Log Message:
Convert the menu item to inherit from the button. Allows for simple reuse of
existing stock methods and reduces potentially duplicated code.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_imenu_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_imenu_test.c 2 Dec 2005 20:09:57 -0000 1.5
+++ ewl_imenu_test.c 22 Feb 2006 18:12:01 -0000 1.6
@@ -15,9 +15,9 @@
__imenu_focus_in(Ewl_Widget * w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
- char *text;
+ const char *text;
- text = ewl_text_text_get(EWL_TEXT(EWL_MENU_ITEM(w)->text));
+ text = ewl_button_label_get(EWL_BUTTON(w));
printf("%s item down\n", text);
}
@@ -67,7 +67,7 @@
* Create the menu
*/
imenu1 = ewl_imenu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(imenu1), "test menu");
+ ewl_button_label_set(EWL_BUTTON(imenu1), "test menu");
ewl_object_fill_policy_set(EWL_OBJECT(imenu1), EWL_FLAG_FILL_NONE);
ewl_container_child_append(EWL_CONTAINER(imenu_box), imenu1);
ewl_widget_show(imenu1);
@@ -76,8 +76,8 @@
* Append some test items
*/
item = ewl_menu_item_new();
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
"/usr/share/pixmaps/dia-diagram.png");
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia");
+ ewl_button_image_set(EWL_BUTTON(item),
"/usr/share/pixmaps/dia-diagram.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(item), "dia");
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_callback_append(item, EWL_CALLBACK_CONFIGURE,
@@ -89,14 +89,14 @@
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
"/usr/share/pixmaps/wilber.png");
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "gimp");
+ ewl_button_image_set(EWL_BUTTON(item), "/usr/share/pixmaps/wilber.png",
NULL);
+ ewl_button_label_set(EWL_BUTTON(item), "gimp");
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
+ ewl_button_label_set(EWL_BUTTON(item), "button");
ewl_container_child_append(EWL_CONTAINER(imenu1), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
@@ -105,18 +105,18 @@
* Create a sub-menu
*/
imenu2 = ewl_imenu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(imenu2), "Sub menu");
+ ewl_button_label_set(EWL_BUTTON(imenu2), "Sub menu");
ewl_container_child_append(EWL_CONTAINER(imenu1), imenu2);
ewl_widget_show(imenu2);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
+ ewl_button_label_set(EWL_BUTTON(item), "button");
ewl_container_child_append(EWL_CONTAINER(imenu2), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
+ ewl_button_label_set(EWL_BUTTON(item), "button");
ewl_container_child_append(EWL_CONTAINER(imenu2), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __imenu_focus_in,
NULL);
ewl_widget_show(item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_menu_bar_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_menu_bar_test.c 24 Oct 2005 04:39:57 -0000 1.5
+++ ewl_menu_bar_test.c 22 Feb 2006 18:12:01 -0000 1.6
@@ -51,17 +51,17 @@
NULL};
for(i = 0; m_items[i] != NULL; i++) {
item = ewl_menu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), m_items[i]);
+ ewl_button_label_set(EWL_BUTTON(item), m_items[i]);
ewl_container_child_append(EWL_CONTAINER(h_menubar),
item);
ewl_widget_show(item);
foo = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
+ ewl_button_label_set(EWL_BUTTON(foo), "foo");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
foo = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foobar");
+ ewl_button_label_set(EWL_BUTTON(foo), "foobar");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
@@ -80,17 +80,17 @@
ewl_widget_show(item);
item = ewl_menu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "Help");
+ ewl_button_label_set(EWL_BUTTON(item), "Help");
ewl_container_child_append(EWL_CONTAINER(h_menubar), item);
ewl_widget_show(item);
foo = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
+ ewl_button_label_set(EWL_BUTTON(foo), "foo");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
foo = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foobar");
+ ewl_button_label_set(EWL_BUTTON(foo), "foobar");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
}
@@ -110,17 +110,17 @@
Ewl_Widget *foo;
item = ewl_menu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), m_items[i]);
+ ewl_button_label_set(EWL_BUTTON(item), m_items[i]);
ewl_container_child_append(EWL_CONTAINER(v_menubar),
item);
ewl_widget_show(item);
foo = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foo");
+ ewl_button_label_set(EWL_BUTTON(foo), "foo");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
foo = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(foo), "foobar");
+ ewl_button_label_set(EWL_BUTTON(foo), "foobar");
ewl_container_child_append(EWL_CONTAINER(item), foo);
ewl_widget_show(foo);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_menu_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_menu_test.c 22 Dec 2005 21:38:42 -0000 1.6
+++ ewl_menu_test.c 22 Feb 2006 18:12:01 -0000 1.7
@@ -17,7 +17,7 @@
{
const char *text;
- text = ewl_label_text_get(EWL_LABEL(EWL_MENU_ITEM(w)->text));
+ text = ewl_button_label_get(EWL_BUTTON(w));
printf("%s item down\n", text);
}
@@ -50,8 +50,8 @@
* Create the menu
*/
menu1 = ewl_menu_new();
- ewl_menu_item_image_set(EWL_MENU_ITEM(menu1), PACKAGE_DATA_DIR
"/images/Draw.png");
- ewl_menu_item_text_set(EWL_MENU_ITEM(menu1), "test menu");
+ ewl_button_image_set(EWL_BUTTON(menu1), PACKAGE_DATA_DIR
"/images/Draw.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(menu1), "test menu");
ewl_container_child_append(EWL_CONTAINER(menu_win), menu1);
ewl_widget_show(menu1);
@@ -59,21 +59,27 @@
* Append some test items
*/
item = ewl_menu_item_new();
- ewl_menu_item_image_set(EWL_MENU_ITEM(item), PACKAGE_DATA_DIR
"/images/Open.png");
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia");
+ ewl_button_image_set(EWL_BUTTON(item), PACKAGE_DATA_DIR
"/images/Open.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(item), "dia");
ewl_container_child_append(EWL_CONTAINER(menu1), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_image_set(EWL_MENU_ITEM(item), PACKAGE_DATA_DIR
"/images/Package.png");
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "gimp");
+ ewl_button_image_set(EWL_BUTTON(item), PACKAGE_DATA_DIR
"/images/Package.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(item), "gimp");
ewl_container_child_append(EWL_CONTAINER(menu1), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
+ ewl_button_stock_type_set(EWL_BUTTON(item), EWL_STOCK_OK);
+ ewl_container_child_append(EWL_CONTAINER(menu1), item);
+ ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
+ ewl_widget_show(item);
+
+ item = ewl_menu_item_new();
+ ewl_button_label_set(EWL_BUTTON(item), "button");
ewl_container_child_append(EWL_CONTAINER(menu1), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
@@ -82,21 +88,19 @@
* Create a sub-menu
*/
menu2 = ewl_menu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(menu2), "Sub menu");
+ ewl_button_label_set(EWL_BUTTON(menu2), "Sub menu");
ewl_container_child_append(EWL_CONTAINER(menu1), menu2);
ewl_widget_show(menu2);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button 1");
+ ewl_button_label_set(EWL_BUTTON(item), "button 1");
ewl_container_child_append(EWL_CONTAINER(menu2), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button 2");
+ ewl_button_label_set(EWL_BUTTON(item), "button 2");
ewl_container_child_append(EWL_CONTAINER(menu2), item);
ewl_callback_append(item, EWL_CALLBACK_FOCUS_IN, __menu_focus_in, NULL);
ewl_widget_show(item);
}
-
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_combo_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_combo_test.c 8 Feb 2006 04:48:10 -0000 1.7
+++ ewl_combo_test.c 22 Feb 2006 18:12:01 -0000 1.8
@@ -19,7 +19,7 @@
const char *text;
entry = EWL_WIDGET(ev_data);
- text = ewl_menu_item_text_get(EWL_MENU_ITEM(entry));
+ text = ewl_button_label_get(EWL_BUTTON(entry));
printf("value changed to %s\n", text);
@@ -78,9 +78,9 @@
* Append some test items
*/
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "dia");
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
- "/usr/share/pixmaps/dia-diagram.png");
+ ewl_button_label_set(EWL_BUTTON(item), "dia");
+ ewl_button_image_set(EWL_BUTTON(item),
+ "/usr/share/pixmaps/dia-diagram.png", NULL);
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
@@ -89,14 +89,14 @@
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "gimp");
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
- "/usr/share/pixmaps/wilber.png");
+ ewl_button_label_set(EWL_BUTTON(item), "gimp");
+ ewl_button_image_set(EWL_BUTTON(item),
+ "/usr/share/pixmaps/wilber.png", NULL);
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
item = ewl_menu_item_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(item), "button");
+ ewl_button_label_set(EWL_BUTTON(item), "button");
ewl_widget_data_set(item, "dummy", "data");
ewl_container_child_append(EWL_CONTAINER(combo1), item);
ewl_widget_show(item);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_theme_test.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_theme_test.c 4 Feb 2006 05:58:48 -0000 1.14
+++ ewl_theme_test.c 22 Feb 2006 18:12:01 -0000 1.15
@@ -128,17 +128,17 @@
ewl_widget_show(vbox);
misc = ewl_imenu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(misc), "Imenu");
+ ewl_button_label_set(EWL_BUTTON(misc), "Imenu");
ewl_container_child_append(EWL_CONTAINER(vbox), misc);
ewl_widget_show(misc);
for (i = 0; i < 3; i++) {
item = ewl_menu_item_new();
if (menus[i].name)
- ewl_menu_item_text_set(EWL_MENU_ITEM(item),
menus[i].name);
+ ewl_button_label_set(EWL_BUTTON(item), menus[i].name);
if (menus[i].image)
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
menus[i].image);
+ ewl_button_image_set(EWL_BUTTON(item), menus[i].image,
NULL);
ewl_container_child_append(EWL_CONTAINER(misc), item);
ewl_widget_show(item);
@@ -149,17 +149,17 @@
ewl_widget_show(misc);
misc = ewl_menu_new();
- ewl_menu_item_text_set(EWL_MENU_ITEM(misc), "Menu");
+ ewl_button_label_set(EWL_BUTTON(misc), "Menu");
ewl_container_child_append(EWL_CONTAINER(vbox), misc);
ewl_widget_show(misc);
for (i = 0; i < 3; i++) {
item = ewl_menu_item_new();
if (menus[i].name)
- ewl_menu_item_text_set(EWL_MENU_ITEM(item),
menus[i].name);
+ ewl_button_label_set(EWL_BUTTON(item), menus[i].name);
if (menus[i].image)
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
menus[i].image);
+ ewl_button_image_set(EWL_BUTTON(item), menus[i].image,
NULL);
ewl_container_child_append(EWL_CONTAINER(misc), item);
ewl_widget_show(item);
@@ -176,10 +176,10 @@
for (i = 0; i < 3; i++) {
item = ewl_menu_item_new();
if (menus[i].name)
- ewl_menu_item_text_set(EWL_MENU_ITEM(item),
menus[i].name);
+ ewl_button_label_set(EWL_BUTTON(item), menus[i].name);
if (menus[i].image)
- ewl_menu_item_image_set(EWL_MENU_ITEM(item),
menus[i].image);
+ ewl_button_image_set(EWL_BUTTON(item), menus[i].image,
NULL);
ewl_container_child_append(EWL_CONTAINER(misc), item);
ewl_widget_show(item);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
