fix notification icon
fix module icon added youtube icon SVN revision: 48732
This commit is contained in:
parent
3bd08450d6
commit
9ac1da4765
71
e-module.edc
71
e-module.edc
|
@ -1,53 +1,56 @@
|
||||||
images
|
images
|
||||||
{
|
{
|
||||||
image: "module_icon.png" COMP;
|
image: "module_icon.png" COMP;
|
||||||
image: "google.png" COMP;
|
image: "google.png" COMP;
|
||||||
image: "wikipedia.png" COMP;
|
image: "wikipedia.png" COMP;
|
||||||
|
image: "youtube.png" COMP;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ICON(NAME, FILE, SIZE) \
|
#define ICON(NAME, FILE, SIZE) \
|
||||||
group { \
|
group { \
|
||||||
name: NAME ; \
|
name: NAME ; \
|
||||||
max: SIZE SIZE; \
|
max: SIZE SIZE; \
|
||||||
parts { \
|
parts { \
|
||||||
part { \
|
part { \
|
||||||
name: "icon"; \
|
name: "icon"; \
|
||||||
repeat_events: 1; \
|
repeat_events: 1; \
|
||||||
description { \
|
description { \
|
||||||
state: "default" 0.0; \
|
state: "default" 0.0; \
|
||||||
aspect: 1.0 1.0; \
|
aspect: 1.0 1.0; \
|
||||||
aspect_preference: BOTH; \
|
aspect_preference: BOTH; \
|
||||||
image.image: FILE COMP; \
|
image.image: FILE COMP; \
|
||||||
image.normal: FILE ; \
|
image.normal: FILE ; \
|
||||||
|
} \
|
||||||
|
} \
|
||||||
} \
|
} \
|
||||||
} \
|
}
|
||||||
} \
|
|
||||||
}
|
|
||||||
|
|
||||||
collections
|
collections
|
||||||
{
|
{
|
||||||
group
|
group
|
||||||
{
|
{
|
||||||
name: "icon";
|
name: "icon";
|
||||||
max: 24 24;
|
max: 24 24;
|
||||||
parts
|
parts
|
||||||
{
|
{
|
||||||
part
|
part
|
||||||
{
|
{
|
||||||
name: "image";
|
name: "image";
|
||||||
mouse_events: 0;
|
mouse_events: 0;
|
||||||
type: IMAGE;
|
type: IMAGE;
|
||||||
description
|
description
|
||||||
{
|
{
|
||||||
state: "default" 0.0;
|
aspect: 1.0 1.0;
|
||||||
image.normal: "module_icon.png";
|
aspect_preference: BOTH;
|
||||||
|
state: "default" 0.0;
|
||||||
|
image.normal: "module_icon.png";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ICON("wikipedia", "wikipedia.png", 128)
|
ICON("wikipedia", "wikipedia.png", 128);
|
||||||
ICON("google", "google.png", 128)
|
ICON("google", "google.png", 128);
|
||||||
ICON("feeling-lucky", "google.png", 128)
|
ICON("feeling-lucky", "google.png", 128);
|
||||||
|
ICON("youtube", "youtube.png", 128);
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 56 KiB |
|
@ -646,7 +646,7 @@ _youtube_dl_finish(Youtube_Data *yd, int abort)
|
||||||
|
|
||||||
if (abort)
|
if (abort)
|
||||||
{
|
{
|
||||||
_send_notification(yd->id, "music", N_("Abort download"),
|
_send_notification(yd->id, "emblem-sound", N_("Abort download"),
|
||||||
yd->label, -1);
|
yd->label, -1);
|
||||||
|
|
||||||
if (yd->exe1) ecore_exe_kill(yd->exe1);
|
if (yd->exe1) ecore_exe_kill(yd->exe1);
|
||||||
|
@ -674,7 +674,7 @@ _youtube_dl_timer(void *d)
|
||||||
Youtube_Data *yd = d;
|
Youtube_Data *yd = d;
|
||||||
struct stat s;
|
struct stat s;
|
||||||
|
|
||||||
if (yd->ready || yd->tries++ > 20)
|
if (yd->ready || yd->tries++ > 10)
|
||||||
{
|
{
|
||||||
_youtube_dl_finish(yd, 1);
|
_youtube_dl_finish(yd, 1);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -684,17 +684,17 @@ _youtube_dl_timer(void *d)
|
||||||
{
|
{
|
||||||
if (s.st_size < 262144)
|
if (s.st_size < 262144)
|
||||||
{
|
{
|
||||||
if (!yd->ready && yd->tries > 10 && s.st_size < 1024)
|
if (!yd->ready && yd->tries > 5 && s.st_size < 1024)
|
||||||
{
|
{
|
||||||
_youtube_dl_finish(yd, 1);
|
_youtube_dl_finish(yd, 1);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
char buf[128];
|
char buf[128];
|
||||||
snprintf(buf, sizeof(buf), N_("Got %d kbytes of\n%s"),
|
snprintf(buf, sizeof(buf), N_("Got %d kbytes of"),
|
||||||
((unsigned int)s.st_size / 1024), yd->label);
|
((unsigned int)s.st_size / 1024));
|
||||||
|
|
||||||
_send_notification(yd->id, "music", buf, yd->label, 5000);
|
_send_notification(yd->id, "emblem-sound", buf, yd->label, 5000);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -709,14 +709,14 @@ _youtube_dl_timer(void *d)
|
||||||
{
|
{
|
||||||
act->it1.item = EVRY_ITEM(f);
|
act->it1.item = EVRY_ITEM(f);
|
||||||
act->action(act);
|
act->action(act);
|
||||||
_send_notification(yd->id, "music", N_("Enqueue"), yd->label, -1);
|
_send_notification(yd->id, "emblem-sound", N_("Enqueue"), yd->label, -1);
|
||||||
}
|
}
|
||||||
if ((yd->method == YOUTUBE_DL_PLAY) &&
|
if ((yd->method == YOUTUBE_DL_PLAY) &&
|
||||||
(act = evry_action_find(N_("Play File"))))
|
(act = evry_action_find(N_("Play File"))))
|
||||||
{
|
{
|
||||||
act->it1.item = EVRY_ITEM(f);
|
act->it1.item = EVRY_ITEM(f);
|
||||||
act->action(act);
|
act->action(act);
|
||||||
_send_notification(yd->id, "music", N_("Play"), yd->label, -1);
|
_send_notification(yd->id, "emblem-sound", N_("Play"), yd->label, -1);
|
||||||
}
|
}
|
||||||
IF_RELEASE(f->path);
|
IF_RELEASE(f->path);
|
||||||
IF_RELEASE(f->mime);
|
IF_RELEASE(f->mime);
|
||||||
|
@ -746,7 +746,7 @@ _youtube_dl_cb_del(void *data, int type __UNUSED__, void *event)
|
||||||
yd->exe1 = NULL;
|
yd->exe1 = NULL;
|
||||||
yd->exe2 = NULL;
|
yd->exe2 = NULL;
|
||||||
|
|
||||||
_send_notification(yd->id, "music", N_("Finished download"),
|
_send_notification(yd->id, "emblem-sound", N_("Finished download"),
|
||||||
yd->label, -1);
|
yd->label, -1);
|
||||||
|
|
||||||
_youtube_dl_finish(yd, 0);
|
_youtube_dl_finish(yd, 0);
|
||||||
|
@ -819,7 +819,7 @@ _youtube_dl_data_cb(Url_Data *dd)
|
||||||
mkfifo(fifo, 0666);
|
mkfifo(fifo, 0666);
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf),
|
snprintf(buf, sizeof(buf),
|
||||||
"mplayer %s -cache 256 -cache-min 10 "
|
"mplayer %s -msglevel all=2 -cache 256 -cache-min 10 "
|
||||||
"-ao pcm:fast:file=%s -vo none </dev/null",
|
"-ao pcm:fast:file=%s -vo none </dev/null",
|
||||||
url, fifo);
|
url, fifo);
|
||||||
yd->exe1 = ecore_exe_run(buf, yd);
|
yd->exe1 = ecore_exe_run(buf, yd);
|
||||||
|
@ -841,7 +841,7 @@ _youtube_dl_data_cb(Url_Data *dd)
|
||||||
|
|
||||||
download_handlers = eina_list_append(download_handlers, yd);
|
download_handlers = eina_list_append(download_handlers, yd);
|
||||||
|
|
||||||
_send_notification(yd->id, "music", N_("Start download"), yd->label, -1);
|
_send_notification(yd->id, "emblem-sound", N_("Start download"), yd->label, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
finish:
|
finish:
|
||||||
|
@ -905,7 +905,7 @@ _youtube_dl_action(Evry_Action *act)
|
||||||
(method == YOUTUBE_DL_ENQ)) &&
|
(method == YOUTUBE_DL_ENQ)) &&
|
||||||
(youtube_dl_active > 1))
|
(youtube_dl_active > 1))
|
||||||
{
|
{
|
||||||
_send_notification(1337, "music", N_("Enqueue files for download"), "", -1);
|
_send_notification(1337, "emblem-sound", N_("Enqueue files for download"), "", -1);
|
||||||
youtube_dl_queue = eina_list_append(youtube_dl_queue, yd);
|
youtube_dl_queue = eina_list_append(youtube_dl_queue, yd);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1124,19 +1124,19 @@ _plugins_init(void)
|
||||||
ACTION_NEW(N_("Feeling Lucky"), EVRY_TYPE_TEXT, "feeling-lucky",
|
ACTION_NEW(N_("Feeling Lucky"), EVRY_TYPE_TEXT, "feeling-lucky",
|
||||||
_action, NULL, ACT_FEELING_LUCKY);
|
_action, NULL, ACT_FEELING_LUCKY);
|
||||||
|
|
||||||
ACTION_NEW(N_("Watch on Youtube"), WEBLINK, "feeling-lucky",
|
ACTION_NEW(N_("Watch on Youtube"), WEBLINK, "youtube",
|
||||||
_action, _youtube_dl_check, ACT_YOUTUBE);
|
_action, _youtube_dl_check, ACT_YOUTUBE);
|
||||||
|
|
||||||
ACTION_NEW(N_("Download as Audio"), WEBLINK, "feeling-lucky",
|
ACTION_NEW(N_("Download as Audio"), WEBLINK, "youtube",
|
||||||
_youtube_dl_action, _youtube_dl_check, YOUTUBE_DL);
|
_youtube_dl_action, _youtube_dl_check, YOUTUBE_DL);
|
||||||
|
|
||||||
ACTION_NEW(N_("Play Video"), WEBLINK, "feeling-lucky",
|
ACTION_NEW(N_("Play Video"), WEBLINK, "youtube",
|
||||||
_youtube_dl_action, _youtube_dl_check, YOUTUBE_PLAY);
|
_youtube_dl_action, _youtube_dl_check, YOUTUBE_PLAY);
|
||||||
|
|
||||||
ACTION_NEW(N_("Download and enqueue"), WEBLINK, "feeling-lucky",
|
ACTION_NEW(N_("Download and enqueue"), WEBLINK, "youtube",
|
||||||
_youtube_dl_action, _youtube_dl_check, YOUTUBE_DL_ENQ);
|
_youtube_dl_action, _youtube_dl_check, YOUTUBE_DL_ENQ);
|
||||||
|
|
||||||
ACTION_NEW(N_("Download and play"), WEBLINK, "feeling-lucky",
|
ACTION_NEW(N_("Download and play"), WEBLINK, "youtube",
|
||||||
_youtube_dl_action, _youtube_dl_check, YOUTUBE_DL_PLAY);
|
_youtube_dl_action, _youtube_dl_check, YOUTUBE_DL_PLAY);
|
||||||
|
|
||||||
ACTION_NEW(N_("Upload Image"), EVRY_TYPE_FILE, "go-next",
|
ACTION_NEW(N_("Upload Image"), EVRY_TYPE_FILE, "go-next",
|
||||||
|
|
Loading…
Reference in New Issue