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

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

ticket #2105


SVN revision: 82408
This commit is contained in:
Mike Blumenkrantz 2013-01-08 11:32:46 +00:00
parent 61c21f3629
commit bede9e08bf
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

@ -9,6 +9,7 @@
* Fixed bug where disabled slider widgets could be changed with mouse wheel * Fixed bug where disabled slider widgets could be changed with mouse wheel
* Fixed bug where fileman config slider widgets were not properly disabled * Fixed bug where fileman config slider widgets were not properly disabled
* Tasks gadgets now apply the selected style * Tasks gadgets now apply the selected style
* Desktop->Shelves menu now shows shelf names
* Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied * Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied
2013-01-07 Tom "TAsn" Hacohen 2013-01-07 Tom "TAsn" Hacohen

1
NEWS
View File

@ -44,6 +44,7 @@ Improvements:
* Backlight fade time only applies to dimming - undimming is fixed 0.5 . * Backlight fade time only applies to dimming - undimming is fixed 0.5 .
* Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied * Added elm win trap callback for base size setting, calling this causes ICCCM hints to be applied
* "System Default" language in wizard now displays which language it is and no longer removes language from list * "System Default" language in wizard now displays which language it is and no longer removes language from list
* Desktop->Shelves menu now shows shelf names
Fixes: Fixes:
* Force check changed upon confirmation dialog closure for engine settings. * Force check changed upon confirmation dialog closure for engine settings.

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) EINA_LIST_FOREACH(shelves, l, es)
{ {
char buf[1024]; char buf[1024];
const char *name;
if (!es) continue; if (!es) continue;
if (es->zone->num != zone->num) continue; if (es->zone->num != zone->num) continue;
if (es->cfg->container != (int)con->num) continue; if (es->cfg->container != (int)con->num) continue;
snprintf(buf, sizeof(buf), _("Shelf %s"), if (es->name)
e_shelf_orient_string_get(es)); name = es->name;
else
{
name = buf;
snprintf(buf, sizeof(buf), _("Shelf %s"), e_shelf_orient_string_get(es));
}
mi = e_menu_item_new(m); 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); e_menu_item_callback_set(mi, _e_int_menus_shelves_item_cb, es);
switch (es->cfg->orient) switch (es->cfg->orient)
{ {