Icon work. HUGE revision of icons and their names. This breaks the icon theme API so you might need to revise some themes. It does however, simplify a whole lot of stuff. You'll notice a lot more icons in menus. This bigger changes will come with the new theme once it is done. The missing icon names are put in b_and_w theme for now so if you need them, look them up. Also a bit of base work for EFM and the border icons in there. Commented out till the old icons are merged in. Message me if anything is screwed up.

SVN revision: 36591

13 files changed, 49 insertions, 26 deletions

diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index f9fd8863da..b87891eebb 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -2429,6 +2429,26 @@ group {
 }
 
 group {
+   name: "e/icons/widget/resize";
+   max:  64 64;
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   1.0 1.0;
+	    aspect_preference: BOTH;
+	    max:      64 64;
+	    image {
+	       normal: "e17_icon_configuration.png";
+	    }
+	 }
+      }
+   }
+}
+
+group {
    name: "e/icons/widget/new_dialog";
    parts {
       part {
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 0474ec4226..57d0b0004c 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1242,7 +1242,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
 
 	mi = e_menu_item_new(menu);
 	e_menu_item_label_set(mi, _("Able to be resized"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/resizable");
+	e_util_menu_item_edje_icon_set(mi, "widget/resize");
 	e_menu_item_check_set(mi, 1);
 	if (gcc->resizable) e_menu_item_toggle_set(mi, 1);
 	e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_resizable, gcc);
@@ -1254,13 +1254,13 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
 	  {
 		mi = e_menu_item_new(menu);
 		e_menu_item_label_set(mi, _("Begin move/resize this gadget"));
-		e_util_menu_item_edje_icon_set(mi, "enlightenment/edit");
+		e_util_menu_item_edje_icon_set(mi, "widget/resize");
 		e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
 	  }
 
 	mi = e_menu_item_new(menu);
 	e_menu_item_label_set(mi, _("Remove this gadget"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/remove");
+	e_util_menu_item_edje_icon_set(mi, "widget/del");
 	e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc);
      }
    if (gcc->gadcon->menu_attach.func)
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 610ef0d2a5..c1596472a6 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -759,6 +759,7 @@ _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m)
 
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, _("Configure Virtual Desktops"));
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _e_int_menus_desk_item_cb, NULL);
      }
 }
@@ -1579,12 +1580,14 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
 
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Add A Shelf"));
+   e_util_menu_item_edje_icon_set(mi, "widget/add");
    e_menu_item_callback_set(mi, _e_int_menus_shelves_add_cb, NULL);
 
    if (shelves)
      { 
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, _("Delete A Shelf"));
+        e_util_menu_item_edje_icon_set(mi, "widget/del");
 	e_menu_item_callback_set(mi, _e_int_menus_shelves_del_cb, NULL);
      }	
 }
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index ca66ef61dc..b81bf1630b 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1646,7 +1646,7 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
      e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
    else
      e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/edit");
+   e_util_menu_item_edje_icon_set(mi, "widget/resize");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es);
 
    mi = e_menu_item_new(m);
@@ -1654,7 +1654,7 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
 
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Shelf Configuration"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
+   e_util_menu_item_edje_icon_set(mi, "widget/config");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
    
    mi = e_menu_item_new(m);
@@ -1664,7 +1664,7 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
    
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Delete this Shelf"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/delete");
+   e_util_menu_item_edje_icon_set(mi, "widget/del");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es);   
 }
 
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index 73b32f95e9..f499e3440f 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -317,7 +317,7 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
      e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
    else
      e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/edit");
+   e_util_menu_item_edje_icon_set(mi, "widget/resize");
    e_menu_item_callback_set(mi, _e_toolbar_menu_cb_edit, tbar);
 
    mi = e_menu_item_new(mn);
@@ -325,12 +325,12 @@ _e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
 
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, _("Toolbar Configuration"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
+   e_util_menu_item_edje_icon_set(mi, "widget/config");
    e_menu_item_callback_set(mi, _e_toolbar_menu_cb_config, tbar);
 
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, _("Configure Toolbar Contents"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
+   e_util_menu_item_edje_icon_set(mi, "enlightenment/toolbar");
    e_menu_item_callback_set(mi, _e_toolbar_menu_cb_contents, tbar);
 }
 
@@ -352,7 +352,7 @@ _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
    subm = e_menu_new();
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, tbar->name);
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
+   e_util_menu_item_edje_icon_set(mi, "enlightenment/toolbar");
    e_menu_pre_activate_callback_set(subm, _e_toolbar_menu_cb_pre, tbar);
    e_object_free_attach_func_set(E_OBJECT(subm), _e_toolbar_menu_del_hook);
    e_menu_item_submenu_set(mi, subm);
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 74dbe5dccc..2fc1316c77 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -170,7 +170,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, NULL);
 
 	e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
index a0c9f171f6..c1077daa55 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.c
+++ b/src/modules/conf_desklock/e_int_config_desklock.c
@@ -197,7 +197,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(rt, ow, 1, 0, 1, 1, 1, 1, 0, 0);
    e_widget_table_object_append(ft, rt, 0, 0, 1, 1, 0, 0, 0, 0);
    cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"), 
-				       "widgets/up_dir", _cb_button_up, 
+				       "widget/up_dir", _cb_button_up, 
 				       cfdata, NULL);
    e_widget_table_object_append(ft, cfdata->o_btn, 0, 1, 1, 1, 0, 0, 0, 0);
 
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
index 7216dfed11..9f4b1cf00c 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
@@ -145,7 +145,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
    e_widget_table_object_append(ott, o, 1, 2, 1, 1, 1, 1, 1, 1);
    import->well2 = o;
 
-   o = e_widget_button_add(evas, "Swap Colors", "enlightenment/swap", _import_cb_color_swap, import, NULL);
+   o = e_widget_button_add(evas, "Swap Colors", "widget/swap", _import_cb_color_swap, import, NULL);
    evas_object_show(o);
    e_widget_table_object_append(ott, o, 1, 3, 1, 1, 1, 1, 1, 1);
 
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index be8641c951..e563541c99 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -313,7 +313,7 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, b);
 
 	mi = e_menu_item_new(mn);
@@ -795,12 +795,12 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 	/* FIXME: other icon options go here too */
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Change Icon Properties"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/properties");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _ibar_cb_menu_icon_properties, ic);
 	
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Remove Icon"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/delete");
+	e_util_menu_item_edje_icon_set(mi, "widget/del");
 	e_menu_item_callback_set(mi, _ibar_cb_menu_icon_remove, ic);
 
 	mi = e_menu_item_new(mn);
@@ -810,14 +810,14 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("Add An Icon"));
-	     e_util_menu_item_edje_icon_set(mi, "enlightenment/ibar_applications");
+	     e_util_menu_item_edje_icon_set(mi, "widget/add");
 	     e_menu_item_callback_set(mi, _ibar_cb_menu_icon_add, NULL);
 	  }
 	if (e_configure_registry_exists("applications/new_application")) 
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("Create New Icon"));
-	     e_util_menu_item_edje_icon_set(mi, "enlightenment/new_application");
+	     e_util_menu_item_edje_icon_set(mi, "widget/new");
 	     e_menu_item_callback_set(mi, _ibar_cb_menu_icon_new, NULL);
 
 	     mi = e_menu_item_new(mn);
@@ -826,14 +826,14 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, ic->ibar);
 
 	if (e_configure_registry_exists("applications/ibar_applications")) 
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("Add Application"));
-	     e_util_menu_item_edje_icon_set(mi, "enlightenment/add");
+	     e_util_menu_item_edje_icon_set(mi, "widget/add");
 	     e_menu_item_callback_set(mi, _ibar_cb_menu_add, ic->ibar);
 	  }
 	
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 39fc99a8ba..a24d239f1d 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -307,7 +307,7 @@ _ibox_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _ibox_cb_menu_configuration, b);
 
 	mi = e_menu_item_new(mn);
@@ -705,7 +705,7 @@ _ibox_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info
 	/* FIXME: other icon options go here too */
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _ibox_cb_menu_configuration, ic->ibox);
 
 	mi = e_menu_item_new(mn);
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 7a4b6ca50c..609eba5d98 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -665,7 +665,7 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev)
 
    mi = e_menu_item_new(mn);
    e_menu_item_label_set(mi, _("Configuration"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+   e_util_menu_item_edje_icon_set(mi, "widget/config");
    e_menu_item_callback_set(mi, _mixer_menu_cb_cfg, inst);
 
    e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 9abcdcaf9e..71e75cd845 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -802,14 +802,14 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _pager_inst_cb_menu_configure, NULL);
 
 	if (e_configure_registry_exists("screen/virtual_desktops"))
 	  {
 	     mi = e_menu_item_new(mn);
 	     e_menu_item_label_set(mi, _("Virtual Desktops Configuration"));
-	     e_util_menu_item_edje_icon_set(mi, "enlightenment/vdesktops");
+	     e_util_menu_item_edje_icon_set(mi, "enlightenment/desktops");
 	     e_menu_item_callback_set(mi, _pager_inst_cb_menu_virtual_desktops_dialog, inst);
 	  }
 
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index 4bba28e94f..cc608df372 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -304,7 +304,7 @@ _temperature_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *eve
 	
 	mi = e_menu_item_new(mn);
 	e_menu_item_label_set(mi, _("Configuration"));
-	e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+	e_util_menu_item_edje_icon_set(mi, "widget/config");
 	e_menu_item_callback_set(mi, _temperature_face_cb_menu_configure, inst);
 	
 	e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);