enlightenment
/
enlightenment-module-places
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix icons for DVD, BD and Audio CD

This commit is contained in:
Davide Andreoli 2021-04-25 07:55:18 +02:00
parent 0847d1ebcf
commit 1e63c232bb
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e-module-places.edc
View File

@ -8,7 +8,6 @@ images
image: "tag_fat.png" COMP;
image: "tag_hfs.png" COMP;
image: "tag_ufs.png" COMP;
image: "tag_dvd.png" COMP;
image: "header_bg.png" COMP;
image: "header_down.png" COMP;
image: "home.png" COMP;
@ -409,14 +408,6 @@ collections
image.normal: "tag_ufs.png";
color: 255 255 255 240;
}
description { state: "dvd" 0.0;
inherit: "default" 0.0;
visible: 1;
image.normal: "tag_dvd.png";
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 0.5;
color: 255 255 255 240;
}
}
part { name: "gauge_bg";
mouse_events: 0;
@ -718,12 +709,6 @@ collections
action: STATE_SET "ufs" 0.0;
target: "icon_tag";
}
program { name: "set_tag_dvd";
signal: "icon,tag,dvd";
source: "places";
action: STATE_SET "dvd" 0.0;
target: "icon_tag";
}
program { name: "set_separator_horiz";
signal: "separator,set,horiz";
source: "places";

BIN
images/tag_dvd.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 892 B

22
src/e_mod_places.c
View File

@ -379,11 +379,23 @@ places_fill_box(Evas_Object *main, Eina_Bool horiz)
icon = e_icon_add(evas_object_evas_get(main));
f1 = f2 = f3 = NULL;
/* optical discs */
// TODO more icons: dvd, blueray....
if (eina_streq(vol->drive_type, "cdrom") ||
eina_streq(vol->drive_type, "optical_cd"))
if (eina_str_has_prefix(vol->drive_type, "optical_bd"))
{
f1 = "media"; f2 = "optical"; // OR media-optical ??
f1 = "media"; f2 = "optical"; f3 = "bd";
}
else if (eina_str_has_prefix(vol->drive_type, "optical_dvd"))
{
f1 = "media"; f2 = "optical"; f3 = "dvd";
}
else if (eina_str_has_prefix(vol->drive_type, "optical_cd") &&
!eina_streq(vol->fstype, "iso9660"))
{
f1 = "media"; f2 = "optical"; f3 = "audio";
}
else if (eina_str_has_prefix(vol->drive_type, "cdrom") ||
eina_str_has_prefix(vol->drive_type, "optical"))
{
f1 = "media"; f2 = "optical";
}
/* flash cards */
else if (eina_streq(vol->drive_type, "sd_mmc") ||
@ -455,8 +467,6 @@ places_fill_box(Evas_Object *main, Eina_Bool horiz)
else if (eina_streq(vol->fstype, "hfs") ||
eina_streq(vol->fstype, "hfsplus"))
edje_object_signal_emit(o, "icon,tag,hfs", "places");
else if (eina_streq(vol->fstype, "udf"))
edje_object_signal_emit(o, "icon,tag,dvd", "places");
// update labels, gauge and button
_places_volume_object_update(vol, o);