diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc index 23cd213a93..42b75bb0a8 100644 --- a/data/elementary/themes/edc/elm/icon_fdo.edc +++ b/data/elementary/themes/edc/elm/icon_fdo.edc @@ -24,7 +24,6 @@ * */ - // Single FDO icon #define ICO1(Cat, Name, Size) \ group { name: "elm/icon/"##Name##"/default"; \ @@ -37,7 +36,6 @@ aspect: 1.0 1.0; aspect_preference: BOTH; \ } } } } - // FDO icon with small and normal source (16 and 128px) #define ICO2(Cat, Name) \ group { name: "elm/icon/"##Name##"/default"; \ @@ -61,7 +59,6 @@ aspect: 1.0 1.0; aspect_preference: BOTH; \ } } } } - // Flag icon #define FLAG(Cat, Name) \ group { name: "elm/icon/"##Name##"/default"; \ @@ -74,18 +71,6 @@ aspect_preference: SOURCE; \ } } } } - -//// places ///////////////////////////////////////////////////////////////// -#define CTX "places" -ICO2(CTX, "folder-recent") /* */ -ICO2(CTX, "folder-documents") /* */ -ICO2(CTX, "folder-pictures") /* */ -ICO2(CTX, "folder-music") /* */ -ICO2(CTX, "folder-videos") /* */ -ICO2(CTX, "folder-visiting") /* spec have this icon in the Status category */ -#undef CTX - - //// emblems //////////////////////////////////////////////////////////////// #define CTX "emblems" ICO1(CTX, "emblem-default", 96) @@ -104,7 +89,6 @@ ICO1(CTX, "emblem-synchronized", 96) ICO1(CTX, "emblem-synchronizing", 96) /* */ #undef CTX - //// actions //////////////////////////////////////////////////////////////// #define CTX "actions" ICO1(CTX, "address-book-new", 128) @@ -236,10 +220,8 @@ ICO1(CTX, "zoom-original", 128) ICO1(CTX, "zoom-fit", 128) /* */ ICO1(CTX, "zoom-fill", 128) /* */ ICO1(CTX, "zoom-fit-best", 128) - #undef CTX - //// status ///////////////////////////////////////////////////////////// #define CTX "status" ICO1(CTX, "appointment-missed", 128) @@ -343,13 +325,11 @@ ICO1(CTX, "non-starred", 128) /* */ // folder-drag-accept /* in the Places category */ #undef CTX - //// animations ///////////////////////////////////////////////////////////// #define CTX "animations" // TODO process-working #undef CTX - //// applications /////////////////////////////////////////////////////////// #define CTX "apps" // TODO accessories-calculator @@ -370,7 +350,6 @@ ICO1(CTX, "preferences-desktop-wallpaper", 64) ICO1(CTX, "system-file-manager", 64) #undef CTX - //// categories ///////////////////////////////////////////////////////////// #define CTX "categories" ICO2(CTX, "applications-accessories") @@ -394,7 +373,6 @@ ICO1(CTX, "preferences-other", 128) // TODO system-help #undef CTX - //// devices //////////////////////////////////////////////////////////////// #define CTX "devices" ICO1(CTX, "audio-card", 128) @@ -443,7 +421,6 @@ ICO1(CTX, "network-wired", 128) ICO1(CTX, "network-wireless", 128) #undef CTX - //// emotions /////////////////////////////////////////////////////////////// #define CTX "emotions" // TODO face-angel @@ -469,7 +446,6 @@ ICO1(CTX, "network-wireless", 128) // TODO face-worried #undef CTX - //// international ////////////////////////////////////////////////////////// // Country flags, ISO 3166-1 alpha-2 country code (flag-aa) #define CTX "intl" @@ -570,4 +546,3 @@ FLAG(CTX, "flag-za") #undef ICO1 #undef ICO2 #undef FLAG - diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc index 93c9bf0d93..1ad8322b9a 100644 --- a/data/elementary/themes/edc/icons.edc +++ b/data/elementary/themes/edc/icons.edc @@ -456,5 +456,11 @@ ICON("folder-remote", "i-folder-world") ICON("folder-open", "i-folder-open") ICON("folder-home", "i-folder-home") ICON("folder-download", "i-folder-download") +ICON("folder-recent", "i-folder-recent") +ICON("folder-documents", "i-folder-documents") +ICON("folder-pictures", "i-folder-pictures") +ICON("folder-music", "i-folder-music") +ICON("folder-videos", "i-folder-videos") +ICON("folder-visiting", "i-folder-visiting") #undef ICON diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc index e70892513e..2a8ae1cf3a 100644 --- a/data/elementary/themes/ic.edc +++ b/data/elementary/themes/ic.edc @@ -291,6 +291,12 @@ I160("i-folder-dropin", "folder-dropin") I160("i-folder-world", "folder-world") I160("i-folder-home", "folder-home") I160("i-folder-download", "folder-download") +I160("i-folder-recent", "folder-recent") +I160("i-folder-documents", "folder-documents") +I160("i-folder-pictures", "folder-pictures") +I160("i-folder-music", "folder-music") +I160("i-folder-videos", "folder-videos") +I160("i-folder-visiting", "folder-visiting") /////////////////////////////////////////////////////////////////////////////// // larger mono icons (mostly efm or settings) diff --git a/data/elementary/themes/img/folder-documents.svg b/data/elementary/themes/img/folder-documents.svg new file mode 100644 index 0000000000..06f52ecc51 --- /dev/null +++ b/data/elementary/themes/img/folder-documents.svg @@ -0,0 +1,153 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/folder-music.svg b/data/elementary/themes/img/folder-music.svg new file mode 100644 index 0000000000..bd1c343141 --- /dev/null +++ b/data/elementary/themes/img/folder-music.svg @@ -0,0 +1,142 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/folder-pictures.svg b/data/elementary/themes/img/folder-pictures.svg new file mode 100644 index 0000000000..496f434b3f --- /dev/null +++ b/data/elementary/themes/img/folder-pictures.svg @@ -0,0 +1,152 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/folder-recent.svg b/data/elementary/themes/img/folder-recent.svg new file mode 100644 index 0000000000..d56a463896 --- /dev/null +++ b/data/elementary/themes/img/folder-recent.svg @@ -0,0 +1,148 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/folder-videos.svg b/data/elementary/themes/img/folder-videos.svg new file mode 100644 index 0000000000..feaa4d71bd --- /dev/null +++ b/data/elementary/themes/img/folder-videos.svg @@ -0,0 +1,147 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/folder-visiting.svg b/data/elementary/themes/img/folder-visiting.svg new file mode 100644 index 0000000000..ff84ff362e --- /dev/null +++ b/data/elementary/themes/img/folder-visiting.svg @@ -0,0 +1,142 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/ic/folder-documents-040.png b/data/elementary/themes/img/ic/folder-documents-040.png new file mode 100644 index 0000000000..d890760f81 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-documents-040.png differ diff --git a/data/elementary/themes/img/ic/folder-documents-080.png b/data/elementary/themes/img/ic/folder-documents-080.png new file mode 100644 index 0000000000..1ec845e926 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-documents-080.png differ diff --git a/data/elementary/themes/img/ic/folder-documents-160.png b/data/elementary/themes/img/ic/folder-documents-160.png new file mode 100644 index 0000000000..4cd819626b Binary files /dev/null and b/data/elementary/themes/img/ic/folder-documents-160.png differ diff --git a/data/elementary/themes/img/ic/folder-music-040.png b/data/elementary/themes/img/ic/folder-music-040.png new file mode 100644 index 0000000000..372056ebed Binary files /dev/null and b/data/elementary/themes/img/ic/folder-music-040.png differ diff --git a/data/elementary/themes/img/ic/folder-music-080.png b/data/elementary/themes/img/ic/folder-music-080.png new file mode 100644 index 0000000000..520e7a199e Binary files /dev/null and b/data/elementary/themes/img/ic/folder-music-080.png differ diff --git a/data/elementary/themes/img/ic/folder-music-160.png b/data/elementary/themes/img/ic/folder-music-160.png new file mode 100644 index 0000000000..0d2af56c00 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-music-160.png differ diff --git a/data/elementary/themes/img/ic/folder-pictures-040.png b/data/elementary/themes/img/ic/folder-pictures-040.png new file mode 100644 index 0000000000..24620a8fea Binary files /dev/null and b/data/elementary/themes/img/ic/folder-pictures-040.png differ diff --git a/data/elementary/themes/img/ic/folder-pictures-080.png b/data/elementary/themes/img/ic/folder-pictures-080.png new file mode 100644 index 0000000000..4b321b11e6 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-pictures-080.png differ diff --git a/data/elementary/themes/img/ic/folder-pictures-160.png b/data/elementary/themes/img/ic/folder-pictures-160.png new file mode 100644 index 0000000000..8db11705d2 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-pictures-160.png differ diff --git a/data/elementary/themes/img/ic/folder-recent-040.png b/data/elementary/themes/img/ic/folder-recent-040.png new file mode 100644 index 0000000000..1a57ddbc66 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-recent-040.png differ diff --git a/data/elementary/themes/img/ic/folder-recent-080.png b/data/elementary/themes/img/ic/folder-recent-080.png new file mode 100644 index 0000000000..79ff97779d Binary files /dev/null and b/data/elementary/themes/img/ic/folder-recent-080.png differ diff --git a/data/elementary/themes/img/ic/folder-recent-160.png b/data/elementary/themes/img/ic/folder-recent-160.png new file mode 100644 index 0000000000..8c974230a0 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-recent-160.png differ diff --git a/data/elementary/themes/img/ic/folder-videos-040.png b/data/elementary/themes/img/ic/folder-videos-040.png new file mode 100644 index 0000000000..d9718e1f3d Binary files /dev/null and b/data/elementary/themes/img/ic/folder-videos-040.png differ diff --git a/data/elementary/themes/img/ic/folder-videos-080.png b/data/elementary/themes/img/ic/folder-videos-080.png new file mode 100644 index 0000000000..80bdaf6dd9 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-videos-080.png differ diff --git a/data/elementary/themes/img/ic/folder-videos-160.png b/data/elementary/themes/img/ic/folder-videos-160.png new file mode 100644 index 0000000000..b8aed7e382 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-videos-160.png differ diff --git a/data/elementary/themes/img/ic/folder-visiting-040.png b/data/elementary/themes/img/ic/folder-visiting-040.png new file mode 100644 index 0000000000..4d408d3038 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-visiting-040.png differ diff --git a/data/elementary/themes/img/ic/folder-visiting-080.png b/data/elementary/themes/img/ic/folder-visiting-080.png new file mode 100644 index 0000000000..ca83b24f7a Binary files /dev/null and b/data/elementary/themes/img/ic/folder-visiting-080.png differ diff --git a/data/elementary/themes/img/ic/folder-visiting-160.png b/data/elementary/themes/img/ic/folder-visiting-160.png new file mode 100644 index 0000000000..2350e812b9 Binary files /dev/null and b/data/elementary/themes/img/ic/folder-visiting-160.png differ