Enlightenment CVS committal
Author : dj2
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
ewl_icon_local_viewer.c layout_ewl_simple.c
Log Message:
- update to ewl api changes
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_icon_local_viewer.c 21 Feb 2006 00:15:20 -0000 1.58
+++ ewl_icon_local_viewer.c 22 Feb 2006 21:03:47 -0000 1.59
@@ -580,10 +580,11 @@
/*Add some context menu items */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "New Directory");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "New Directory");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_new_dir.png");
+ "/icons/e17_button_detail_new_dir.png",
+ NULL);
ewl_iconbox_context_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
/*ewl_callback_append (context, EWL_CALLBACK_CLICKED,
ewl_iconbox_file_copy_cb, instance);*/
@@ -592,10 +593,11 @@
/*Add some context menu items */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Copy selection");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Copy selection");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_copy.png");
+ "/icons/e17_button_detail_copy.png",
+ NULL);
ewl_iconbox_context_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
ewl_iconbox_file_copy_cb, instance);
@@ -603,10 +605,11 @@
/*Add some context menu items */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Paste");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Paste");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_paste.png");
+ "/icons/e17_button_detail_paste.png",
+ NULL);
ewl_iconbox_context_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
ewl_iconbox_file_paste_cb, instance);
@@ -619,7 +622,7 @@
/*Add some context menu items */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context),
"Set custom folder background...");
ewl_iconbox_context_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
@@ -628,7 +631,7 @@
/*Add some context menu items */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context),
"Remove current custom background");
ewl_iconbox_context_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
@@ -639,10 +642,11 @@
/*Copy */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Copy");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Copy");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_copy.png");
+ "/icons/e17_button_detail_copy.png",
+ NULL);
ewl_widget_show (context);
ewl_iconbox_icon_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
@@ -650,10 +654,11 @@
//
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Cut");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Cut");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_cut.png");
+ "/icons/e17_button_detail_cut.png",
+ NULL);
ewl_widget_show (context);
ewl_iconbox_icon_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
//ewl_callback_append(context, EWL_CALLBACK_MOUSE_DOWN, icon_properties_cb,
instance);
@@ -661,10 +666,11 @@
/*Icon menu */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Rename");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Rename");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_rename.png");
+ "/icons/e17_button_detail_rename.png",
+ NULL);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
ewl_icon_local_viewer_menu_rename_cb, instance);
ewl_widget_show (context);
@@ -672,10 +678,11 @@
/*Icon menu */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Delete");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Delete");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_delete.png");
+ "/icons/e17_button_detail_delete.png",
+ NULL);
ewl_widget_show (context);
ewl_iconbox_icon_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED,
@@ -683,10 +690,11 @@
/*Icon menu */
context = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (context), "Properties");
- ewl_menu_item_image_set (EWL_MENU_ITEM (context),
+ ewl_button_label_set (EWL_BUTTON (context), "Properties");
+ ewl_button_image_set (EWL_BUTTON (context),
PACKAGE_DATA_DIR
- "/icons/e17_button_detail_properties.png");
+ "/icons/e17_button_detail_properties.png",
+ NULL);
ewl_widget_show (context);
ewl_iconbox_icon_menu_item_add (EWL_ICONBOX (viewer->iconbox), context);
ewl_callback_append (context, EWL_CALLBACK_CLICKED, icon_properties_cb,
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- layout_ewl_simple.c 22 Feb 2006 14:25:54 -0000 1.46
+++ layout_ewl_simple.c 22 Feb 2006 21:03:47 -0000 1.47
@@ -869,13 +869,13 @@
menu = ewl_menu_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (menu), "File");
+ ewl_button_label_set (EWL_BUTTON (menu), "File");
ewl_container_child_append (EWL_CONTAINER (menubar), menu);
ewl_object_fill_policy_set (EWL_OBJECT (menu), EWL_FLAG_FILL_NONE);
ewl_widget_show (menu);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Exit");
+ ewl_button_label_set (EWL_BUTTON (item), "Exit");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
__destroy_main_window, core);
@@ -883,27 +883,27 @@
menu = ewl_menu_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (menu), "Tools");
+ ewl_button_label_set (EWL_BUTTON (menu), "Tools");
ewl_container_child_append (EWL_CONTAINER (menubar), menu);
ewl_object_fill_policy_set (EWL_OBJECT (menu), EWL_FLAG_FILL_NONE);
ewl_widget_show (menu);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Add Location...");
+ ewl_button_label_set (EWL_BUTTON (item), "Add Location...");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
location_add_cb, layout);
ewl_widget_show (item);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Setup MIME Actions...");
+ ewl_button_label_set (EWL_BUTTON (item), "Setup MIME Actions...");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED, mime_cb,
layout);
ewl_widget_show (item);
menu = ewl_menu_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (menu), "View");
+ ewl_button_label_set (EWL_BUTTON (menu), "View");
ewl_container_child_append (EWL_CONTAINER (menubar), menu);
ewl_object_fill_policy_set (EWL_OBJECT (menu), EWL_FLAG_FILL_NONE);
ewl_widget_show (menu);
@@ -913,7 +913,7 @@
char *name = entropy_plugin_plugin_identify (instance->plugin);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), name);
+ ewl_button_label_set (EWL_BUTTON (item), name);
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
layout_ewl_simple_local_view_cb, instance);
@@ -921,14 +921,14 @@
}
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Hide Tree View");
+ ewl_button_label_set (EWL_BUTTON (item), "Hide Tree View");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
layout_ewl_simple_structure_view_cb, layout);
ewl_widget_show (item);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Show Tree View");
+ ewl_button_label_set (EWL_BUTTON (item), "Show Tree View");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
layout_ewl_simple_structure_view_show_cb, layout);
@@ -936,13 +936,13 @@
menu = ewl_menu_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (menu), "Debug");
+ ewl_button_label_set (EWL_BUTTON (menu), "Debug");
ewl_container_child_append (EWL_CONTAINER (menubar), menu);
ewl_object_fill_policy_set (EWL_OBJECT (menu), EWL_FLAG_FILL_NONE);
ewl_widget_show (menu);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "File Cache");
+ ewl_button_label_set (EWL_BUTTON (item), "File Cache");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_widget_show (item);
@@ -957,20 +957,20 @@
menu = ewl_menu_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (menu), "Help");
+ ewl_button_label_set (EWL_BUTTON (menu), "Help");
ewl_container_child_append (EWL_CONTAINER (menubar), menu);
ewl_object_fill_policy_set (EWL_OBJECT (menu), EWL_FLAG_FILL_NONE);
ewl_widget_show (menu);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Tip Of The Day..");
+ ewl_button_label_set (EWL_BUTTON (item), "Tip Of The Day..");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
ewl_layout_simple_tooltip_show_cb, layout);
ewl_widget_show (item);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "About..");
+ ewl_button_label_set (EWL_BUTTON (item), "About..");
ewl_container_child_append (EWL_CONTAINER (menu), item);
ewl_callback_append (EWL_WIDGET (item), EWL_CALLBACK_CLICKED,
ewl_layout_simple_about_dialog_cb, layout);
@@ -984,18 +984,18 @@
ewl_container_child_append (EWL_CONTAINER (win), gui->context_menu_floater);
gui->context_menu = ewl_menu_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (gui->context_menu), " ");
+ ewl_button_label_set (EWL_BUTTON (gui->context_menu), " ");
ewl_container_child_append (EWL_CONTAINER (gui->context_menu_floater),
gui->context_menu);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Edit");
+ ewl_button_label_set (EWL_BUTTON (item), "Edit");
ewl_container_child_append (EWL_CONTAINER (gui->context_menu), item);
ewl_widget_show (item);
item = ewl_menu_item_new ();
- ewl_menu_item_text_set (EWL_MENU_ITEM (item), "Delete");
+ ewl_button_label_set (EWL_BUTTON (item), "Delete");
ewl_container_child_append (EWL_CONTAINER (gui->context_menu), item);
ewl_callback_append (item, EWL_CALLBACK_CLICKED,
location_menu_popup_delete_cb, layout);
-------------------------------------------------------
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
