summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2021-04-25 07:55:18 +0200
committerDave Andreoli <dave@gurumeditation.it>2021-04-25 07:55:18 +0200
commit1e63c232bb60c360955f16490bd7f0efb6359739 (patch)
tree818e0b9e34f4177c4dbf5bcfdf4d9604bb4134cd
parent0847d1ebcf91f9cd9473ccbf424aae8de6650449 (diff)
Fix icons for DVD, BD and Audio CD
-rw-r--r--e-module-places.edc15
-rw-r--r--images/tag_dvd.pngbin892 -> 0 bytes
-rw-r--r--src/e_mod_places.c22
3 files changed, 16 insertions, 21 deletions
diff --git a/e-module-places.edc b/e-module-places.edc
index fc65b8f..f368e58 100644
--- a/e-module-places.edc
+++ b/e-module-places.edc
@@ -8,7 +8,6 @@ images
8 image: "tag_fat.png" COMP; 8 image: "tag_fat.png" COMP;
9 image: "tag_hfs.png" COMP; 9 image: "tag_hfs.png" COMP;
10 image: "tag_ufs.png" COMP; 10 image: "tag_ufs.png" COMP;
11 image: "tag_dvd.png" COMP;
12 image: "header_bg.png" COMP; 11 image: "header_bg.png" COMP;
13 image: "header_down.png" COMP; 12 image: "header_down.png" COMP;
14 image: "home.png" COMP; 13 image: "home.png" COMP;
@@ -409,14 +408,6 @@ collections
409 image.normal: "tag_ufs.png"; 408 image.normal: "tag_ufs.png";
410 color: 255 255 255 240; 409 color: 255 255 255 240;
411 } 410 }
412 description { state: "dvd" 0.0;
413 inherit: "default" 0.0;
414 visible: 1;
415 image.normal: "tag_dvd.png";
416 rel1.relative: 0.0 0.0;
417 rel2.relative: 1.0 0.5;
418 color: 255 255 255 240;
419 }
420 } 411 }
421 part { name: "gauge_bg"; 412 part { name: "gauge_bg";
422 mouse_events: 0; 413 mouse_events: 0;
@@ -718,12 +709,6 @@ collections
718 action: STATE_SET "ufs" 0.0; 709 action: STATE_SET "ufs" 0.0;
719 target: "icon_tag"; 710 target: "icon_tag";
720 } 711 }
721 program { name: "set_tag_dvd";
722 signal: "icon,tag,dvd";
723 source: "places";
724 action: STATE_SET "dvd" 0.0;
725 target: "icon_tag";
726 }
727 program { name: "set_separator_horiz"; 712 program { name: "set_separator_horiz";
728 signal: "separator,set,horiz"; 713 signal: "separator,set,horiz";
729 source: "places"; 714 source: "places";
diff --git a/images/tag_dvd.png b/images/tag_dvd.png
deleted file mode 100644
index 4eafaef..0000000
--- a/images/tag_dvd.png
+++ /dev/null
Binary files differ
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index 2dcc227..342d560 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -379,11 +379,23 @@ places_fill_box(Evas_Object *main, Eina_Bool horiz)
379 icon = e_icon_add(evas_object_evas_get(main)); 379 icon = e_icon_add(evas_object_evas_get(main));
380 f1 = f2 = f3 = NULL; 380 f1 = f2 = f3 = NULL;
381 /* optical discs */ 381 /* optical discs */
382 // TODO more icons: dvd, blueray.... 382 if (eina_str_has_prefix(vol->drive_type, "optical_bd"))
383 if (eina_streq(vol->drive_type, "cdrom") ||
384 eina_streq(vol->drive_type, "optical_cd"))
385 { 383 {
386 f1 = "media"; f2 = "optical"; // OR media-optical ?? 384 f1 = "media"; f2 = "optical"; f3 = "bd";
385 }
386 else if (eina_str_has_prefix(vol->drive_type, "optical_dvd"))
387 {
388 f1 = "media"; f2 = "optical"; f3 = "dvd";
389 }
390 else if (eina_str_has_prefix(vol->drive_type, "optical_cd") &&
391 !eina_streq(vol->fstype, "iso9660"))
392 {
393 f1 = "media"; f2 = "optical"; f3 = "audio";
394 }
395 else if (eina_str_has_prefix(vol->drive_type, "cdrom") ||
396 eina_str_has_prefix(vol->drive_type, "optical"))
397 {
398 f1 = "media"; f2 = "optical";
387 } 399 }
388 /* flash cards */ 400 /* flash cards */
389 else if (eina_streq(vol->drive_type, "sd_mmc") || 401 else if (eina_streq(vol->drive_type, "sd_mmc") ||
@@ -455,8 +467,6 @@ places_fill_box(Evas_Object *main, Eina_Bool horiz)
455 else if (eina_streq(vol->fstype, "hfs") || 467 else if (eina_streq(vol->fstype, "hfs") ||
456 eina_streq(vol->fstype, "hfsplus")) 468 eina_streq(vol->fstype, "hfsplus"))
457 edje_object_signal_emit(o, "icon,tag,hfs", "places"); 469 edje_object_signal_emit(o, "icon,tag,hfs", "places");
458 else if (eina_streq(vol->fstype, "udf"))
459 edje_object_signal_emit(o, "icon,tag,dvd", "places");
460 470
461 // update labels, gauge and button 471 // update labels, gauge and button
462 _places_volume_object_update(vol, o); 472 _places_volume_object_update(vol, o);