elementary: integrate elm_code theme.

7 files changed, 18 insertions, 47 deletions

diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index 40a2000050..19ff5e466a 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -95,6 +95,7 @@ elementary/themes/edc/elm/button.edc \
 elementary/themes/edc/elm/calendar.edc \
 elementary/themes/edc/elm/check.edc \
 elementary/themes/edc/elm/clock.edc \
+elementary/themes/edc/elm/code.edc \
 elementary/themes/edc/elm/colorsel.edc \
 elementary/themes/edc/elm/colorclass.edc \
 elementary/themes/edc/elm/conform.edc \
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index cf88829c97..de83033134 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -72,6 +72,7 @@ collections {
 #include "edc/elm/gengrid.edc"
 #include "edc/elm/hover.edc"
 #include "edc/elm/cursor.edc"
+#include "edc/elm/code.edc"
 
 // desktop in general
 #include "edc/wallpaper.edc"
diff --git a/data/elementary/themes/edc/elm/code.edc b/data/elementary/themes/edc/elm/code.edc
new file mode 100644
index 0000000000..3f371fac14
--- /dev/null
+++ b/data/elementary/themes/edc/elm/code.edc
@@ -0,0 +1,16 @@
+/* simple layout to pack our scrolling content into an elm_layout */
+group { name: "elm_code/layout/default";
+   parts {
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            fixed: 0 1;
+
+            rel2 {
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
+         }
+      }
+   }
+}
diff --git a/legacy/elm_code/data/Makefile.am b/legacy/elm_code/data/Makefile.am
deleted file mode 100644
index f67d4f3e7b..0000000000
--- a/legacy/elm_code/data/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = themes 
-
diff --git a/legacy/elm_code/data/themes/Makefile.am b/legacy/elm_code/data/themes/Makefile.am
deleted file mode 100644
index 31a2b40dd3..0000000000
--- a/legacy/elm_code/data/themes/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = default
-
diff --git a/legacy/elm_code/data/themes/default/Makefile.am b/legacy/elm_code/data/themes/default/Makefile.am
deleted file mode 100644
index 46593bf159..0000000000
--- a/legacy/elm_code/data/themes/default/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = \
-default.edc
-
-include ../../../../Makefile_Edje_Helper.am
-
-filesdir = $(datadir)/$(PACKAGE)/themes
-files_DATA = elm_code.edj
-
-elm_code.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	-id ${top_srcdir}/elm_code/data/themes/default/images \
-	-sd ${top_srcdir}/elm_code/data/themes/default/sounds \
-	$(top_srcdir)/elm_code/data/themes/default/default.edc \
-	$(top_builddir)/elm_code/data/themes/default/elm_code.edj
-
-clean-local:
-	rm -f *.edj
diff --git a/legacy/elm_code/data/themes/default/default.edc b/legacy/elm_code/data/themes/default/default.edc
deleted file mode 100644
index dea7a81adb..0000000000
--- a/legacy/elm_code/data/themes/default/default.edc
+++ /dev/null
@@ -1,19 +0,0 @@
-collections {
-   /* simple layout to pack our scrolling content into an elm_layout */
-   group { name: "elm_code/layout/default";
-      parts {
-         part { name: "elm.swallow.content"; type: SWALLOW;
-            description { state: "default" 0.0;
-               align: 0.5 0.0;
-               fixed: 0 1;
-
-               rel2 {
-                  relative: 1.0 1.0;
-                  offset: 0 0;
-               }
-            }
-         }
-      }
-   }
-}
-