FDO icons: convert the Places ctx to png

data/elementary/themes/Makefile.am

@@ -990,7 +990,7 @@ elementary/themes/fdo/actions/scalable \
 elementary/themes/fdo/categories/scalable \
 elementary/themes/fdo/emblems/scalable \
 elementary/themes/fdo/places/16 \
-elementary/themes/fdo/places/scalable \
+elementary/themes/fdo/places/128 \
 elementary/themes/fdo/status/scalable
 
 

data/elementary/themes/edc/elm/icon_fdo.edc

@@ -23,32 +23,32 @@
  */
 
 
-// Single FDO icon
+// Single FDO icon in 128px size
 #define ICO1(Cat, Name)                                         \
    group { name: "elm/icon/"##Name##"/default";                 \
       min: 16 16;                                               \
-      images.image: ##Cat##"/scalable/"##Name##".svg" COMP;     \
+      images.image: ##Cat##"/128/"##Name##".png" COMP;          \
       parts {                                                   \
          part { name: "base";                                   \
             desc {                                              \
-               image.normal: ##Cat##"/scalable/"##Name##".svg"; \
+               image.normal: ##Cat##"/128/"##Name##".png";      \
                aspect: 1.0 1.0; aspect_preference: BOTH;        \
    }  }  }  }
 
 
-// FDO icon with small and normal source
+// FDO icon with small and normal source (16 and 128px)
 #define ICO2(Cat, Name)                                         \
    group { name: "elm/icon/"##Name##"/default";                 \
       min: 16 16;                                               \
       images {                                                  \
          set { name: ##Name##;                                  \
             image {                                             \
-               image: ##Cat##"/16/"##Name##".svg" COMP;         \
+               image: ##Cat##"/16/"##Name##".png" COMP;         \
                size: 0  0  22  22;                              \
             }                                                   \
             image {                                             \
-               image: ##Cat##"/scalable/"##Name##".svg" COMP;   \
-               size: 23  23  999  999;                          \
+               image: ##Cat##"/128/"##Name##".png" COMP;        \
+               size: 23  23  256  256;                          \
             }                                                   \
          }                                                      \
       }                                                         \
@@ -87,17 +87,17 @@ ICO2(CTX, "start-here")
 
 ////  emblems  ////////////////////////////////////////////////////////////////
 #define CTX "emblems"
-ICO1(CTX, "emblem-default")
-ICO1(CTX, "emblem-downloads")
-ICO1(CTX, "emblem-favorite")
-ICO1(CTX, "emblem-important")
-ICO1(CTX, "emblem-readonly")
-ICO1(CTX, "emblem-shared")
-ICO1(CTX, "emblem-symbolic-link")
-ICO1(CTX, "emblem-unreadable")
-ICO1(CTX, "emblem-system")
-ICO1(CTX, "emblem-synchronized")
-ICO1(CTX, "emblem-synchronizing") /* */
+// ICO1(CTX, "emblem-default")
+// ICO1(CTX, "emblem-downloads")
+// ICO1(CTX, "emblem-favorite")
+// ICO1(CTX, "emblem-important")
+// ICO1(CTX, "emblem-readonly")
+// ICO1(CTX, "emblem-shared")
+// ICO1(CTX, "emblem-symbolic-link")
+// ICO1(CTX, "emblem-unreadable")
+// ICO1(CTX, "emblem-system")
+// ICO1(CTX, "emblem-synchronized")
+// ICO1(CTX, "emblem-synchronizing") /* */
 // TODO emblem-documents
 // TODO emblem-mail
 // TODO emblem-photos
@@ -106,96 +106,96 @@ ICO1(CTX, "emblem-synchronizing") /* */
 
 ////  actions  ////////////////////////////////////////////////////////////////
 #define CTX "actions"
-ICO1(CTX, "call-start")
-ICO1(CTX, "call-stop")
-ICO1(CTX, "document-open")
-ICO1(CTX, "document-open-recent")
-ICO1(CTX, "document-page-setup")
-ICO1(CTX, "document-properties")
-ICO1(CTX, "document-save")
-ICO1(CTX, "document-save-as")
-ICO1(CTX, "document-send")
-ICO1(CTX, "document-close") /* */
+// ICO1(CTX, "call-start")
+// ICO1(CTX, "call-stop")
+// ICO1(CTX, "document-open")
+// ICO1(CTX, "document-open-recent")
+// ICO1(CTX, "document-page-setup")
+// ICO1(CTX, "document-properties")
+// ICO1(CTX, "document-save")
+// ICO1(CTX, "document-save-as")
+// ICO1(CTX, "document-send")
+// ICO1(CTX, "document-close") /* */
 // TODO document-new
 // TODO document-print
 // TODO document-print-preview
 // TODO document-revert
 
-ICO1(CTX, "edit-clear")
-ICO1(CTX, "edit-copy")
-ICO1(CTX, "edit-cut")
-ICO1(CTX, "edit-delete")
-ICO1(CTX, "edit-find")
-ICO1(CTX, "edit-paste")
-ICO1(CTX, "edit-redo")
-ICO1(CTX, "edit-undo")
-ICO1(CTX, "edit-select-all")
+// ICO1(CTX, "edit-clear")
+// ICO1(CTX, "edit-copy")
+// ICO1(CTX, "edit-cut")
+// ICO1(CTX, "edit-delete")
+// ICO1(CTX, "edit-find")
+// ICO1(CTX, "edit-paste")
+// ICO1(CTX, "edit-redo")
+// ICO1(CTX, "edit-undo")
+// ICO1(CTX, "edit-select-all")
 // TODO edit-find-replace
 
-ICO1(CTX, "format-indent-less")
-ICO1(CTX, "format-indent-more")
-ICO1(CTX, "format-justify-center")
-ICO1(CTX, "format-justify-fill")
-ICO1(CTX, "format-justify-left")
-ICO1(CTX, "format-justify-right")
-ICO1(CTX, "format-text-direction-ltr")
-ICO1(CTX, "format-text-direction-rtl")
-ICO1(CTX, "format-text-bold")
-ICO1(CTX, "format-text-italic")
-ICO1(CTX, "format-text-underline")
-ICO1(CTX, "format-text-strikethrough")
-
-ICO1(CTX, "go-home")
-ICO1(CTX, "go-bottom")
-ICO1(CTX, "go-down")
-ICO1(CTX, "go-first")
-ICO1(CTX, "go-jump")
-ICO1(CTX, "go-last")
-ICO1(CTX, "go-next")
-ICO1(CTX, "go-previous")
-ICO1(CTX, "go-top")
-ICO1(CTX, "go-up")
-
-ICO1(CTX, "insert-image")
-ICO1(CTX, "insert-link")
-ICO1(CTX, "insert-object")
-ICO1(CTX, "insert-text")
-
-ICO1(CTX, "list-add")
-ICO1(CTX, "list-remove")
-
-ICO1(CTX, "media-eject")
-ICO1(CTX, "media-playback-pause")
-ICO1(CTX, "media-playback-start")
-ICO1(CTX, "media-playback-stop")
-ICO1(CTX, "media-record")
-ICO1(CTX, "media-seek-backward")
-ICO1(CTX, "media-seek-forward")
-ICO1(CTX, "media-skip-backward")
-ICO1(CTX, "media-skip-forward")
-
-ICO1(CTX, "object-flip-horizontal")
-ICO1(CTX, "object-flip-vertical")
-ICO1(CTX, "object-rotate-left")
-ICO1(CTX, "object-rotate-right")
-
-ICO1(CTX, "zoom-fit-best")
-ICO1(CTX, "zoom-in")
-ICO1(CTX, "zoom-original")
-ICO1(CTX, "zoom-out")
-
-ICO1(CTX, "view-fullscreen")
-ICO1(CTX, "view-refresh")
-ICO1(CTX, "view-restore")
-ICO1(CTX, "view-close") /* */
+// ICO1(CTX, "format-indent-less")
+// ICO1(CTX, "format-indent-more")
+// ICO1(CTX, "format-justify-center")
+// ICO1(CTX, "format-justify-fill")
+// ICO1(CTX, "format-justify-left")
+// ICO1(CTX, "format-justify-right")
+// ICO1(CTX, "format-text-direction-ltr")
+// ICO1(CTX, "format-text-direction-rtl")
+// ICO1(CTX, "format-text-bold")
+// ICO1(CTX, "format-text-italic")
+// ICO1(CTX, "format-text-underline")
+// ICO1(CTX, "format-text-strikethrough")
+// 
+// ICO1(CTX, "go-home")
+// ICO1(CTX, "go-bottom")
+// ICO1(CTX, "go-down")
+// ICO1(CTX, "go-first")
+// ICO1(CTX, "go-jump")
+// ICO1(CTX, "go-last")
+// ICO1(CTX, "go-next")
+// ICO1(CTX, "go-previous")
+// ICO1(CTX, "go-top")
+// ICO1(CTX, "go-up")
+// 
+// ICO1(CTX, "insert-image")
+// ICO1(CTX, "insert-link")
+// ICO1(CTX, "insert-object")
+// ICO1(CTX, "insert-text")
+// 
+// ICO1(CTX, "list-add")
+// ICO1(CTX, "list-remove")
+// 
+// ICO1(CTX, "media-eject")
+// ICO1(CTX, "media-playback-pause")
+// ICO1(CTX, "media-playback-start")
+// ICO1(CTX, "media-playback-stop")
+// ICO1(CTX, "media-record")
+// ICO1(CTX, "media-seek-backward")
+// ICO1(CTX, "media-seek-forward")
+// ICO1(CTX, "media-skip-backward")
+// ICO1(CTX, "media-skip-forward")
+// 
+// ICO1(CTX, "object-flip-horizontal")
+// ICO1(CTX, "object-flip-vertical")
+// ICO1(CTX, "object-rotate-left")
+// ICO1(CTX, "object-rotate-right")
+// 
+// ICO1(CTX, "zoom-fit-best")
+// ICO1(CTX, "zoom-in")
+// ICO1(CTX, "zoom-original")
+// ICO1(CTX, "zoom-out")
+// 
+// ICO1(CTX, "view-fullscreen")
+// ICO1(CTX, "view-refresh")
+// ICO1(CTX, "view-restore")
+// ICO1(CTX, "view-close") /* */
 // TODO view-sort-ascending
 // TODO view-sort-descending
 
-ICO1(CTX, "window-close")
+// ICO1(CTX, "window-close")
 // TODO window-new
 
-ICO1(CTX, "system-run")
-ICO1(CTX, "system-shutdown")
+// ICO1(CTX, "system-run")
+// ICO1(CTX, "system-shutdown")
 // TODO system-lock-screen
 // TODO system-log-out
 // TODO system-search
@@ -227,89 +227,89 @@ ICO1(CTX, "system-shutdown")
 
 ////  status  /////////////////////////////////////////////////////////////
 #define CTX "status"
-ICO1(CTX, "audio-volume-high")
-ICO1(CTX, "audio-volume-low")
-ICO1(CTX, "audio-volume-medium")
-ICO1(CTX, "audio-volume-muted")
-ICO1(CTX, "audio-volume") /* */
-ICO1(CTX, "battery-caution")
-ICO1(CTX, "battery-empty") /* */
-ICO1(CTX, "battery-low")
-ICO1(CTX, "battery-good") /* */
-ICO1(CTX, "battery-full") /* */
-ICO1(CTX, "battery-caution-charging") /* */
-ICO1(CTX, "battery-empty-charging") /* */
-ICO1(CTX, "battery-low-charging") /* */
-ICO1(CTX, "battery-good-charging") /* */
-ICO1(CTX, "battery-full-charging") /* */
-ICO1(CTX, "bluetooth-active") /* */
-ICO1(CTX, "bluetooth-disabled") /* */
-ICO1(CTX, "changes-allow") /* */
-ICO1(CTX, "changes-prevent")/* */
-ICO1(CTX, "dialog-error")
-ICO1(CTX, "dialog-information")
-ICO1(CTX, "dialog-password")
-ICO1(CTX, "dialog-question")
-ICO1(CTX, "dialog-warning")
-ICO1(CTX, "media-playlist-repeat")
-ICO1(CTX, "media-playlist-shuffle")
-ICO1(CTX, "network-cellular-3g") /* */
-ICO1(CTX, "network-cellular-4g") /* */
-ICO1(CTX, "network-cellular-edge") /* */
-ICO1(CTX, "network-cellular-gprs") /* */
-ICO1(CTX, "network-cellular-umts") /* */
-ICO1(CTX, "network-cellular-connected") /* */
-ICO1(CTX, "network-cellular-signal-excellent") /* */
-ICO1(CTX, "network-cellular-signal-good") /* */
-ICO1(CTX, "network-cellular-signal-none") /* */
-ICO1(CTX, "network-cellular-signal-ok") /* */
-ICO1(CTX, "network-cellular-signal-weak") /* */
-ICO1(CTX, "network-cellular-signal-acquiring") /* */
-ICO1(CTX, "network-error")
-ICO1(CTX, "network-offline")
-ICO1(CTX, "network-receive")
-ICO1(CTX, "network-transmit-receive")
-ICO1(CTX, "network-transmit")
-ICO1(CTX, "network-idle")
-ICO1(CTX, "network-vpn") /* */
-ICO1(CTX, "network-vpn-acquiring") /* */
-ICO1(CTX, "network-wireless-acquiring") /* */
-ICO1(CTX, "network-wireless-encrypted") /* */
-ICO1(CTX, "network-wireless-signal-excellent") /* */
-ICO1(CTX, "network-wireless-signal-good") /* */
-ICO1(CTX, "network-wireless-signal-none") /* */
-ICO1(CTX, "network-wireless-signal-ok") /* */
-ICO1(CTX, "network-wireless-signal-weak") /* */
-ICO1(CTX, "printer-error")
-ICO1(CTX, "printer-printing")
-ICO1(CTX, "printer-warning") /* */
-ICO1(CTX, "security-high")
-ICO1(CTX, "security-medium")
-ICO1(CTX, "security-low")
-ICO1(CTX, "software-update-available")
-ICO1(CTX, "software-update-urgent")
-ICO1(CTX, "user-available")
-ICO1(CTX, "user-away")
-ICO1(CTX, "user-busy") /* */
-ICO1(CTX, "user-invisible") /* */
-ICO1(CTX, "user-idle")
-ICO1(CTX, "user-offline")
-ICO1(CTX, "weather-clear-night")
-ICO1(CTX, "weather-clear")
-ICO1(CTX, "weather-clouds-night") /* */
-ICO1(CTX, "weather-clouds") /* */
-ICO1(CTX, "weather-few-clouds-night")
-ICO1(CTX, "weather-few-clouds")
-ICO1(CTX, "weather-fog")
-ICO1(CTX, "weather-overcast")
-ICO1(CTX, "weather-severe-alert")
-ICO1(CTX, "weather-showers-scattered")
-ICO1(CTX, "weather-showers")
-ICO1(CTX, "weather-snow")
-ICO1(CTX, "weather-storm")
-ICO1(CTX, "mail-attachment")
-ICO1(CTX, "mail-unread")
-ICO1(CTX, "mail-read")
+// ICO1(CTX, "audio-volume-high")
+// ICO1(CTX, "audio-volume-low")
+// ICO1(CTX, "audio-volume-medium")
+// ICO1(CTX, "audio-volume-muted")
+// ICO1(CTX, "audio-volume") /* */
+// ICO1(CTX, "battery-caution")
+// ICO1(CTX, "battery-empty") /* */
+// ICO1(CTX, "battery-low")
+// ICO1(CTX, "battery-good") /* */
+// ICO1(CTX, "battery-full") /* */
+// ICO1(CTX, "battery-caution-charging") /* */
+// ICO1(CTX, "battery-empty-charging") /* */
+// ICO1(CTX, "battery-low-charging") /* */
+// ICO1(CTX, "battery-good-charging") /* */
+// ICO1(CTX, "battery-full-charging") /* */
+// ICO1(CTX, "bluetooth-active") /* */
+// ICO1(CTX, "bluetooth-disabled") /* */
+// ICO1(CTX, "changes-allow") /* */
+// ICO1(CTX, "changes-prevent")/* */
+// ICO1(CTX, "dialog-error")
+// ICO1(CTX, "dialog-information")
+// ICO1(CTX, "dialog-password")
+// ICO1(CTX, "dialog-question")
+// ICO1(CTX, "dialog-warning")
+// ICO1(CTX, "media-playlist-repeat")
+// ICO1(CTX, "media-playlist-shuffle")
+// ICO1(CTX, "network-cellular-3g") /* */
+// ICO1(CTX, "network-cellular-4g") /* */
+// ICO1(CTX, "network-cellular-edge") /* */
+// ICO1(CTX, "network-cellular-gprs") /* */
+// ICO1(CTX, "network-cellular-umts") /* */
+// ICO1(CTX, "network-cellular-connected") /* */
+// ICO1(CTX, "network-cellular-signal-excellent") /* */
+// ICO1(CTX, "network-cellular-signal-good") /* */
+// ICO1(CTX, "network-cellular-signal-none") /* */
+// ICO1(CTX, "network-cellular-signal-ok") /* */
+// ICO1(CTX, "network-cellular-signal-weak") /* */
+// ICO1(CTX, "network-cellular-signal-acquiring") /* */
+// ICO1(CTX, "network-error")
+// ICO1(CTX, "network-offline")
+// ICO1(CTX, "network-receive")
+// ICO1(CTX, "network-transmit-receive")
+// ICO1(CTX, "network-transmit")
+// ICO1(CTX, "network-idle")
+// ICO1(CTX, "network-vpn") /* */
+// ICO1(CTX, "network-vpn-acquiring") /* */
+// ICO1(CTX, "network-wireless-acquiring") /* */
+// ICO1(CTX, "network-wireless-encrypted") /* */
+// ICO1(CTX, "network-wireless-signal-excellent") /* */
+// ICO1(CTX, "network-wireless-signal-good") /* */
+// ICO1(CTX, "network-wireless-signal-none") /* */
+// ICO1(CTX, "network-wireless-signal-ok") /* */
+// ICO1(CTX, "network-wireless-signal-weak") /* */
+// ICO1(CTX, "printer-error")
+// ICO1(CTX, "printer-printing")
+// ICO1(CTX, "printer-warning") /* */
+// ICO1(CTX, "security-high")
+// ICO1(CTX, "security-medium")
+// ICO1(CTX, "security-low")
+// ICO1(CTX, "software-update-available")
+// ICO1(CTX, "software-update-urgent")
+// ICO1(CTX, "user-available")
+// ICO1(CTX, "user-away")
+// ICO1(CTX, "user-busy") /* */
+// ICO1(CTX, "user-invisible") /* */
+// ICO1(CTX, "user-idle")
+// ICO1(CTX, "user-offline")
+// ICO1(CTX, "weather-clear-night")
+// ICO1(CTX, "weather-clear")
+// ICO1(CTX, "weather-clouds-night") /* */
+// ICO1(CTX, "weather-clouds") /* */
+// ICO1(CTX, "weather-few-clouds-night")
+// ICO1(CTX, "weather-few-clouds")
+// ICO1(CTX, "weather-fog")
+// ICO1(CTX, "weather-overcast")
+// ICO1(CTX, "weather-severe-alert")
+// ICO1(CTX, "weather-showers-scattered")
+// ICO1(CTX, "weather-showers")
+// ICO1(CTX, "weather-snow")
+// ICO1(CTX, "weather-storm")
+// ICO1(CTX, "mail-attachment")
+// ICO1(CTX, "mail-unread")
+// ICO1(CTX, "mail-read")
 // TODO mail-replied
 // TODO mail-signed
 // TODO mail-signed-verified
@@ -324,8 +324,8 @@ ICO1(CTX, "mail-read")
 // TODO task-due
 // TODO task-past-due
 // TODO user-trash-full
-ICO1(CTX, "starred") /* */
-ICO1(CTX, "non-starred") /* */
+// ICO1(CTX, "starred") /* */
+// ICO1(CTX, "non-starred") /* */
 #undef CTX
 
 
@@ -361,20 +361,20 @@ ICO1(CTX, "non-starred") /* */
 
 ////  categories  /////////////////////////////////////////////////////////////
 #define CTX "categories"
-ICO1(CTX, "applications-accessories")
-ICO1(CTX, "applications-development")
-ICO1(CTX, "applications-games")
-ICO1(CTX, "applications-graphics")
-ICO1(CTX, "applications-internet")
-ICO1(CTX, "applications-multimedia")
-ICO1(CTX, "applications-office")
-ICO1(CTX, "applications-other")
-ICO1(CTX, "applications-science")
-ICO1(CTX, "applications-system")
-ICO1(CTX, "applications-utilities")
-ICO1(CTX, "preferences-desktop")
-ICO1(CTX, "preferences-system")
-ICO1(CTX, "preferences-other")
+// ICO1(CTX, "applications-accessories")
+// ICO1(CTX, "applications-development")
+// ICO1(CTX, "applications-games")
+// ICO1(CTX, "applications-graphics")
+// ICO1(CTX, "applications-internet")
+// ICO1(CTX, "applications-multimedia")
+// ICO1(CTX, "applications-office")
+// ICO1(CTX, "applications-other")
+// ICO1(CTX, "applications-science")
+// ICO1(CTX, "applications-system")
+// ICO1(CTX, "applications-utilities")
+// ICO1(CTX, "preferences-desktop")
+// ICO1(CTX, "preferences-system")
+// ICO1(CTX, "preferences-other")
 // TODO applications-engineering
 // TODO preferences-desktop-peripherals
 // TODO preferences-desktop-personal

data/elementary/themes/fdo/index.theme

@@ -2,8 +2,24 @@
 Name=Bluish-X
 Inherits=hicolor
 Comment=The EFL Bluish-X Icon theme. Orig. Based on Rave-X, Mint-X and Faenza Icon Themes.
-Directories=actions/scalable,status/scalable,places/scalable,places/16,emblems/scalable,categories/scalable
-Example=directory-x-normal
+Directories=actions/scalable,status/scalable,places/128,places/16,emblems/scalable,categories/scalable
+Example=folder-home
+
+
+[places/128]
+Size=128
+Context=Places
+Type=Scalable
+MinSize=23
+MaxSize=256
+
+[places/16]
+Size=16
+Context=Places
+Type=Scalable
+MinSize=16
+MaxSize=22
+
 
 [actions/scalable]
 Size=128
@@ -17,19 +33,6 @@ Context=Status
 Type=Scalable
 MinSize=16
 
-[places/scalable]
-Size=128
-Context=Places
-Type=Scalable
-MinSize=23
-
-[places/16]
-Size=16
-Context=Places
-Type=Scalable
-MinSize=16
-MaxSize=22
-
 [emblems/scalable]
 Size=96
 Context=Emblems

data/elementary/themes/fdo/places/128/network-server.png

@@ -0,0 +1 @@
+folder-remote.png

data/elementary/themes/fdo/places/128/network-workgroup.png

@@ -0,0 +1 @@
+folder-remote.png

data/elementary/themes/fdo/places/16/network-server.png

@@ -0,0 +1 @@
+folder-remote.png

data/elementary/themes/fdo/places/16/network-server.svg

@@ -1 +0,0 @@
-folder-remote.svg

data/elementary/themes/fdo/places/16/network-workgroup.png

@@ -0,0 +1 @@
+folder-remote.png

data/elementary/themes/fdo/places/16/network-workgroup.svg

@@ -1 +0,0 @@
-folder-remote.svg

data/elementary/themes/fdo/places/scalable/network-server.svg

@@ -1 +0,0 @@
-folder-remote.svg

data/elementary/themes/fdo/places/scalable/network-workgroup.svg

@@ -1 +0,0 @@
-folder-remote.svg