discomfitor pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=e63871d929e44eb6353726f95ad03ccfa27f118e
commit e63871d929e44eb6353726f95ad03ccfa27f118e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Aug 4 16:24:58 2017 -0400
generate fewer files
---
.gitignore | 2 -
Makefile.am | 7 +-
configure.ac | 14 -
e-module-desksanity.edc | 668 ------------------------------------
e-module-desksanity.edj | Bin 0 -> 65422 bytes
epic-e-256.png | Bin 36975 -> 0 bytes
glow_bottom.png | Bin 5012 -> 0 bytes
glow_top.png | Bin 5036 -> 0 bytes
module.desktop.in => module.desktop | 0
win_shadow.png | Bin 501 -> 0 bytes
10 files changed, 2 insertions(+), 689 deletions(-)
diff --git a/.gitignore b/.gitignore
index f5b4407..a524f64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ config.sub
configure
configure.ac.orig
depcomp
-e-module-desksanity.edj
e_modules-desksanity.spec
install-sh
libtool
@@ -29,7 +28,6 @@ ltmain.sh
*.m4
missing
mkinstalldirs
-module.desktop
po/Makefile
po/Makefile.in
po/Makefile.in.in
diff --git a/Makefile.am b/Makefile.am
index a52b50e..be97488 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
config.sub configure compile depcomp install-sh
ltmain.sh \
- missing module.desktop config.rpath mkinstalldirs
+ missing config.rpath mkinstalldirs
#if HAVE_PO
@@ -25,11 +25,8 @@ glow_top.png
include src/Makefile.mk
-e-module-desksanity.edj: e-module-desksanity.edc
- $(EDJE_CC) -id $(top_srcdir) $< $@
-
clean-local:
- rm -rf *.edj module.desktop e_modules-desksanity.spec *~
+ rm rf e_modules-desksanity.spec *~
uninstall-local:
rm -rf $(DESTDIR)$(module_dir)/$(PACKAGE)
diff --git a/configure.ac b/configure.ac
index c6c8df8..cd4911c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,23 +47,9 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module
architecture")
module_dir="$(pkg-config --variable=modules enlightenment)"
AC_SUBST(module_dir)
datadir="$module_dir/desksanity"
-# Find edje_cc
-AC_ARG_WITH(edje-cc,
- AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
- [
- v=$withval;
- EDJE_CC=$v
- ],[
- EDJE_CC=$(pkg-config --variable=prefix edje)/bin/edje_cc
- ]
-)
-AC_SUBST(EDJE_CC)
-AC_MSG_CHECKING([Which edje_cc to use])
-AC_MSG_RESULT(${EDJE_CC})
AC_OUTPUT([
Makefile
-module.desktop
e_modules-desksanity.spec
], [
])
diff --git a/e-module-desksanity.edc b/e-module-desksanity.edc
deleted file mode 100644
index 01f8ddd..0000000
--- a/e-module-desksanity.edc
+++ /dev/null
@@ -1,668 +0,0 @@
-collections {
- group { name: "icon";
- images.image: "epic-e-256.png" COMP;
- parts {
- part { name: "icon"; mouse_events: 0;
- description { state: "default";
- aspect_preference: BOTH;
- image.normal: "epic-e-256.png";
- }
- }
- }
- }
- group { name: "e/modules/desksanity/moveresize";
- parts {
- part { name: "outline"; type: TEXT; mouse_events: 0;
- effect: OUTLINE;
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "e.text";
- rel1.offset: -1 -1;
- rel2.to: "e.text";
- color: 0 0 0 255;
- color2: 0 0 0 255;
- color3: 0 0 0 255;
- text { font: "Sans"; size: 16;
- text_source: "e.text";
- min: 1 1;
- ellipsis: -1;
- }
- }
- }
- part { name: "e.text"; type: TEXT; mouse_events: 0;
- effect: GLOW;
- scale: 1;
- description { state: "default" 0.0;
- color: 51 153 255 255;
- color2: 51 153 255 24;
- color3: 51 153 255 18;
- text { font: "Sans"; size: 16;
- min: 1 1;
- ellipsis: -1;
- }
- }
- }
- }
- }
- group { name: "e/modules/desksanity/zoom/base"; program_source: "e";
- parts {
- rect { "drag_clip"; nomouse;
- desc { hid; }
- desc { "vis";
- link.base: "e,state,dragging";
- }
- }
- rect { "zoomt"; clip: "drag_clip"; nomouse;
- desc {
- min: 0 4;
- max: -1 4;
- fixed: 1 1;
- rel2.relative: 1 0;
- color: 51 153 255 0;
- hid;
- }
- desc { "enable"; inherit: "default";
- color: 51 153 255 200;
- vis;
- }
- desc { "anim"; inherit: "enable";
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- }
- }
- rect { "zooml"; clip: "drag_clip"; nomouse;
- desc {
- min: 4 0;
- max: 4 -1;
- fixed: 1 1;
- rel2.relative: 0 1;
- color: 51 153 255 0;
- hid;
- }
- desc { "enable"; inherit: "default";
- color: 51 153 255 200;
- vis;
- }
- desc { "anim"; inherit: "enable";
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- }
- }
- rect { "zoomr"; clip: "drag_clip"; nomouse;
- desc {
- min: 4 0;
- max: 4 -1;
- fixed: 1 1;
- rel1.relative: 1 0;
- color: 51 153 255 0;
- hid;
- }
- desc { "enable"; inherit: "default";
- color: 51 153 255 200;
- vis;
- }
- desc { "anim"; inherit: "enable";
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- }
- }
- rect { "zoomb"; clip: "drag_clip"; nomouse;
- desc {
- min: 0 4;
- max: -1 4;
- fixed: 1 1;
- rel1.relative: 0 1;
- color: 51 153 255 0;
- hid;
- }
- desc { "enable"; inherit: "default";
- color: 51 153 255 200;
- vis;
- }
- desc { "anim"; inherit: "enable";
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- }
- }
- program { signal: "e,state,current";
- after: "drag_start";
- }
- program { "drag_start"; filter: "drag_clip" "vis";
- signal: "mouse,in"; source: "events";
- action: STATE_SET "enable";
- transition: LINEAR 0.1;
- targets: "zoomt" "zooml" "zoomr" "zoomb";
- after: "drag_anim";
- }
- program { filter: "drag_clip" "vis";
- signal: "mouse,out"; source: "events";
- action: STATE_SET "default";
- transition: ACCEL 0.1;
- targets: "zoomt" "zooml" "zoomr" "zoomb";
- }
- program { "drag_anim";
- action: STATE_SET "anim";
- transition: ACCEL 0.8;
- targets: "zoomt" "zooml" "zoomr" "zoomb";
- after: "drag_anim2";
- }
- program { "drag_anim2";
- action: STATE_SET "default";
- targets: "zoomt" "zooml" "zoomr" "zoomb";
- after: "drag_anim";
- }
- swallow { "e.swallow.background"; clip: "clip";
- }
- rect { "fader";
- desc {
- color: 0 0 0 0;
- link.base: "e,state,dragging";
- link.transition: LINEAR 0.3;
- link.base: "e,state,inactive";
- link.transition: LINEAR 0.3;
- link.after: "fade_post";
- }
- desc { "fade";
- color: 0 0 0 192;
- link.base: "e,state,active";
- link.transition: LINEAR 0.3;
- }
- program { "fade_post";
- action: SIGNAL_EMIT "e,action,done" "e";
- }
- }
- rect { "clip";
- desc { hid; color: 255 255 255 0;
- link.base: "e,state,dragging";
- link.transition: LINEAR 0.3;
- link.base: "e,state,inactive";
- link.transition: LINEAR 0.3;
- }
- desc { "active";
- link.base: "e,state,active";
- link.transition: LINEAR 0.3;
- }
- }
- swallow { "e.swallow.layout"; clip: "clip"; }
- program { signal: "e,state,inactive";
- action: SIGNAL_EMIT "e,state,hiding" "e";
- }
- rect { "events"; repeat;
- desc { color: 0 0 0 0; }
- }
- }
- }
- group { name: "e/modules/desksanity/zoom/scrollframe";
- images.image: "glow_bottom.png" COMP;
- images.image: "glow_top.png" COMP;
- script {
- public visible;
- public top_visible() {
- new st[31], Float:vl;
- get_state(PART:"top_clip", st, 30, vl);
- if (!strcmp(st, "default")) {
- run_program(get_program_id("tp_vis"));
- run_program(get_program_id("tp_glow"));
- }
- }
- public bottom_visible() {
- new st[31], Float:vl;
- get_state(PART:"bottom_clip", st, 30, vl);
- if (!strcmp(st, "default")) {
- run_program(get_program_id("btm_vis"));
- run_program(get_program_id("btm_glow"));
- }
- }
- }
- parts {
- rect { "elm.dragable.vbar";
- dragable.x: 0 0 0;
- dragable.y: 1 1 0;
- dragable.confine: "elm.swallow.content";
- desc {
- max: 0 0;
- fixed: 1 1;
- color: 0 0 0 0;
- }
- }
- rect { "elm.dragable.hbar";
- dragable.x: 0 0 0;
- dragable.y: 1 1 0;
- dragable.confine: "elm.swallow.content";
- desc {
- max: 0 0;
- fixed: 1 1;
- color: 0 0 0 0;
- }
- }
- rect { "top_clip";
- desc {
- color: 255 255 255 0;
- hid;
- }
- desc { "visible";
- color: 255 255 255 180;
- vis;
- }
- }
- part { "glow_top"; clip: "top_clip";
- desc { "default";
- fixed: 0 1;
- min: 16 2;
- image.normal: "glow_top.png";
- aspect: 330 32;
- rel2.relative: 1 0;
- rel2.to_y: "elm.swallow.content";
- rel1.offset: 0 4;
- }
- desc { "glow"; inherit: "default";
- color: 255 255 255 100;
- }
- }
- program { name: "scr_eval";
- signal: "drag,set"; source: "elm.dragable.vbar";
- script {
- new Float:x, Float:y;
-
- if (get_int(visible)) {
- get_drag(PART:"elm.dragable.vbar", x, y);
- if (y < 1.0)
- bottom_visible();
- else
- run_program(get_program_id("bottom_hidden"));
- if (y > 0.0)
- top_visible();
- else
- run_program(get_program_id("top_hidden"));
- }
- }
- }
- program { "tp_vis";
- action: STATE_SET "visible";
- target: "top_clip";
- transition: LINEAR 0.2;
- }
- program { "tp_glow";
- action: STATE_SET "glow";
- target: "glow_top";
- transition: SINUSOIDAL 0.7;
- sequence {
- action: STATE_SET "default";
- target: "glow_top";
- transition: SINUSOIDAL 0.7;
- after: "tp_glow";
- }
- }
- program { name: "top_hidden";
- action: STATE_SET "default";
- targets: "top_clip" "glow_top";
- transition: LINEAR 0.2 CURRENT;
- }
- program { signal: "elm,action,show,vbar"; source: "elm";
- script {
- set_int(visible, 1);
- }
- after: "scr_eval";
- }
- program { signal: "elm,action,hide,vbar"; source: "elm";
- script {
- set_int(visible, 0);
- }
- sequence {
- action: STATE_SET "default";
- targets: "top_clip" "bottom_clip";
- transition: LINEAR 0.2;
- }
- }
- rect { "bottom_clip";
- desc {
- color: 255 255 255 0;
- hid;
- }
- desc { "visible";
- color: 255 255 255 180;
- vis;
- }
- }
- part { "glow_bottom"; clip: "bottom_clip";
- desc {
- fixed: 0 1;
- min: 16 2;
- image.normal: "glow_bottom.png";
- aspect: 330 32;
- rel1.relative: 0 1;
- rel1.to_y: "elm.swallow.content";
- }
- desc { "glow"; inherit: "default";
- color: 255 255 255 100;
- }
- }
- program { "btm_vis";
- action: STATE_SET "visible";
- target: "bottom_clip";
- transition: LINEAR 0.2;
- }
- program { "btm_glow";
- action: STATE_SET "glow";
- target: "glow_bottom";
- transition: SINUSOIDAL 0.7;
- sequence {
- action: STATE_SET "default";
- target: "glow_bottom";
- transition: SINUSOIDAL 0.7;
- after: "btm_glow";
- }
- }
- program { name: "bottom_hidden";
- action: STATE_SET "default";
- targets: "bottom_clip" "glow_bottom";
- transition: LINEAR 0.2 CURRENT;
- }
- rect { "clipper"; nomouse;
- desc {
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- }
- }
- swallow { "elm.swallow.content";
- clip: "clipper";
- }
- }
- }
- group { name: "e/modules/desksanity/zoom/client"; nomouse;
- images.image: "win_shadow.png" COMP;
- script {
- public message(Msg_Type:type, id, ...) {
- if (type == MSG_INT_SET) {
- /* client diff geom[4] */
- new x, y, w, h;
-
- x = getarg(2);
- y = getarg(3);
- w = getarg(4);
- h = getarg(5);
-
- custom_state(PART:"spacer", "default", 0.0);
- set_state_val(PART:"spacer", STATE_REL1_OFFSET, x, y);
- set_state_val(PART:"spacer", STATE_REL2_OFFSET, w, h);
- set_state(PART:"spacer", "custom", 0.0);
- }
- }
- }
- parts {
- spacer { "spacer";
- program { signal: "e,action,show"; source: "e";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.3;
- target: "spacer";
- //after: "idle";
- }
- program { signal: "e,action,hide"; source: "e";
- action: STATE_SET "custom" 0.0;
- transition: LINEAR 0.3;
- target: "spacer";
- }
- }
- part { "shadow"; clip: "clip";
- desc {
- image.normal: "win_shadow.png";
- image.border: 14 14 14 14;
- image.middle: 0;
- rel1.to: "e.swallow.client";
- rel1.offset: -7 -3;
- rel2.to: "e.swallow.client";
- rel2.offset: 6 11;
- fill.smooth: 0;
- }
- }
- rect { "outline"; clip: "clip";
- desc {
- color: 51 153 255 0;
- rel1.to: "e.swallow.client";
- rel1.offset: -2 -2;
- rel2.to: "e.swallow.client";
- rel2.offset: 1 1;
- visible: 0;
- link.base: "e,state,unfocused" "e";
- link.transition: LINEAR 0.2;
- }
- desc { "active"; inherit: "default";
- color: 51 153 255 140;
- visible: 1;
- link.base: "e,state,focused" "e";
- link.transition: LINEAR 0.2;
- }
- }
- rect { "bg";
- desc {
- color: 0 0 0 255;
- rel1.to: "e.swallow.client";
- rel2.to: "e.swallow.client";
- }
- }
- swallow { "e.swallow.client"; clip: "clip";
- desc {
- rel1.to: "spacer";
- rel2.to: "spacer";
- rel1.offset: 10 10;
- rel2.offset: -10 -10;
- link.base: "e,state,inactive" "e";
- link.transition: LINEAR 0.2;
- //link.after: "idle";
- }
- desc { "active";
- rel1.to: "spacer";
- rel2.to: "spacer";
- rel1.relative: -0.01 -0.01;
- rel2.relative: 1.01 1.01;
- rel2.offset: -1 -1;
- link.base: "e,state,active" "e";
- link.transition: LINEAR 0.2;
- }
- desc { "idle1"; inherit: "default";
- map.on: 1;
- map.rotation.z: -5;
- }
- desc { "idle2"; inherit: "idle1";
- map.rotation.z: 5;
- }
- desc { "idle3"; inherit: "idle1";
- map.rotation.z: 5;
- map.rotation.x: -70;
- }
- desc { "idle4"; inherit: "idle1";
- map.rotation.z: 0;
- map.rotation.x: -360;
- map.rotation.y: 360;
- }
- program { "idle";
- in: 2.0 10.0;
- action: STATE_SET "idle1";
- transition: SINUSOIDAL 6.0;
- target: "e.swallow.client";
- sequence {
- action: STATE_SET "idle2";
- name: "idle2";
- transition: SINUSOIDAL 6.0;
- target: "e.swallow.client";
- in: 2.0 10.0;
-
- action: STATE_SET "idle3";
- name: "idle3";
- transition: ACCEL 6.0;
- target: "e.swallow.client";
- in: 2.0 10.0;
-
- action: STATE_SET "idle4";
- name: "idle4";
- transition: SINUSOIDAL 6.0;
- target: "e.swallow.client";
- in: 2.0 10.0;
- after: "idle";
- }
- }
- }
- rect { "clip";
- desc {
- rel1.offset: -9999 -9999;
- rel2.offset: 9999 9999;
- color: 200 200 200 200;
- link.base: "e,state,inactive" "e";
- link.transition: LINEAR 0.2;
- }
- desc { "active"; inherit: "default";
- color: 255 255 255 255;
- link.base: "e,state,active" "e";
- link.transition: LINEAR 0.2;
- }
- }
- proxy { "clone";
- desc {
- source: "e.swallow.client";
- rel1.to: "e.swallow.client";
- rel2.to: "e.swallow.client";
- hid;
- color: 255 255 255 0;
- }
- desc { "urgent1"; inherit: "default";
- vis;
- color: 255 255 255 255;
- }
- desc { "urgent2"; inherit: "default";
- vis;
- rel1.relative: -0.5 -0.5;
- rel2.relative: 1.5 1.5;
- color: 255 255 255 0;
- }
- program { name: "urgent";
- signal: "e,state,urgent"; source: "e";
- action: ACTION_STOP;
- target: "go_big";
- target: "go_big2";
- after: "go_big";
- }
- program { name: "go_big";
- action: STATE_SET "urgent1" 0.0;
- target: "clone";
- after: "go_big2";
- }
- program { name: "go_big2";
- action: STATE_SET "urgent2" 0.0;
- transition: LINEAR 0.5;
- target: "clone";
- after: "go_big";
- }
- program { name: "not_urgent";
- signal: "e,state,not_urgent"; source: "e";
- action: ACTION_STOP;
- target: "go_big";
- target: "go_big2";
- after: "go_hid";
- }
- program { name: "go_hid";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.5;
- target: "clone";
- }
- }
- text { "e.text.title"; clip: "clip"; effect: OUTLINE;
- desc {
- fixed: 1 1;
- align: 0.0 0.0;
- rel1.to_x: "e.swallow.icon";
- rel1.to_y: "e.swallow.client";
- rel1.relative: 1.0 1.0;
- rel1.offset: 0 10;
- rel2.to: "e.swallow.client";
- color: 255 255 255 255;
- color3: 0 0 0 255;
- text {
- font: "Sans:style=Bold"; size: 12;
- }
- }
- }
- swallow { "e.swallow.icon"; clip: "clip";
- desc {
- fixed: 1 1;
- min: 16 16;
- align: 0.0 0.0;
- rel1.to_x: "e.swallow.client";
- rel1.to_y: "e.text.title";
- rel1.offset: 0 -6;
- rel2.to: "e.swallow.client";
- rel2.relative: 0.0 1.0;
- }
- }
- rect { "events"; mouse; repeat;
- desc { color: 0 0 0 0; };
- program { signal: "mouse,clicked,1"; source: "events";
- action: SIGNAL_EMIT "e,action,activate" "e";
- }
- program { signal: "mouse,in"; source: "events";
- sequence {
- action: ACTION_STOP;
- targets: "idle" "idle2" "idle3" "idle4";
- }
- }
- }
- }
- }
- group { "e/modules/desksanity/zoom/client/drag";
- images.image: "win_shadow.png" COMP;
- script {
- public message(Msg_Type:type, id, ...) {
- if (type == MSG_INT_SET) {
- /* client diff geom[4] */
- new x, y, w, h;
-
- x = getarg(2);
- y = getarg(3);
- w = getarg(4);
- h = getarg(5);
-
- custom_state(PART:"e.swallow.client", "default", 0.0);
- set_state_val(PART:"e.swallow.client", STATE_REL1_OFFSET, x, y);
- set_state_val(PART:"e.swallow.client", STATE_REL2_OFFSET, w, h);
- }
- }
- }
- parts {
- rect { "clip";
- desc {}
- desc { "hid"; hid;
- color: 255 255 255 0;
- link.base: "e,drag,release" "e";
- link.transition: LINEAR 0.1;
- }
- }
- image { "shadow"; clip: "clip";
- desc {
- image.normal: "win_shadow.png";
- image.border: 14 14 14 14;
- image.middle: 0;
- rel1.to: "e.swallow.client";
- rel1.offset: -7 -3;
- rel2.to: "e.swallow.client";
- rel2.offset: 6 11;
- fill.smooth: 0;
- }
- }
- swallow { "e.swallow.client"; }
- rect { "over"; clip: "clip";
- desc {
- rel1.to: "e.swallow.client";
- rel2.to: "e.swallow.client";
- color: 255 255 255 90;
- }
- }
- program { signal: "e,drag,release"; source: "e";
- action: STATE_SET "custom";
- target: "e.swallow.client";
- transition: LINEAR 0.1;
- sequence {
- action: SIGNAL_EMIT "e,action,done" "e";
- }
- }
- }
- }
-}
diff --git a/e-module-desksanity.edj b/e-module-desksanity.edj
new file mode 100644
index 0000000..3a8e148
Binary files /dev/null and b/e-module-desksanity.edj differ
diff --git a/epic-e-256.png b/epic-e-256.png
deleted file mode 100644
index 1180920..0000000
Binary files a/epic-e-256.png and /dev/null differ
diff --git a/glow_bottom.png b/glow_bottom.png
deleted file mode 100644
index 0819bbd..0000000
Binary files a/glow_bottom.png and /dev/null differ
diff --git a/glow_top.png b/glow_top.png
deleted file mode 100644
index a674471..0000000
Binary files a/glow_top.png and /dev/null differ
diff --git a/module.desktop.in b/module.desktop
similarity index 100%
rename from module.desktop.in
rename to module.desktop
diff --git a/win_shadow.png b/win_shadow.png
deleted file mode 100644
index 98f158e..0000000
Binary files a/win_shadow.png and /dev/null differ
--
