diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index ef18936f7..69319a643 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -44,6 +44,7 @@ edc/fontpreview.edc\ edc/frame.edc \ edc/gadman.edc \ edc/ibar-ibox.edc \ +edc/icons.edc \ edc/ilist.edc \ edc/illume.edc \ edc/init.edc \ @@ -207,6 +208,13 @@ img/icon_border_skip.png \ img/icon_border_stack_bot.png \ img/icon_border_stack_norm.png \ img/icon_border_stack_top.png \ +img/icon_system-lock-screen.png \ +img/icon_system-log-out.png \ +img/icon_system.png \ +img/icon_system-restart.png \ +img/icon_system-shutdown.png \ +img/icon_system-suspend-hibernate.png \ +img/icon_system-suspend.png \ img/ic_win_move.png \ img/ic_win_resize.png \ img/inset_circle_tiny.png \ diff --git a/data/themes/default.edc b/data/themes/default.edc index 930529638..4ec3e74f2 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -60,6 +60,7 @@ collections { #include "edc/evrything.edc" #include "edc/illume.edc" // icons +#include "edc/icons.edc" #include "edc/border-icons.edc" // port unchanged stuff so this can work as a replacement diff --git a/data/themes/edc/O/icons.edc b/data/themes/edc/O/icons.edc index c2fac430d..8b729389e 100644 --- a/data/themes/edc/O/icons.edc +++ b/data/themes/edc/O/icons.edc @@ -236,12 +236,6 @@ ICON("view-hidden-files","icon_efm_view.png",16) // *** // EFMBUTTON("hidden_files" ICON("configure","icon_config.png",64) // "widget/config" ICON("system-run","icon_run.png",64) // "enlightenment/run" - ICON("system-shutdown","icon_halt.png",128) // "enlightenment/halt" - ICON("system-restart","icon_reboot.png",128) // "enlightenment/reboot" - ICON("system-suspend","icon_suspend.png",128) // "enlightenment/suspend" - ICON("system-suspend-hibernate","icon_hibernate.png",128) // "enlightenment/hibernate" - ICON("system-log-out","icon_logout.png",128) // "enlightenment/logout" - ICON("system-lock-screen","icon_desklock_menu.png",128) // "enlightenment/desklock_menu" ICON("window-close","icon_close.png",64) // "widget/close" ICON("dialog-ok-apply","icon_check.png",64) // "enlightenment/check" ICON("transform-scale","icon_resize.png",64) // "widget/resize" @@ -345,7 +339,6 @@ ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)// *** // "enlightenment/screen_resolution" ICON("preferences-illume","icon_illume.png",64) ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman" - ICON("application-exit","icon_logout.png",64) // "enlightenment/exit" ICON("enlightenment","logo_white_128.png",64) // *** // "enlightenment/e" //Standard Module Category Icons ICON("modules-utils","icon_gadget.png",64) @@ -367,7 +360,6 @@ ICON("user-bookmarks","icon_favorites.png",64) // "enlightenment/favorites" ICON("folder-image","icon_wallpaper.png",64) // "enlightenment/picture" ICON("network-website","icon_globe.png",64) // "enlightenment/website" - ICON("system","icon_system.png",64) // *** // "enlightenment/system" //Standard Device Icons ICON("computer","icon_efm_root.png", 64) // "fileman/root" ICON("drive-harddisk","icon_efm_hdd.png", 128) // "fileman/hd" "fileman/hdd" diff --git a/data/themes/edc/border-icons.edc b/data/themes/edc/border-icons.edc index 6a2ddd99b..9abf83b15 100644 --- a/data/themes/edc/border-icons.edc +++ b/data/themes/edc/border-icons.edc @@ -5,6 +5,7 @@ parts { \ part { name: "icon"; mouse_events: 0; \ description { state: "default" 0.0; \ + max: 16 16; \ aspect: 1.0 1.0; aspect_preference: BOTH; \ image.image: _FILE COMP; \ image.normal: _FILE; \ diff --git a/data/themes/edc/icons.edc b/data/themes/edc/icons.edc new file mode 100644 index 000000000..6ee12b0f7 --- /dev/null +++ b/data/themes/edc/icons.edc @@ -0,0 +1,26 @@ +#define ICON(_NAME, _SIZE, _FILE) \ + group { \ + name: "e/icons/"_NAME; \ + max: _SIZE _SIZE; \ + parts { \ + part { name: "icon"; mouse_events: 0; \ + description { state: "default" 0.0; \ + max: _SIZE _SIZE; \ + aspect: 1.0 1.0; aspect_preference: BOTH; \ + image.image: _FILE COMP; \ + image.normal: _FILE; \ + } \ + } \ + } \ + } + + ICON("system", 80, "icon_system.png") + ICON("system-shutdown", 80, "icon_system-shutdown.png") + ICON("system-restart", 80, "icon_system-restart.png") + ICON("system-suspend", 80, "icon_system-suspend.png") + ICON("system-suspend-hibernate", 80, "icon_system-suspend-hibernate.png") + ICON("system-log-out", 80, "icon_system-log-out.png") + ICON("system-lock-screen", 80, "icon_system-lock-screen.png") + + ICON("application-exit", 80, "icon_system-log-out.png") +#undef ICON diff --git a/data/themes/img/icon_system-lock-screen.png b/data/themes/img/icon_system-lock-screen.png new file mode 100644 index 000000000..288da7518 Binary files /dev/null and b/data/themes/img/icon_system-lock-screen.png differ diff --git a/data/themes/img/icon_system-log-out.png b/data/themes/img/icon_system-log-out.png new file mode 100644 index 000000000..e29f5936a Binary files /dev/null and b/data/themes/img/icon_system-log-out.png differ diff --git a/data/themes/img/icon_system-restart.png b/data/themes/img/icon_system-restart.png new file mode 100644 index 000000000..893aa939e Binary files /dev/null and b/data/themes/img/icon_system-restart.png differ diff --git a/data/themes/img/icon_system-shutdown.png b/data/themes/img/icon_system-shutdown.png new file mode 100644 index 000000000..f71f7b8cc Binary files /dev/null and b/data/themes/img/icon_system-shutdown.png differ diff --git a/data/themes/img/icon_system-suspend-hibernate.png b/data/themes/img/icon_system-suspend-hibernate.png new file mode 100644 index 000000000..6ecbebff5 Binary files /dev/null and b/data/themes/img/icon_system-suspend-hibernate.png differ diff --git a/data/themes/img/icon_system-suspend.png b/data/themes/img/icon_system-suspend.png new file mode 100644 index 000000000..28f912a00 Binary files /dev/null and b/data/themes/img/icon_system-suspend.png differ diff --git a/data/themes/img/icon_system.png b/data/themes/img/icon_system.png new file mode 100644 index 000000000..90d11c2d3 Binary files /dev/null and b/data/themes/img/icon_system.png differ