diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 6c144fbffd..e0a0316a07 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -1155,6 +1155,7 @@ elementary_fdo_emblems_96_files = \ elementary_fdo_places_16_files = \ elementary/themes/fdo/places/16/folder-documents.png \ elementary/themes/fdo/places/16/folder-download.png \ + elementary/themes/fdo/places/16/folder-drag-accept.png \ elementary/themes/fdo/places/16/folder-home.png \ elementary/themes/fdo/places/16/folder-music.png \ elementary/themes/fdo/places/16/folder-open.png \ @@ -1163,6 +1164,7 @@ elementary_fdo_places_16_files = \ elementary/themes/fdo/places/16/folder-recent.png \ elementary/themes/fdo/places/16/folder-remote.png \ elementary/themes/fdo/places/16/folder-videos.png \ + elementary/themes/fdo/places/16/folder-visiting.png \ elementary/themes/fdo/places/16/network-server.png \ elementary/themes/fdo/places/16/network-workgroup.png \ elementary/themes/fdo/places/16/start-here.png \ @@ -1170,6 +1172,7 @@ elementary_fdo_places_16_files = \ elementary_fdo_places_128_files = \ elementary/themes/fdo/places/128/folder-documents.png \ + elementary/themes/fdo/places/128/folder-drag-accept.png \ elementary/themes/fdo/places/128/folder-download.png \ elementary/themes/fdo/places/128/folder-home.png \ elementary/themes/fdo/places/128/folder-music.png \ @@ -1181,6 +1184,7 @@ elementary_fdo_places_128_files = \ elementary/themes/fdo/places/128/folder-remote.png \ elementary/themes/fdo/places/128/folder-templates.png \ elementary/themes/fdo/places/128/folder-videos.png \ + elementary/themes/fdo/places/128/folder-visiting.png \ elementary/themes/fdo/places/128/network-server.png \ elementary/themes/fdo/places/128/network-workgroup.png \ elementary/themes/fdo/places/128/start-here.png \ @@ -1190,6 +1194,8 @@ elementary_fdo_places_128_files = \ elementary/themes/fdo/places/128/user-trash.png elementary_fdo_status_128_files = \ + elementary/themes/fdo/status/128/appointment-missed.png \ + elementary/themes/fdo/status/128/appointment-soon.png \ elementary/themes/fdo/status/128/audio-volume-high.png \ elementary/themes/fdo/status/128/audio-volume-low.png \ elementary/themes/fdo/status/128/audio-volume-medium.png \ @@ -1216,7 +1222,10 @@ elementary_fdo_status_128_files = \ elementary/themes/fdo/status/128/dialog-warning.png \ elementary/themes/fdo/status/128/mail-attachment.png \ elementary/themes/fdo/status/128/mail-read.png \ + elementary/themes/fdo/status/128/mail-replied.png \ elementary/themes/fdo/status/128/mail-unread.png \ + elementary/themes/fdo/status/128/mail-signed.png \ + elementary/themes/fdo/status/128/mail-signed-verified.png \ elementary/themes/fdo/status/128/media-playlist-repeat.png \ elementary/themes/fdo/status/128/media-playlist-shuffle.png \ elementary/themes/fdo/status/128/network-cellular-3g.png \ @@ -1255,6 +1264,8 @@ elementary_fdo_status_128_files = \ elementary/themes/fdo/status/128/security-medium.png \ elementary/themes/fdo/status/128/software-update-available.png \ elementary/themes/fdo/status/128/software-update-urgent.png \ + elementary/themes/fdo/status/128/task-due.png \ + elementary/themes/fdo/status/128/task-past-due.png \ elementary/themes/fdo/status/128/starred.png \ elementary/themes/fdo/status/128/user-available.png \ elementary/themes/fdo/status/128/user-away.png \ @@ -1262,6 +1273,7 @@ elementary_fdo_status_128_files = \ elementary/themes/fdo/status/128/user-idle.png \ elementary/themes/fdo/status/128/user-invisible.png \ elementary/themes/fdo/status/128/user-offline.png \ + elementary/themes/fdo/status/128/user-trash-full.png \ elementary/themes/fdo/status/128/weather-clear-night.png \ elementary/themes/fdo/status/128/weather-clear.png \ elementary/themes/fdo/status/128/weather-clouds-night.png \ diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc index a4d4fa84be..ec42bbc06b 100644 --- a/data/elementary/themes/edc/elm/icon_fdo.edc +++ b/data/elementary/themes/edc/elm/icon_fdo.edc @@ -71,6 +71,7 @@ ICO1(CTX, "user-bookmarks", 128) ICO2(CTX, "user-desktop") ICO1(CTX, "user-trash", 128) ICO2(CTX, "folder") +ICO2(CTX, "folder-drag-accept") /* spec have this icon in the Status category */ ICO2(CTX, "folder-remote") ICO2(CTX, "folder-open") /* */ ICO2(CTX, "folder-home") /* */ @@ -80,6 +81,7 @@ 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 */ ICO2(CTX, "network-server") ICO2(CTX, "network-workgroup") ICO2(CTX, "start-here") @@ -242,6 +244,8 @@ ICO1(CTX, "zoom-fit-best", 128) //// status ///////////////////////////////////////////////////////////// #define CTX "status" +ICO1(CTX, "appointment-missed", 128) +ICO1(CTX, "appointment-soon", 128) ICO1(CTX, "audio-volume-high", 128) ICO1(CTX, "audio-volume-low", 128) ICO1(CTX, "audio-volume-medium", 128) @@ -268,6 +272,12 @@ ICO1(CTX, "dialog-question", 128) ICO1(CTX, "dialog-warning", 128) ICO1(CTX, "media-playlist-repeat", 128) ICO1(CTX, "media-playlist-shuffle", 128) +ICO1(CTX, "mail-attachment", 128) +ICO1(CTX, "mail-unread", 128) +ICO1(CTX, "mail-read", 128) +ICO1(CTX, "mail-replied", 128) +ICO1(CTX, "mail-signed", 128) +ICO1(CTX, "mail-signed-verified", 128) ICO1(CTX, "network-cellular-3g", 128) /* */ ICO1(CTX, "network-cellular-4g", 128) /* */ ICO1(CTX, "network-cellular-edge", 128) /* */ @@ -303,12 +313,15 @@ ICO1(CTX, "security-medium", 128) ICO1(CTX, "security-low", 128) ICO1(CTX, "software-update-available", 128) ICO1(CTX, "software-update-urgent", 128) +ICO1(CTX, "task-due", 128) +ICO1(CTX, "task-past-due", 128) ICO1(CTX, "user-available", 128) ICO1(CTX, "user-away", 128) ICO1(CTX, "user-busy", 128) /* */ ICO1(CTX, "user-invisible", 128) /* */ ICO1(CTX, "user-idle", 128) ICO1(CTX, "user-offline", 128) +ICO1(CTX, "user-trash-full", 128) /* */ ICO1(CTX, "weather-clear-night", 128) ICO1(CTX, "weather-clear", 128) ICO1(CTX, "weather-clouds-night", 128) /* */ @@ -322,25 +335,14 @@ ICO1(CTX, "weather-showers-scattered", 128) ICO1(CTX, "weather-showers", 128) ICO1(CTX, "weather-snow", 128) ICO1(CTX, "weather-storm", 128) -ICO1(CTX, "mail-attachment", 128) -ICO1(CTX, "mail-unread", 128) -ICO1(CTX, "mail-read", 128) -// TODO mail-replied -// TODO mail-signed -// TODO mail-signed-verified -// TODO appointment-missed -// TODO appointment-soon -// TODO folder-drag-accept -// TODO folder-visiting // TODO image-loading // TODO image-missing // TODO sync-error // TODO sync-synchronizing -// TODO task-due -// TODO task-past-due -// TODO user-trash-full ICO1(CTX, "starred", 128) /* */ ICO1(CTX, "non-starred", 128) /* */ +// folder-visiting /* in the Places category */ +// folder-drag-accept /* in the Places category */ #undef CTX diff --git a/data/elementary/themes/fdo/places/128/folder-drag-accept.png b/data/elementary/themes/fdo/places/128/folder-drag-accept.png new file mode 100644 index 0000000000..a5e8b8fe3e Binary files /dev/null and b/data/elementary/themes/fdo/places/128/folder-drag-accept.png differ diff --git a/data/elementary/themes/fdo/places/128/folder-visiting.png b/data/elementary/themes/fdo/places/128/folder-visiting.png new file mode 100644 index 0000000000..e877858b4c Binary files /dev/null and b/data/elementary/themes/fdo/places/128/folder-visiting.png differ diff --git a/data/elementary/themes/fdo/places/16/folder-drag-accept.png b/data/elementary/themes/fdo/places/16/folder-drag-accept.png new file mode 100644 index 0000000000..7920655f39 Binary files /dev/null and b/data/elementary/themes/fdo/places/16/folder-drag-accept.png differ diff --git a/data/elementary/themes/fdo/places/16/folder-visiting.png b/data/elementary/themes/fdo/places/16/folder-visiting.png new file mode 100644 index 0000000000..d2f27d6e16 Binary files /dev/null and b/data/elementary/themes/fdo/places/16/folder-visiting.png differ diff --git a/data/elementary/themes/fdo/status/128-svg/appointment-missed.svg b/data/elementary/themes/fdo/status/128-svg/appointment-missed.svg new file mode 100644 index 0000000000..5e86139d21 --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/appointment-missed.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/appointment-soon.svg b/data/elementary/themes/fdo/status/128-svg/appointment-soon.svg new file mode 100644 index 0000000000..c1fb7ae035 --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/appointment-soon.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/mail-replied.svg b/data/elementary/themes/fdo/status/128-svg/mail-replied.svg new file mode 100644 index 0000000000..3043f75500 --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/mail-replied.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/mail-signed-verified.svg b/data/elementary/themes/fdo/status/128-svg/mail-signed-verified.svg new file mode 100644 index 0000000000..6a44d13eeb --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/mail-signed-verified.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/mail-signed.svg b/data/elementary/themes/fdo/status/128-svg/mail-signed.svg new file mode 100644 index 0000000000..8118be07ab --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/mail-signed.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/task-due.svg b/data/elementary/themes/fdo/status/128-svg/task-due.svg new file mode 100644 index 0000000000..a5e566d694 --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/task-due.svg @@ -0,0 +1,253 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/task-past-due.svg b/data/elementary/themes/fdo/status/128-svg/task-past-due.svg new file mode 100644 index 0000000000..22df22b192 --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/task-past-due.svg @@ -0,0 +1,243 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128-svg/user-trash-full.svg b/data/elementary/themes/fdo/status/128-svg/user-trash-full.svg new file mode 100644 index 0000000000..a96695e964 --- /dev/null +++ b/data/elementary/themes/fdo/status/128-svg/user-trash-full.svg @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/data/elementary/themes/fdo/status/128/appointment-missed.png b/data/elementary/themes/fdo/status/128/appointment-missed.png new file mode 100644 index 0000000000..a27f5322a8 Binary files /dev/null and b/data/elementary/themes/fdo/status/128/appointment-missed.png differ diff --git a/data/elementary/themes/fdo/status/128/appointment-soon.png b/data/elementary/themes/fdo/status/128/appointment-soon.png new file mode 100644 index 0000000000..5f020c731f Binary files /dev/null and b/data/elementary/themes/fdo/status/128/appointment-soon.png differ diff --git a/data/elementary/themes/fdo/status/128/mail-replied.png b/data/elementary/themes/fdo/status/128/mail-replied.png new file mode 100644 index 0000000000..fff25d6ecf Binary files /dev/null and b/data/elementary/themes/fdo/status/128/mail-replied.png differ diff --git a/data/elementary/themes/fdo/status/128/mail-signed-verified.png b/data/elementary/themes/fdo/status/128/mail-signed-verified.png new file mode 100644 index 0000000000..b3eca6c922 Binary files /dev/null and b/data/elementary/themes/fdo/status/128/mail-signed-verified.png differ diff --git a/data/elementary/themes/fdo/status/128/mail-signed.png b/data/elementary/themes/fdo/status/128/mail-signed.png new file mode 100644 index 0000000000..97d8e02ed8 Binary files /dev/null and b/data/elementary/themes/fdo/status/128/mail-signed.png differ diff --git a/data/elementary/themes/fdo/status/128/task-due.png b/data/elementary/themes/fdo/status/128/task-due.png new file mode 100644 index 0000000000..0a1359ce45 Binary files /dev/null and b/data/elementary/themes/fdo/status/128/task-due.png differ diff --git a/data/elementary/themes/fdo/status/128/task-past-due.png b/data/elementary/themes/fdo/status/128/task-past-due.png new file mode 100644 index 0000000000..869e165d19 Binary files /dev/null and b/data/elementary/themes/fdo/status/128/task-past-due.png differ diff --git a/data/elementary/themes/fdo/status/128/user-trash-full.png b/data/elementary/themes/fdo/status/128/user-trash-full.png new file mode 100644 index 0000000000..9e276e4899 Binary files /dev/null and b/data/elementary/themes/fdo/status/128/user-trash-full.png differ diff --git a/src/bin/elementary/test_icon.c b/src/bin/elementary/test_icon.c index a67d6198b4..1202a6d1bb 100644 --- a/src/bin/elementary/test_icon.c +++ b/src/bin/elementary/test_icon.c @@ -206,6 +206,7 @@ _standard_genlist_populate(Evas_Object *gl) IC("user-desktop") IC("user-trash") IC("folder") + IC("folder-drag-accept") IC("folder-remote") IC("folder-open") IC("folder-home") @@ -215,6 +216,7 @@ _standard_genlist_populate(Evas_Object *gl) IC("folder-pictures") IC("folder-music") IC("folder-videos") + IC("folder-visiting") IC("network-server") IC("network-workgroup") IC("start-here") @@ -351,6 +353,8 @@ _standard_genlist_populate(Evas_Object *gl) IC("zoom-fit-best") CONTEXT("Status") + IC("appointment-missed") + IC("appointment-soon") IC("audio-volume-high") IC("audio-volume-low") IC("audio-volume-medium") @@ -412,12 +416,15 @@ _standard_genlist_populate(Evas_Object *gl) IC("security-low") IC("software-update-available") IC("software-update-urgent") + IC("task-due") + IC("task-past-due") IC("user-available") IC("user-away") IC("user-busy") IC("user-invisible") IC("user-idle") IC("user-offline") + IC("user-trash-full") IC("weather-clear-night") IC("weather-clear") IC("weather-clouds-night") @@ -434,6 +441,9 @@ _standard_genlist_populate(Evas_Object *gl) IC("mail-attachment") IC("mail-unread") IC("mail-read") + IC("mail-replied") + IC("mail-signed") + IC("mail-signed-verified") IC("starred") IC("non-starred")