enlightenment/empc
enlightenment
/
empc
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add cancel signal for main theme

This commit is contained in:
zmike 2014-11-05 01:01:49 -05:00
parent 6680a93ecf
commit a977f8946d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/themes/empc.edc
View File

@ -162,6 +162,15 @@ collections {
}
}
}
program { "bg_chooser_cancel";
signal: "empc,bg_chooser,cancel"; source: "empc";
script {
if (get_int(bg_chooser)) {
emit("empc,bg_chooser,canceled", "empc");
run_program(get_program_id("bg_chooser_inactive"));
}
}
}
program { signal: "mouse,down,1,double"; source: EMPC_SWALLOW_BACKGROUND;
script {
cancel_timer(get_int(timer_left_click_action));

9
src/bin/empc.c
View File

@ -2725,7 +2725,7 @@ key_down(void *data EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Key *ev)
else if (bgchooser)
{
bgselector_cancel(elm_object_part_content_get(layout, EMPC_SWALLOW_BACKGROUND));
elm_layout_signal_emit(layout, "empc,bg_chooser,stop", "empc");
elm_layout_signal_emit(layout, "empc,bg_chooser,cancel", "empc");
}
return (!ctxpopup) && (!bgchooser);
}
@ -2948,11 +2948,12 @@ bg_chooser_show(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char
}
static void
bg_chooser_hide(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
bg_chooser_hide(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig, const char *src EINA_UNUSED)
{
Evas_Object *bgs, *img;
Eina_Stringshare *artist, *album;
if (!bgchooser) return;
bgs = elm_object_part_content_get(layout, EMPC_SWALLOW_BACKGROUND);
bgselector_prune(bgs);
bgselector_active_set(bgs, EINA_FALSE);
@ -2961,8 +2962,9 @@ bg_chooser_hide(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char
album = bgselector_album_get(bgs);
metadata_fetch_cancel(bgfetch, bgs, bg_add, NULL);
save_image(EINA_TRUE, img, NULL, artist, album, bg_update_signal);
bgchooser = EINA_FALSE;
if (!strcmp(sig + sizeof("empc,bg_chooser,") - 1, "canceled")) return;
save_image(EINA_TRUE, img, NULL, artist, album, bg_update_signal);
bg_update_propogate(artist, album);
}
@ -3240,6 +3242,7 @@ main(int argc, char *argv[])
elm_object_signal_callback_add(layout, "empc,filesystem,hiding", "empc", filesystem_hiding, NULL);
elm_object_signal_callback_add(layout, "empc,bg_chooser,active", "empc", bg_chooser_show, NULL);
elm_object_signal_callback_add(layout, "empc,bg_chooser,inactive", "empc", bg_chooser_hide, NULL);
elm_object_signal_callback_add(layout, "empc,bg_chooser,canceled", "empc", bg_chooser_hide, NULL);
elm_object_signal_callback_add(layout, "empc,bg_chooser,next", "empc", bg_chooser_next, NULL);
elm_object_signal_callback_add(layout, "empc,bg_chooser,prev", "empc", bg_chooser_prev, NULL);