discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=df5106f1cbaf058c4e81e3d060b44f05ee0105d1

commit df5106f1cbaf058c4e81e3d060b44f05ee0105d1
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Jan 22 15:46:22 2016 -0500

    ship tiling module edj file
    
    this never gets edited, no point in compiling it every build
---
 src/modules/Makefile_tiling.mk                |  12 +----
 src/modules/tiling/.gitignore                 |   1 -
 src/modules/tiling/e-module-tiling.edc        |  71 --------------------------
 src/modules/tiling/e-module-tiling.edj        | Bin 0 -> 12690 bytes
 src/modules/tiling/images/icon_floating.png   | Bin 937 -> 0 bytes
 src/modules/tiling/images/icon_horizontal.png | Bin 528 -> 0 bytes
 src/modules/tiling/images/icon_vertical.png   | Bin 502 -> 0 bytes
 src/modules/tiling/images/module_icon.png     | Bin 659 -> 0 bytes
 8 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk
index ce36179..932b75c 100644
--- a/src/modules/Makefile_tiling.mk
+++ b/src/modules/Makefile_tiling.mk
@@ -1,23 +1,13 @@
 EXTRA_DIST += src/modules/tiling/module.desktop.in \
-src/modules/tiling/e-module-tiling.edc \
-src/modules/tiling/images/icon_floating.png \
-src/modules/tiling/images/icon_horizontal.png \
-src/modules/tiling/images/icon_vertical.png \
-src/modules/tiling/images/module_icon.png
+src/modules/tiling/e-module-tiling.edj
 if USE_MODULE_TILING
 tilingdir = $(MDIR)/tiling
 tiling_DATA = src/modules/tiling/e-module-tiling.edj \
              src/modules/tiling/module.desktop
-CLEANFILES += src/modules/tiling/e-module-tiling.edj
 
 tilingpkgdir = $(MDIR)/tiling/$(MODULE_ARCH)
 tilingpkg_LTLIBRARIES = src/modules/tiling/module.la
 
-TILING_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/tiling/images
-
-src/modules/tiling/%.edj: src/modules/tiling/%.edc Makefile
-       $(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@
-
 src_modules_tiling_module_la_LIBADD = $(MOD_LIBS)
 src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_tiling_module_la_LDFLAGS = $(MOD_LDFLAGS)
diff --git a/src/modules/tiling/.gitignore b/src/modules/tiling/.gitignore
deleted file mode 100644
index d6ceca6..0000000
--- a/src/modules/tiling/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-e-module-tiling.edj
diff --git a/src/modules/tiling/e-module-tiling.edc 
b/src/modules/tiling/e-module-tiling.edc
deleted file mode 100644
index f44c69e..0000000
--- a/src/modules/tiling/e-module-tiling.edc
+++ /dev/null
@@ -1,71 +0,0 @@
-images {
-   image: "module_icon.png" COMP;
-
-   image: "icon_vertical.png" COMP;
-   image: "icon_horizontal.png" COMP;
-   image: "icon_floating.png" COMP;
-}
-collections {
-    group {
-        name: "icon";
-        parts {
-            part {
-                name: "image";
-                mouse_events: 0;
-                description {
-                    state: "default" 0.0;
-                    aspect: 1.0 1.0;
-                    aspect_preference: BOTH;
-                    image.normal: "module_icon.png";
-                }
-            }
-        }
-    }
-    group {
-        name: "modules/tiling/main";
-        parts {
-            part {
-                name: "image";
-                description {
-                    state: "default" 0.0;
-                    aspect: 1.0 1.0;
-                    aspect_preference: BOTH;
-                    image.normal: "icon_horizontal.png";
-                }
-                description {
-                    state: "vertical" 0.0;
-                    inherit: "default" 0.0;
-                    image.normal: "icon_vertical.png";
-                }
-                description {
-                    state: "floating" 0.0;
-                    inherit: "default" 0.0;
-                    image.normal: "icon_floating.png";
-                }
-            }
-        }
-        programs {
-            program {
-                name: "to_horizontal";
-                signal: "tiling,mode,horizontal";
-                source: "e";
-                action: STATE_SET "default" 0.0;
-                target: "image";
-            }
-            program {
-                name: "to_vertical";
-                signal: "tiling,mode,vertical";
-                source: "e";
-                action: STATE_SET "vertical" 0.0;
-                target: "image";
-            }
-            program {
-                name: "to_floating";
-                signal: "tiling,mode,floating";
-                source: "e";
-                action: STATE_SET "floating" 0.0;
-                target: "image";
-            }
-        }
-    }
-}
diff --git a/src/modules/tiling/e-module-tiling.edj 
b/src/modules/tiling/e-module-tiling.edj
new file mode 100644
index 0000000..ae6f255
Binary files /dev/null and b/src/modules/tiling/e-module-tiling.edj differ
diff --git a/src/modules/tiling/images/icon_floating.png 
b/src/modules/tiling/images/icon_floating.png
deleted file mode 100644
index 1bde818..0000000
Binary files a/src/modules/tiling/images/icon_floating.png and /dev/null differ
diff --git a/src/modules/tiling/images/icon_horizontal.png 
b/src/modules/tiling/images/icon_horizontal.png
deleted file mode 100644
index a8a9062..0000000
Binary files a/src/modules/tiling/images/icon_horizontal.png and /dev/null 
differ
diff --git a/src/modules/tiling/images/icon_vertical.png 
b/src/modules/tiling/images/icon_vertical.png
deleted file mode 100644
index 80a2e9b..0000000
Binary files a/src/modules/tiling/images/icon_vertical.png and /dev/null differ
diff --git a/src/modules/tiling/images/module_icon.png 
b/src/modules/tiling/images/module_icon.png
deleted file mode 100644
index 328acc9..0000000
Binary files a/src/modules/tiling/images/module_icon.png and /dev/null differ

-- 


Reply via email to