From bf3c0ad3a562be60379ccf6616f81f1f1a326569 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 13 May 2009 00:45:21 +0000 Subject: [PATCH] finish systray merge to e/src/modules. systray is now officially supported (at least by me :-P) and is included in standard e17 module set. SVN revision: 40610 --- configure.ac | 3 + data/themes/default.edc | 500 ++++++++++++++++++ .../themes/images/systray_rounded_corners.png | Bin 0 -> 223 bytes src/modules/Makefile.am | 6 +- src/modules/systray/Makefile.am | 34 +- src/modules/systray/e-module-systray.edj | Bin 0 -> 6920 bytes 6 files changed, 530 insertions(+), 13 deletions(-) create mode 100644 data/themes/images/systray_rounded_corners.png create mode 100644 src/modules/systray/e-module-systray.edj diff --git a/configure.ac b/configure.ac index 26b151606..f23cd2b6b 100644 --- a/configure.ac +++ b/configure.ac @@ -424,6 +424,7 @@ AC_E_OPTIONAL_MODULE([connman], false) AC_E_OPTIONAL_MODULE([illume], true) AC_E_OPTIONAL_MODULE([syscon], true) AC_E_OPTIONAL_MODULE([everything], true) +AC_E_OPTIONAL_MODULE([systray], true) AC_OUTPUT([ Makefile @@ -558,6 +559,8 @@ src/modules/syscon/Makefile src/modules/syscon/module.desktop src/modules/everything/Makefile src/modules/everything/module.desktop +src/modules/systray/Makefile +src/modules/systray/module.desktop src/preload/Makefile data/Makefile data/images/Makefile diff --git a/data/themes/default.edc b/data/themes/default.edc index aba5d6be9..9fafcbcf6 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -10004,6 +10004,506 @@ collections { /* begin the collection of edje groups that are in this file */ } } +///////////////////////////////////////////////////////////////////////////// + /*** MOD: SYSTRAY ***/ + group { name: "e/modules/systray/main"; + alias: "e/modules/systray/main/default"; + alias: "e/modules/systray/main/invisible"; + data { + item: "inset" "255 255 255"; + item: "plain" "230 230 230"; + item: "default" "255 255 255"; + } + parts { + part { name: "base"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 0 0 128; + } + } + part { name: "e.size"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + } + } + part { name: "e.box"; + type: BOX; + description { state: "default" 0.0; + rel1.to: "e.size"; + rel2.to: "e.size"; + box { + layout: "horizontal"; + padding: 2 0; + align: 0.5 0.5; + min: 1 1; + } + } + description { state: "vertical" 0.0; + rel1.to: "e.size"; + rel2.to: "e.size"; + box { + layout: "vertical"; + padding: 0 2; + align: 0.5 0.5; + min: 1 1; + } + } + } + programs { + program { name: "e,action,disable"; + signal: "e,action,disable"; + source: "e"; + action: STATE_SET "disabled" 0.0; + target: "base"; + } + program { name: "e,action,enable"; + signal: "e,action,enable"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "e,action,orient,float"; + signal: "e,action,orient,float"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,horiz"; + signal: "e,action,orient,horiz"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,vert"; + signal: "e,action,orient,vert"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,left"; + signal: "e,action,orient,left"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,right"; + signal: "e,action,orient,right"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,top"; + signal: "e,action,orient,top"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,bottom"; + signal: "e,action,orient,bottom"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_tl"; + signal: "e,action,orient,corner_tl"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_tr"; + signal: "e,action,orient,corner_tr"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_bl"; + signal: "e,action,orient,corner_bl"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_br"; + signal: "e,action,orient,corner_br"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_lt"; + signal: "e,action,orient,corner_lt"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_rt"; + signal: "e,action,orient,corner_rt"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_lb"; + signal: "e,action,orient,corner_lb"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_rb"; + signal: "e,action,orient,corner_rb"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + } + } + } + + group { name: "e/modules/systray/main/alternate"; + data { + item: "inset" "255 255 255"; + item: "plain" "255 255 255"; + item: "default" "255 255 255"; + } + images.image: "systray_rounded_corners.png" COMP; + parts { + part { name: "base"; + type: RECT; + description { + state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "rounded_corners"; + type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + offset: -3 -3; + to: "e.size"; + } + rel2 { + relative: 1.0 1.0; + offset: 2 2; + to: "e.size"; + } + image { + normal: "systray_rounded_corners.png"; + border: 3 3 3 3; + middle: SOLID; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 0 0 128; + } + } + part { name: "e.size"; + type: RECT; + mouse_events: 0; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + } + } + part { name: "e.box"; + type: BOX; + description { + state: "default" 0.0; + rel1.to: "e.size"; + rel2.to: "e.size"; + box { + layout: "horizontal"; + padding: 2 0; + align: 0.5 0.5; + min: 1 1; + } + } + description { state: "vertical" 0.0; + rel1.to: "e.size"; + rel2.to: "e.size"; + box { + layout: "vertical"; + padding: 0 2; + align: 0.5 0.5; + min: 1 1; + } + } + } + programs { + program { name: "e,action,disable"; + signal: "e,action,disable"; + source: "e"; + action: STATE_SET "disabled" 0.0; + target: "rounded_corners"; + } + program { name: "e,action,enable"; + signal: "e,action,enable"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "rounded_corners"; + } + program { name: "e,action,orient,float"; + signal: "e,action,orient,float"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,horiz"; + signal: "e,action,orient,horiz"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,vert"; + signal: "e,action,orient,vert"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,left"; + signal: "e,action,orient,left"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,right"; + signal: "e,action,orient,right"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,top"; + signal: "e,action,orient,top"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,bottom"; + signal: "e,action,orient,bottom"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_tl"; + signal: "e,action,orient,corner_tl"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_tr"; + signal: "e,action,orient,corner_tr"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_bl"; + signal: "e,action,orient,corner_bl"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_br"; + signal: "e,action,orient,corner_br"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_lt"; + signal: "e,action,orient,corner_lt"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_rt"; + signal: "e,action,orient,corner_rt"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_lb"; + signal: "e,action,orient,corner_lb"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_rb"; + signal: "e,action,orient,corner_rb"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + } + } + } + + group { name: "e/modules/systray/main/alternate/inset"; + data { + item: "inset" "255 255 255"; + item: "plain" "255 255 255"; + item: "default" "255 255 255"; + } + parts { + part { name: "base"; + type: RECT; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 0 0 128; + } + } + part { name: "e.size"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + color: 0 0 0 0; + rel1.offset: 4 4; + rel2.offset: -5 -5; + } + } + part { name: "e.box"; + type: BOX; + description { + state: "default" 0.0; + rel1.to: "e.size"; + rel2.to: "e.size"; + box { + layout: "horizontal"; + padding: 2 0; + align: 0.5 0.5; + min: 1 1; + } + } + description { state: "vertical" 0.0; + rel1.to: "e.size"; + rel2.to: "e.size"; + box { + layout: "vertical"; + padding: 0 2; + align: 0.5 0.5; + min: 1 1; + } + } + } + programs { + program { name: "e,action,disable"; + signal: "e,action,disable"; + source: "e"; + action: STATE_SET "disabled" 0.0; + target: "base"; + } + program { name: "e,action,enable"; + signal: "e,action,enable"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "base"; + } + program { name: "e,action,orient,float"; + signal: "e,action,orient,float"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,horiz"; + signal: "e,action,orient,horiz"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,vert"; + signal: "e,action,orient,vert"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,left"; + signal: "e,action,orient,left"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,right"; + signal: "e,action,orient,right"; + source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,top"; + signal: "e,action,orient,top"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,bottom"; + signal: "e,action,orient,bottom"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_tl"; + signal: "e,action,orient,corner_tl"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_tr"; + signal: "e,action,orient,corner_tr"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_bl"; + signal: "e,action,orient,corner_bl"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_br"; + signal: "e,action,orient,corner_br"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_lt"; + signal: "e,action,orient,corner_lt"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_rt"; + signal: "e,action,orient,corner_rt"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_lb"; + signal: "e,action,orient,corner_lb"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + program { name: "e,action,orient,corner_rb"; + signal: "e,action,orient,corner_rb"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "e.box"; + } + } + } + } + ///////////////////////////////////////////////////////////////////////////// /*** MOD: WINLIST ***/ diff --git a/data/themes/images/systray_rounded_corners.png b/data/themes/images/systray_rounded_corners.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb669db72b1da7c87786119da6d5f1b44aef077 GIT binary patch literal 223 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 O-kx1wQ?4Jo*8c|-evJ|U literal 0 HcmV?d00001