kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Desktop->Shelves menu now shows shelf names instead of orientations 

ticket #2105

This is a backport of r82408


SVN revision: 83096
This commit is contained in:
Igor Murzov 2013-01-22 16:38:54 +00:00
parent 37d444fa0f
commit 4857d86db3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@
2013-01-22 Mike Blumenkrantz
* Desktop->Shelves menu now shows shelf names
* No longer build illume edj files
* fixed gadget dragging on desktop near screen edges
* fixed bug where backlight settings would try to update dummy backlight devices

1
NEWS
View File

@ -12,6 +12,7 @@ Improvements:
* No longer build illume edj files
* Better messages in UI
* Added three more files for input methods used in asian countries
* Desktop->Shelves menu now shows shelf names
Fixes:
* Fixed crash when changing ibar source

12
src/bin/e_int_menus.c
View File

@ -1613,16 +1613,22 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
EINA_LIST_FOREACH(shelves, l, es)
{
char buf[1024];
const char *name;
if (!es) continue;
if (es->zone->num != zone->num) continue;
if (es->cfg->container != (int)con->num) continue;
snprintf(buf, sizeof(buf), _("Shelf %s"),
e_shelf_orient_string_get(es));
if (es->name)
name = es->name;
else
{
name = buf;
snprintf(buf, sizeof(buf), _("Shelf %s"), e_shelf_orient_string_get(es));
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, buf);
e_menu_item_label_set(mi, name);
e_menu_item_callback_set(mi, _e_int_menus_shelves_item_cb, es);
switch (es->cfg->orient)
{