forked from enlightenment/enlightenment
Show a better name for shelfs, shelfs are now named as "Shelf bottom", "Shelf bottom_left", etc. I guess _E_Shelf->const char *name can be removed now... Anyone against that? :)
SVN revision: 51929
This commit is contained in:
parent
c5f7dfa28a
commit
748d4e182f
|
@ -1425,9 +1425,8 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
|
||||||
if (s->zone->num != zone->num) continue;
|
if (s->zone->num != zone->num) continue;
|
||||||
if (s->cfg->container != (int) con->num) continue;
|
if (s->cfg->container != (int) con->num) continue;
|
||||||
|
|
||||||
name = s->name;
|
name = e_shelf_orient_string_get (s);
|
||||||
if (!name) name = _("Shelf #");
|
snprintf(buf, sizeof(buf), "Shelf %s", name);
|
||||||
snprintf(buf, sizeof(buf), "%s %i", name, s->id);
|
|
||||||
|
|
||||||
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, buf);
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
|
|
||||||
static void _e_shelf_free(E_Shelf *es);
|
static void _e_shelf_free(E_Shelf *es);
|
||||||
static const char *_e_shelf_orient_string_get(E_Shelf *es);
|
|
||||||
static void _e_shelf_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
static void _e_shelf_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
||||||
static void _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
static void _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
||||||
static Evas_Object *_e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
|
static Evas_Object *_e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
|
||||||
|
@ -176,7 +175,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
|
||||||
_e_shelf_gadcon_frame_request, es);
|
_e_shelf_gadcon_frame_request, es);
|
||||||
e_gadcon_orient(es->gadcon, E_GADCON_ORIENT_TOP);
|
e_gadcon_orient(es->gadcon, E_GADCON_ORIENT_TOP);
|
||||||
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
||||||
_e_shelf_orient_string_get(es));
|
e_shelf_orient_string_get(es));
|
||||||
edje_object_signal_emit(es->o_base, buf, "e");
|
edje_object_signal_emit(es->o_base, buf, "e");
|
||||||
edje_object_message_signal_process(es->o_base);
|
edje_object_message_signal_process(es->o_base);
|
||||||
e_gadcon_zone_set(es->gadcon, zone);
|
e_gadcon_zone_set(es->gadcon, zone);
|
||||||
|
@ -508,13 +507,71 @@ e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient)
|
||||||
|
|
||||||
e_gadcon_orient(es->gadcon, orient);
|
e_gadcon_orient(es->gadcon, orient);
|
||||||
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
||||||
_e_shelf_orient_string_get(es));
|
e_shelf_orient_string_get(es));
|
||||||
edje_object_signal_emit(es->o_base, buf, "e");
|
edje_object_signal_emit(es->o_base, buf, "e");
|
||||||
edje_object_message_signal_process(es->o_base);
|
edje_object_message_signal_process(es->o_base);
|
||||||
e_gadcon_location_set_icon_name(es->gadcon->location, _e_shelf_orient_icon_name_get(es));
|
e_gadcon_location_set_icon_name(es->gadcon->location, _e_shelf_orient_icon_name_get(es));
|
||||||
e_zone_useful_geometry_dirty(es->zone);
|
e_zone_useful_geometry_dirty(es->zone);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI const char *
|
||||||
|
e_shelf_orient_string_get(E_Shelf *es)
|
||||||
|
{
|
||||||
|
const char *sig = "";
|
||||||
|
|
||||||
|
switch (es->gadcon->orient)
|
||||||
|
{
|
||||||
|
case E_GADCON_ORIENT_FLOAT:
|
||||||
|
sig = "float";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_HORIZ:
|
||||||
|
sig = "horizontal";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_VERT:
|
||||||
|
sig = "vertical";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_LEFT:
|
||||||
|
sig = "left";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
|
sig = "right";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_TOP:
|
||||||
|
sig = "top";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
|
sig = "bottom";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_TL:
|
||||||
|
sig = "top_left";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_TR:
|
||||||
|
sig = "top_right";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_BL:
|
||||||
|
sig = "bottom_left";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_BR:
|
||||||
|
sig = "bottom_right";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_LT:
|
||||||
|
sig = "left_top";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_RT:
|
||||||
|
sig = "right_top";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_LB:
|
||||||
|
sig = "left_bottom";
|
||||||
|
break;
|
||||||
|
case E_GADCON_ORIENT_CORNER_RB:
|
||||||
|
sig = "right_bottom";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return sig;
|
||||||
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
e_shelf_position_calc(E_Shelf *es)
|
e_shelf_position_calc(E_Shelf *es)
|
||||||
{
|
{
|
||||||
|
@ -812,64 +869,6 @@ _e_shelf_free(E_Shelf *es)
|
||||||
free(es);
|
free(es);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
|
||||||
_e_shelf_orient_string_get(E_Shelf *es)
|
|
||||||
{
|
|
||||||
const char *sig = "";
|
|
||||||
|
|
||||||
switch (es->gadcon->orient)
|
|
||||||
{
|
|
||||||
case E_GADCON_ORIENT_FLOAT:
|
|
||||||
sig = "float";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_HORIZ:
|
|
||||||
sig = "horizontal";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_VERT:
|
|
||||||
sig = "vertical";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
|
||||||
sig = "left";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
|
||||||
sig = "right";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_TOP:
|
|
||||||
sig = "top";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
|
||||||
sig = "bottom";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_TL:
|
|
||||||
sig = "top_left";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_TR:
|
|
||||||
sig = "top_right";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_BL:
|
|
||||||
sig = "bottom_left";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_BR:
|
|
||||||
sig = "bottom_right";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_LT:
|
|
||||||
sig = "left_top";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_RT:
|
|
||||||
sig = "right_top";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_LB:
|
|
||||||
sig = "left_bottom";
|
|
||||||
break;
|
|
||||||
case E_GADCON_ORIENT_CORNER_RB:
|
|
||||||
sig = "right_bottom";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return sig;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_shelf_gadcon_min_size_request(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, Evas_Coord w __UNUSED__, Evas_Coord h __UNUSED__)
|
_e_shelf_gadcon_min_size_request(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, Evas_Coord w __UNUSED__, Evas_Coord h __UNUSED__)
|
||||||
{
|
{
|
||||||
|
@ -1067,7 +1066,7 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
snprintf(buf, sizeof(buf), "e,state,orientation,%s",
|
||||||
_e_shelf_orient_string_get(es));
|
e_shelf_orient_string_get(es));
|
||||||
edje_object_signal_emit(es->o_base, buf, "e");
|
edje_object_signal_emit(es->o_base, buf, "e");
|
||||||
edje_object_message_signal_process(o);
|
edje_object_message_signal_process(o);
|
||||||
return o;
|
return o;
|
||||||
|
@ -1166,9 +1165,8 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
|
||||||
const char *name;
|
const char *name;
|
||||||
char buf[256];
|
char buf[256];
|
||||||
|
|
||||||
name = es->name;
|
name = e_shelf_orient_string_get (es);
|
||||||
if (!name) name = _("Shelf #");
|
snprintf(buf, sizeof(buf), "Shelf %s", name);
|
||||||
snprintf(buf, sizeof(buf), "%s %i", name, es->id);
|
|
||||||
|
|
||||||
e_shelf_locked_set(es, 1);
|
e_shelf_locked_set(es, 1);
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,7 @@ EAPI void e_shelf_layer_set(E_Shelf *es, int layer);
|
||||||
EAPI void e_shelf_save(E_Shelf *es);
|
EAPI void e_shelf_save(E_Shelf *es);
|
||||||
EAPI void e_shelf_unsave(E_Shelf *es);
|
EAPI void e_shelf_unsave(E_Shelf *es);
|
||||||
EAPI void e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient);
|
EAPI void e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient);
|
||||||
|
EAPI const char *e_shelf_orient_string_get(E_Shelf *es);
|
||||||
EAPI void e_shelf_position_calc(E_Shelf *es);
|
EAPI void e_shelf_position_calc(E_Shelf *es);
|
||||||
EAPI void e_shelf_style_set(E_Shelf *es, const char *style);
|
EAPI void e_shelf_style_set(E_Shelf *es, const char *style);
|
||||||
EAPI void e_shelf_popup_set(E_Shelf *es, int popup);
|
EAPI void e_shelf_popup_set(E_Shelf *es, int popup);
|
||||||
|
|
|
@ -128,9 +128,8 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
|
||||||
es = l->data;
|
es = l->data;
|
||||||
if (!es) continue;
|
if (!es) continue;
|
||||||
|
|
||||||
label = es->name;
|
label = e_shelf_orient_string_get (es);
|
||||||
if (!label) label = _("Shelf #");
|
snprintf(buf, sizeof(buf), "Shelf %s", label);
|
||||||
snprintf(buf, sizeof(buf), "%s %i", label, es->id);
|
|
||||||
|
|
||||||
ob = e_icon_add(evas);
|
ob = e_icon_add(evas);
|
||||||
switch (es->cfg->orient)
|
switch (es->cfg->orient)
|
||||||
|
|
Loading…
Reference in New Issue