okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=202bf770f4a88b14e72c080b0117536a918e54a0
commit 202bf770f4a88b14e72c080b0117536a918e54a0 Author: Stephen 'Okra' Houston <[email protected]> Date: Thu Jul 6 12:20:27 2017 -0500 Gadgets: Follow gadget theme naming conventions. --- src/modules/backlight/gadget/backlight.c | 8 ++++---- src/modules/mixer/gadget/mixer.c | 8 ++++---- src/modules/pager/gadget/pager.c | 12 ++++++------ src/modules/sysinfo/batman/batman.c | 20 ++++++++++---------- src/modules/sysinfo/cpuclock/cpuclock.c | 12 ++++++------ src/modules/sysinfo/cpumonitor/cpumonitor.c | 8 ++++---- src/modules/sysinfo/memusage/memusage.c | 12 ++++++------ src/modules/sysinfo/netstatus/netstatus.c | 12 ++++++------ src/modules/sysinfo/thermal/thermal.c | 12 ++++++------ src/modules/xkbswitch/gadget/xkbswitch.c | 24 ++++++++++++------------ 10 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c index bbf643509..883801bc7 100644 --- a/src/modules/backlight/gadget/backlight.c +++ b/src/modules/backlight/gadget/backlight.c @@ -241,12 +241,12 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA E_FILL(inst->o_backlight); if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->o_backlight, - "base/theme/modules/backlight", - "e/modules/backlight/main_vert"); + "base/theme/gadget/backlight", + "e/gadget/backlight/main_vert"); else e_theme_edje_object_set(inst->o_backlight, - "base/theme/modules/backlight", - "e/modules/backlight/main"); + "base/theme/gadget/backlight", + "e/gadget/backlight/main"); evas_object_event_callback_add(inst->o_backlight, EVAS_CALLBACK_MOUSE_DOWN, _backlight_cb_mouse_down, diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c index fb602d7a8..8e1583a27 100644 --- a/src/modules/mixer/gadget/mixer.c +++ b/src/modules/mixer/gadget/mixer.c @@ -610,12 +610,12 @@ _mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNU E_FILL(inst->o_mixer); if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->o_mixer, - "base/theme/modules/mixer", - "e/modules/mixer/main_vert"); + "base/theme/gadget/mixer", + "e/gadget/mixer/main_vert"); else e_theme_edje_object_set(inst->o_mixer, - "base/theme/modules/mixer", - "e/modules/mixer/main"); + "base/theme/gadget/mixer", + "e/gadget/mixer/main"); evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, inst); evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_WHEEL, diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c index 6ac1e534a..e3f8f8a96 100644 --- a/src/modules/pager/gadget/pager.c +++ b/src/modules/pager/gadget/pager.c @@ -423,8 +423,8 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, Eina_Bool invert) e = evas_object_evas_get(p->o_table); o = edje_object_add(e); pd->o_desk = o; - e_theme_edje_object_set(o, "base/theme/modules/pager", - "e/modules/pager16/desk"); + e_theme_edje_object_set(o, "base/theme/gadget/pager", + "e/gadget/pager16/desk"); edje_object_part_text_set(o, "e.text.label", desk->name); if (pager_config->show_desk_names) edje_object_signal_emit(o, "e,name,show", "e"); @@ -647,8 +647,8 @@ _pager_window_new(Pager_Desk *pd, Evas_Object *mirror, E_Client *client) //o = edje_object_add(evas_object_evas_get(pd->pager->o_table)); //pw->o_window = o; - //e_theme_edje_object_set(o, "base/theme/modules/pager", - //"e/modules/pager16/window"); + //e_theme_edje_object_set(o, "base/theme/gadget/pager", + //"e/gadget/pager16/window"); //if (visible) evas_object_show(o); @@ -744,8 +744,8 @@ pager_popup_new(int keyaction) pp->o_bg = edje_object_add(e_comp->evas); evas_object_name_set(pp->o_bg, "pager_gadget_popup"); - e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager", - "e/modules/pager16/popup"); + e_theme_edje_object_set(pp->o_bg, "base/theme/gadget/pager", + "e/gadget/pager16/popup"); desk = e_desk_current_get(zone); if (desk) edje_object_part_text_set(pp->o_bg, "e.text.label", desk->name); diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c index 5de878274..00f04b22d 100644 --- a/src/modules/sysinfo/batman/batman.c +++ b/src/modules/sysinfo/batman/batman.c @@ -474,10 +474,10 @@ _batman_warning_popup(Instance *inst, int t, double percent) return; } - e_theme_edje_object_set(popup_bg, "base/theme/modules/batman/popup", - "e/modules/batman/popup"); - e_theme_edje_object_set(inst->popup_battery, "base/theme/modules/batman", - "e/modules/batman/main"); + e_theme_edje_object_set(popup_bg, "base/theme/gadget/batman/popup", + "e/gadget/batman/popup"); + e_theme_edje_object_set(inst->popup_battery, "base/theme/gadget/batman", + "e/gadget/batman/main"); if (edje_object_part_exists(elm_layout_edje_get(popup_bg), "e.swallow.batman")) elm_layout_content_set(popup_bg, "e.swallow.batman", inst->popup_battery); else @@ -590,11 +590,11 @@ _batman_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) inst->cfg->batman.o_gadget = elm_layout_add(inst->o_main); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->cfg->batman.o_gadget, - "base/theme/modules/batman", - "e/modules/batman/main_vert"); + "base/theme/gadget/batman", + "e/gadget/batman/main_vert"); else - e_theme_edje_object_set(inst->cfg->batman.o_gadget, "base/theme/modules/batman", - "e/modules/batman/main"); + e_theme_edje_object_set(inst->cfg->batman.o_gadget, "base/theme/gadget/batman", + "e/gadget/batman/main"); E_EXPAND(inst->cfg->batman.o_gadget); E_FILL(inst->cfg->batman.o_gadget); elm_box_pack_end(inst->o_main, inst->cfg->batman.o_gadget); @@ -618,8 +618,8 @@ sysinfo_batman_create(Evas_Object *parent, Instance *inst) inst->cfg->batman.have_power = -2; inst->cfg->batman.o_gadget = elm_layout_add(parent); - e_theme_edje_object_set(inst->cfg->batman.o_gadget, "base/theme/modules/batman", - "e/modules/batman/main"); + e_theme_edje_object_set(inst->cfg->batman.o_gadget, "base/theme/gadget/batman", + "e/gadget/batman/main"); E_EXPAND(inst->cfg->batman.o_gadget); E_FILL(inst->cfg->batman.o_gadget); evas_object_event_callback_add(inst->cfg->batman.o_gadget, diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index 5edbfbfd5..25b821a4a 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -840,11 +840,11 @@ _cpuclock_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) inst->cfg->cpuclock.o_gadget = elm_layout_add(inst->o_main); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, - "base/theme/modules/cpuclock", - "e/modules/cpuclock/main_vert"); + "base/theme/gadget/cpuclock", + "e/gadget/cpuclock/main_vert"); else - e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, "base/theme/modules/cpuclock", - "e/modules/cpuclock/main"); + e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, "base/theme/gadget/cpuclock", + "e/gadget/cpuclock/main"); E_EXPAND(inst->cfg->cpuclock.o_gadget); E_FILL(inst->cfg->cpuclock.o_gadget); edje_object_signal_callback_add(elm_layout_edje_get(inst->cfg->cpuclock.o_gadget), "e,action,governor,next", "*", @@ -872,8 +872,8 @@ sysinfo_cpuclock_create(Evas_Object *parent, Instance *inst) if (inst->cfg->cpuclock.pstate_max == 0) inst->cfg->cpuclock.pstate_max = 101; inst->cfg->cpuclock.o_gadget = elm_layout_add(parent); - e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, "base/theme/modules/cpufreq", - "e/modules/cpufreq/main"); + e_theme_edje_object_set(inst->cfg->cpuclock.o_gadget, "base/theme/gadget/cpufreq", + "e/gadget/cpufreq/main"); E_EXPAND(inst->cfg->cpuclock.o_gadget); E_FILL(inst->cfg->cpuclock.o_gadget); edje_object_signal_callback_add(elm_layout_edje_get(inst->cfg->cpuclock.o_gadget), "e,action,governor,next", "*", diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index 4ad5f61ca..760d931e1 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -195,11 +195,11 @@ _cpumonitor_add_layout(Instance *inst) layout = elm_layout_add(inst->cfg->cpumonitor.o_gadget_box); edje_object_update_hints_set(elm_layout_edje_get(layout), EINA_TRUE); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) - e_theme_edje_object_set(layout, "base/theme/modules/cpumonitor", - "e/modules/cpumonitor/main_vert"); + e_theme_edje_object_set(layout, "base/theme/gadget/cpumonitor", + "e/gadget/cpumonitor/main_vert"); else - e_theme_edje_object_set(layout, "base/theme/modules/cpumonitor", - "e/modules/cpumonitor/main"); + e_theme_edje_object_set(layout, "base/theme/gadget/cpumonitor", + "e/gadget/cpumonitor/main"); E_EXPAND(layout); E_FILL(layout); elm_box_pack_end(inst->cfg->cpumonitor.o_gadget_box, layout); diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index ef44cffa6..c590bb731 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -395,12 +395,12 @@ _memusage_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) inst->cfg->memusage.o_gadget = elm_layout_add(inst->o_main); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->cfg->memusage.o_gadget, - "base/theme/modules/memusage", - "e/modules/memusage/main_vert"); + "base/theme/gadget/memusage", + "e/gadget/memusage/main_vert"); else e_theme_edje_object_set(inst->cfg->memusage.o_gadget, - "base/theme/modules/memusage", - "e/modules/memusage/main"); + "base/theme/gadget/memusage", + "e/gadget/memusage/main"); E_EXPAND(inst->cfg->memusage.o_gadget); E_FILL(inst->cfg->memusage.o_gadget); @@ -422,8 +422,8 @@ sysinfo_memusage_create(Evas_Object *parent, Instance *inst) { inst->cfg->memusage.o_gadget = elm_layout_add(parent); e_theme_edje_object_set(inst->cfg->memusage.o_gadget, - "base/theme/modules/memusage", - "e/modules/memusage/main"); + "base/theme/gadget/memusage", + "e/gadget/memusage/main"); E_EXPAND(inst->cfg->memusage.o_gadget); E_FILL(inst->cfg->memusage.o_gadget); evas_object_event_callback_add(inst->cfg->memusage.o_gadget, diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index ce1494bb1..815b4b650 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -239,11 +239,11 @@ _netstatus_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED inst->cfg->netstatus.o_gadget = elm_layout_add(inst->o_main); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->cfg->netstatus.o_gadget, - "base/theme/modules/netstatus", - "e/modules/netstatus/main_vert"); + "base/theme/gadget/netstatus", + "e/gadget/netstatus/main_vert"); else - e_theme_edje_object_set(inst->cfg->netstatus.o_gadget, "base/theme/modules/netstatus", - "e/modules/netstatus/main"); + e_theme_edje_object_set(inst->cfg->netstatus.o_gadget, "base/theme/gadget/netstatus", + "e/gadget/netstatus/main"); E_EXPAND(inst->cfg->netstatus.o_gadget); E_FILL(inst->cfg->netstatus.o_gadget); elm_box_pack_end(inst->o_main, inst->cfg->netstatus.o_gadget); @@ -258,8 +258,8 @@ Evas_Object * sysinfo_netstatus_create(Evas_Object *parent, Instance *inst) { inst->cfg->netstatus.o_gadget = elm_layout_add(parent); - e_theme_edje_object_set(inst->cfg->netstatus.o_gadget, "base/theme/modules/netstatus", - "e/modules/netstatus/main"); + e_theme_edje_object_set(inst->cfg->netstatus.o_gadget, "base/theme/gadget/netstatus", + "e/gadget/netstatus/main"); E_EXPAND(inst->cfg->netstatus.o_gadget); E_FILL(inst->cfg->netstatus.o_gadget); evas_object_event_callback_add(inst->cfg->netstatus.o_gadget, EVAS_CALLBACK_MOUSE_DOWN, _netstatus_mouse_down_cb, inst); diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c index c859af2b6..4e9aab006 100644 --- a/src/modules/sysinfo/thermal/thermal.c +++ b/src/modules/sysinfo/thermal/thermal.c @@ -231,11 +231,11 @@ _thermal_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) inst->cfg->thermal.o_gadget = elm_layout_add(inst->o_main); if (orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->cfg->thermal.o_gadget, - "base/theme/modules/thermal", - "e/modules/thermal/main_vert"); + "base/theme/gadget/thermal", + "e/gadget/thermal/main_vert"); else - e_theme_edje_object_set(inst->cfg->thermal.o_gadget, "base/theme/modules/thermal", - "e/modules/thermal/main"); + e_theme_edje_object_set(inst->cfg->thermal.o_gadget, "base/theme/gadget/thermal", + "e/gadget/thermal/main"); E_EXPAND(inst->cfg->thermal.o_gadget); E_FILL(inst->cfg->thermal.o_gadget); elm_box_pack_end(inst->o_main, inst->cfg->thermal.o_gadget); @@ -252,8 +252,8 @@ sysinfo_thermal_create(Evas_Object *parent, Instance *inst) inst->cfg->thermal.have_temp = EINA_FALSE; inst->cfg->thermal.o_gadget = elm_layout_add(parent); - e_theme_edje_object_set(inst->cfg->thermal.o_gadget, "base/theme/modules/temperature", - "e/modules/temperature/main"); + e_theme_edje_object_set(inst->cfg->thermal.o_gadget, "base/theme/gadget/temperature", + "e/gadget/temperature/main"); E_EXPAND(inst->cfg->thermal.o_gadget); E_FILL(inst->cfg->thermal.o_gadget); evas_object_event_callback_add(inst->cfg->thermal.o_gadget, EVAS_CALLBACK_RESIZE, _thermal_resize_cb, inst); diff --git a/src/modules/xkbswitch/gadget/xkbswitch.c b/src/modules/xkbswitch/gadget/xkbswitch.c index 71af9aebb..8ebcb2bbe 100644 --- a/src/modules/xkbswitch/gadget/xkbswitch.c +++ b/src/modules/xkbswitch/gadget/xkbswitch.c @@ -39,8 +39,8 @@ _xkbg_update_icon(int cur_group) inst->layout = e_config->xkb.current_layout; E_FREE_FUNC(inst->o_xkbflag, evas_object_del); e_theme_edje_object_set(inst->o_xkbswitch, - "base/theme/modules/xkbswitch", - "e/modules/xkbswitch/noflag"); + "base/theme/gadget/xkbswitch", + "e/gadget/xkbswitch/noflag"); elm_layout_text_set(inst->o_xkbswitch, "e.text.label", cl->name); } @@ -54,8 +54,8 @@ _xkbg_update_icon(int cur_group) if (!inst->o_xkbflag) inst->o_xkbflag = e_icon_add(evas_object_evas_get(inst->o_xkbswitch)); e_theme_edje_object_set(inst->o_xkbswitch, - "base/theme/modules/xkbswitch", - "e/modules/xkbswitch/main"); + "base/theme/gadget/xkbswitch", + "e/gadget/xkbswitch/main"); e_xkb_e_icon_flag_setup(inst->o_xkbflag, cl->name); elm_layout_content_set(inst->o_xkbswitch, "e.swallow.flag", inst->o_xkbflag); @@ -225,23 +225,23 @@ _xkbg_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUS { if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->o_xkbswitch, - "base/theme/modules/xkbswitch", - "e/modules/xkbswitch/noflag_vert"); + "base/theme/gadget/xkbswitch", + "e/gadget/xkbswitch/noflag_vert"); else e_theme_edje_object_set(inst->o_xkbswitch, - "base/theme/modules/xkbswitch", - "e/modules/xkbswitch/noflag"); + "base/theme/gadget/xkbswitch", + "e/gadget/xkbswitch/noflag"); } else { if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL) e_theme_edje_object_set(inst->o_xkbswitch, - "base/theme/modules/xkbswitch", - "e/modules/xkbswitch/main_vert"); + "base/theme/gadget/xkbswitch", + "e/gadget/xkbswitch/main_vert"); else e_theme_edje_object_set(inst->o_xkbswitch, - "base/theme/modules/xkbswitch", - "e/modules/xkbswitch/main"); + "base/theme/gadget/xkbswitch", + "e/gadget/xkbswitch/main"); } elm_layout_text_set(inst->o_xkbswitch, "e.text.label", inst->layout ? e_xkb_layout_name_reduce(inst->layout->name) : _("NONE")); --
