raster pushed a commit to branch feature/themes/flat.

http://git.enlightenment.org/core/efl.git/commit/?id=10a1fe54529fbf575e9f6b95e21cd4d69c926056

commit 10a1fe54529fbf575e9f6b95e21cd4d69c926056
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Wed Sep 2 17:48:39 2020 +0100

    TH - mooor icons
---
 data/elementary/themes/edc/O/efm_icons.edc | 24 +-----------------------
 data/elementary/themes/edc/icons.edc       | 21 +++++++++++++++++++++
 data/elementary/themes/ic.edc              | 16 +++-------------
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/data/elementary/themes/edc/O/efm_icons.edc 
b/data/elementary/themes/edc/O/efm_icons.edc
index ae96478f13..f5212f97ba 100644
--- a/data/elementary/themes/edc/O/efm_icons.edc
+++ b/data/elementary/themes/edc/O/efm_icons.edc
@@ -353,23 +353,14 @@
       } \
    }
 
-//Executable//
-
-   
EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png",
 (114/114), (114/114), 240, 0.5);
-   
EFM_MIME_ICON_SIMPLE("application/x-ms-dos-executable","efm_generic_icon_content_executable.png",
 (114/114), (114/114), 240, 0.5);
-
 //Libraries//
 
    
EFM_MIME_ICON_SIMPLE("application/x-sharedlib","efm_generic_icon_content_lib.png",
 (114/114), (114/114), 240, 0.5);
    
EFM_MIME_ICON_SIMPLE("application/x-shared-library-la","efm_generic_icon_content_lib.png",
 (114/114), (114/114), 240, 0.5);
 
 //Unknown//
-   
-   
EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png",
 (100/154), (100/154), 240, 0.5);
 
-//Trash//
-
-   
EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png",
 (114/142), (114/142), 240, 0.5);
+   
EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png",
 (100/154), (100/154), 240, 0.5);
 
 //Install//
 
@@ -431,19 +422,6 @@
       }                                               \
    }
 
-//   MIMEICON("inode/directory","icon_efm_folder.png", 128);
-
    MIMEICON("application/x-deb","icon_mime_deb.png", 128);
-   MIMEICON("application/x-bzip","icon_mime_package.png", 128);
-   MIMEICON("application/zip","icon_mime_package.png", 128);
-   MIMEICON("application/x-gzip","icon_mime_package.png", 128);
-   MIMEICON("application/x-bzip-compressed-tar","icon_mime_package.png", 128);
-   MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
-   MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
-   MIMEICON("application/x-tar","icon_mime_package.png", 128);
-   MIMEICON("application/x-rar","icon_mime_package.png", 128);
-
-   MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
-   MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
 
 
diff --git a/data/elementary/themes/edc/icons.edc 
b/data/elementary/themes/edc/icons.edc
index e07d9d45f6..a46c3fac00 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -240,14 +240,35 @@
    ICON("inode/socket", "i-device-socket")
    ICON("inode/symlink", "i-symlink")
 
+   ICON("application/x-raw-disk-image", "i-drive-cd")
+
    ICON("application/octet-stream", "i-file2")
 
+   ICON("application/x-trash", "i-efm-trash")
+
    ICON("text/plain", "i-efm-txt")
    ICON("text/x-csrc", "i-efm-c")
    ICON("text/x-chdr", "i-efm-h")
    ICON("text/x-c++src", "i-efm-cpp")
    ICON("text/x-c++hdr", "i-efm-hpp")
+
    ICON("application/x-shellscript", "i-efm-sh")
+   ICON("application/x-executable", "i-efm-exe")
+   ICON("application/x-ms-dos-executable", "i-efm-exe")
+
+   ICON("application/zip", "i-efm-zip")
+   ICON("application/x-rar", "i-efm-zip")
+   ICON("application/x-gzip", "i-efm-zip")
+   ICON("application/x-bzip", "i-efm-zip")
+   ICON("application/x-7z-compressed", "i-efm-zip")
+   ICON("application/x-xz-compressed", "i-efm-zip")
+   ICON("application/x-tar", "i-efm-zip")
+   ICON("application/x-compressed-tar", "i-efm-zip")
+   ICON("application/x-bzip-compressed-tar", "i-efm-zip")
+   ICON("application/x-bzip2-compressed-tar", "i-efm-zip")
+   ICON("application/x-7z-compressed-tar", "i-efm-zip")
+   ICON("application/x-xz-compressed-tar", "i-efm-zip")
+   ICON("application/vnd.ms-cab-compressed", "i-efm-zip")
 #undef ICON
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index ec0761d705..03112c4468 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -167,6 +167,9 @@ I160("i-efm-h", "efm-h")
 I160("i-efm-cpp", "efm-cpp")
 I160("i-efm-hpp", "efm-hpp")
 I160("i-efm-sh", "efm-sh")
+I160("i-efm-zip", "efm-zip")
+I160("i-efm-exe", "efm-exe")
+I160("i-efm-trash", "efm-trash")
 
 I160("i-folder-open", "folder-open")
 I160("i-file-properties", "file-properties")
@@ -747,18 +750,5 @@ I160("i-unknown", "unknown")
       }                                               \
    }
 
-//   MIMEICON("inode/directory","icon_efm_folder.png", 128);
-
    MIMEICON("application/x-deb","icon_mime_deb.png", 128);
-   MIMEICON("application/x-bzip","icon_mime_package.png", 128);
-   MIMEICON("application/zip","icon_mime_package.png", 128);
-   MIMEICON("application/x-gzip","icon_mime_package.png", 128);
-   MIMEICON("application/x-bzip-compressed-tar","icon_mime_package.png", 128);
-   MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
-   MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
-   MIMEICON("application/x-tar","icon_mime_package.png", 128);
-   MIMEICON("application/x-rar","icon_mime_package.png", 128);
-
-   MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
-   MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
 #endif

-- 


Reply via email to