enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Some formatting love for the ohh so friendly e_gadcon :) 

Icons in the shelf menu for Config Contents and Shelf Config.


SVN revision: 27534
This commit is contained in:
Christopher Michael 2006-12-20 22:40:01 +00:00
parent 41e9901010
commit 8954bb145b
2 changed files with 18 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/bin/e_gadcon.c
View File

@ -654,13 +654,11 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
gc->clients = evas_list_append(gc->clients, gcc);
if ((gc->frame_request.func) && (style))
{
gcc->o_frame = gc->frame_request.func(gc->frame_request.data, gcc,
style);
gcc->o_frame = gc->frame_request.func(gc->frame_request.data, gcc, style);
gcc->style = evas_stringshare_add(style);
if (gcc->o_frame)
{
edje_object_size_min_calc(gcc->o_frame,
&(gcc->pad.w), &(gcc->pad.h));
edje_object_size_min_calc(gcc->o_frame, &(gcc->pad.w), &(gcc->pad.h));
gcc->o_box = e_box_add(gcc->gadcon->evas);
switch (gcc->gadcon->orient)
{
@ -731,8 +729,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
evas_object_geometry_get(gcc->o_base, &x, &y, &w, &h);
evas_object_move(gcc->o_control, x, y);
evas_object_resize(gcc->o_control, w, h);
e_theme_edje_object_set(gcc->o_control, "base/theme/gadman",
"e/gadman/control");
e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", "e/gadman/control");
if ((gcc->autoscroll) || (gcc->resizable))
{
@ -1196,6 +1193,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
ev = event_info;
gcc = data;
if (gcc->menu) return;
if (ev->button == 3)
{
@ -1541,9 +1539,7 @@ _e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
gcc->menu = mn;
if (gcc->gadcon->menu_attach.func)
{
gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, mn);
}
gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, mn);
else
{
mi = e_menu_item_new(mn);
@ -1784,24 +1780,16 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emi
if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
{
if (x > 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC;
else if (x < 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC;
}
else
{
if (y > 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC;
else if (y < 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC;
}
if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
@ -1871,24 +1859,16 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
{
if (x > 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC;
else if (x < 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_DEC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_DEC;
}
else
{
if (y > 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC;
else if (y < 0)
{
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC;
}
gcc->state_info.state = E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC;
}
if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
@ -1921,8 +1901,6 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
gcc->dy += y;
}
/* a smart object JUST for gadcon */
typedef struct _E_Gadcon_Layout_Item E_Gadcon_Layout_Item;
@ -2090,7 +2068,6 @@ e_gadcon_layout_asked_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
E_Smart_Data *sd;
Evas_Coord tw = 0, th = 0;
if (!obj) return;
sd = evas_object_smart_data_get(obj);
@ -2183,9 +2160,7 @@ e_gadcon_layout_pack_size_set(Evas_Object *obj, int size)
bi->ask.size = size;
}
else
{
bi->ask.size = size;
}
bi->ask.size = size;
}
bi->ask.size = size;
}
@ -2922,9 +2897,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
need = max_size - sd->w;
}
else
{
return;
}
return;
}
else
{
@ -2937,10 +2910,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
need = max_size - sd->h;
}
else
{
return;
}
return;
}
sd->items = evas_list_sort(sd->items, evas_list_count(sd->items),
@ -3032,7 +3002,6 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
}
}
static int
_e_gadcon_layout_smart_sort_by_sequence_number_cb(void *d1, void *d2)
{
@ -4197,9 +4166,6 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
create_new = 1;
new_state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED;
}
else
{
}
}
if (create_new)
@ -4345,8 +4311,6 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
E_Gadcon_Layout_Item *bi, *bi2;
E_Layout_Item_Container *lc, *lc2, *lc3;
(*lc_moving)->pos = (*lc_moving)->prev_pos;
if (((*lc_moving)->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_INC) ||
((*lc_moving)->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_DEC) ||
@ -4365,7 +4329,6 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
(*lc_moving)->state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED;
_e_gadcon_layout_smart_gadcons_position_static(sd, con_list);
lc2 = NULL;
lc3 = NULL;
ok = 0;

4
src/bin/e_shelf.c
View File

@ -804,7 +804,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Shelf Configuration"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/config");
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_config, es);
mi = e_menu_item_new(mn);
@ -817,7 +817,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Configure Shelf Contents"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/config");
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es);
mi = e_menu_item_new(mn);