forked from enlightenment/enlightenment
well - i found inconsistent namespacing for tasks and xkbswitch. fix!
SVN revision: 78578
This commit is contained in:
parent
a200832b4f
commit
0fa136b0df
|
@ -39301,7 +39301,7 @@ target: "region";
|
||||||
* text-only: no icon is swallowed
|
* text-only: no icon is swallowed
|
||||||
*/
|
*/
|
||||||
|
|
||||||
group { name:"modules/tasks/item";
|
group { name:"e/modules/tasks/item";
|
||||||
images {
|
images {
|
||||||
image: "bt_base1.png" COMP;
|
image: "bt_base1.png" COMP;
|
||||||
image: "bt_base2.png" COMP;
|
image: "bt_base2.png" COMP;
|
||||||
|
@ -39654,7 +39654,7 @@ target: "region";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
group { name:"modules/tasks/item_vert";
|
group { name:"e/modules/tasks/item_vert";
|
||||||
images {
|
images {
|
||||||
image: "bt_base1.png" COMP;
|
image: "bt_base1.png" COMP;
|
||||||
image: "bt_base2.png" COMP;
|
image: "bt_base2.png" COMP;
|
||||||
|
@ -39966,7 +39966,7 @@ target: "region";
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
/*** MOD: XKBSWITCH ***/
|
/*** MOD: XKBSWITCH ***/
|
||||||
group { name: "modules/xkbswitch/main";
|
group { name: "e/modules/xkbswitch/main";
|
||||||
images {
|
images {
|
||||||
image: "xkbshad.png" COMP;
|
image: "xkbshad.png" COMP;
|
||||||
}
|
}
|
||||||
|
@ -40045,7 +40045,7 @@ target: "region";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
group { name: "modules/xkbswitch/noflag";
|
group { name: "e/modules/xkbswitch/noflag";
|
||||||
max: 128 128;
|
max: 128 128;
|
||||||
parts {
|
parts {
|
||||||
part { name: "e.text.label"; type: TEXT;
|
part { name: "e.text.label"; type: TEXT;
|
||||||
|
|
|
@ -496,15 +496,15 @@ _tasks_item_new(Tasks *tasks, E_Border *border)
|
||||||
if (tasks->horizontal)
|
if (tasks->horizontal)
|
||||||
e_theme_edje_object_set(item->o_item,
|
e_theme_edje_object_set(item->o_item,
|
||||||
"base/theme/modules/tasks",
|
"base/theme/modules/tasks",
|
||||||
"modules/tasks/item");
|
"e/modules/tasks/item");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!e_theme_edje_object_set(item->o_item,
|
if (!e_theme_edje_object_set(item->o_item,
|
||||||
"base/theme/modules/tasks",
|
"base/theme/modules/tasks",
|
||||||
"modules/tasks/item_vert"))
|
"e/modules/tasks/item_vert"))
|
||||||
e_theme_edje_object_set(item->o_item,
|
e_theme_edje_object_set(item->o_item,
|
||||||
"base/theme/modules/tasks",
|
"base/theme/modules/tasks",
|
||||||
"modules/tasks/item");
|
"e/modules/tasks/item");
|
||||||
}
|
}
|
||||||
evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_DOWN,
|
evas_object_event_callback_add(item->o_item, EVAS_CALLBACK_MOUSE_DOWN,
|
||||||
_tasks_cb_item_mouse_down, item);
|
_tasks_cb_item_mouse_down, item);
|
||||||
|
|
|
@ -160,7 +160,7 @@ _xkb_update_icon(int cur_group)
|
||||||
}
|
}
|
||||||
e_theme_edje_object_set(inst->o_xkbswitch,
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
"base/theme/modules/xkbswitch",
|
"base/theme/modules/xkbswitch",
|
||||||
"modules/xkbswitch/noflag");
|
"e/modules/xkbswitch/noflag");
|
||||||
edje_object_part_text_set(inst->o_xkbswitch,
|
edje_object_part_text_set(inst->o_xkbswitch,
|
||||||
"e.text.label", name);
|
"e.text.label", name);
|
||||||
}
|
}
|
||||||
|
@ -175,7 +175,7 @@ _xkb_update_icon(int cur_group)
|
||||||
inst->o_xkbflag = e_icon_add(inst->gcc->gadcon->evas);
|
inst->o_xkbflag = e_icon_add(inst->gcc->gadcon->evas);
|
||||||
e_theme_edje_object_set(inst->o_xkbswitch,
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
"base/theme/modules/xkbswitch",
|
"base/theme/modules/xkbswitch",
|
||||||
"modules/xkbswitch/main");
|
"e/modules/xkbswitch/main");
|
||||||
e_xkb_e_icon_flag_setup(inst->o_xkbflag, name);
|
e_xkb_e_icon_flag_setup(inst->o_xkbflag, name);
|
||||||
edje_object_part_swallow(inst->o_xkbswitch, "e.swallow.flag",
|
edje_object_part_swallow(inst->o_xkbswitch, "e.swallow.flag",
|
||||||
inst->o_xkbflag);
|
inst->o_xkbflag);
|
||||||
|
@ -207,11 +207,11 @@ _gc_init(E_Gadcon *gc, const char *gcname, const char *id, const char *style)
|
||||||
if (e_config->xkb.only_label)
|
if (e_config->xkb.only_label)
|
||||||
e_theme_edje_object_set(inst->o_xkbswitch,
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
"base/theme/modules/xkbswitch",
|
"base/theme/modules/xkbswitch",
|
||||||
"modules/xkbswitch/noflag");
|
"e/modules/xkbswitch/noflag");
|
||||||
else
|
else
|
||||||
e_theme_edje_object_set(inst->o_xkbswitch,
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
"base/theme/modules/xkbswitch",
|
"base/theme/modules/xkbswitch",
|
||||||
"modules/xkbswitch/main");
|
"e/modules/xkbswitch/main");
|
||||||
edje_object_part_text_set(inst->o_xkbswitch, "e.text.label",
|
edje_object_part_text_set(inst->o_xkbswitch, "e.text.label",
|
||||||
e_xkb_layout_name_reduce(name));
|
e_xkb_layout_name_reduce(name));
|
||||||
/* The gadcon client */
|
/* The gadcon client */
|
||||||
|
|
Loading…
Reference in New Issue