temp

5 files changed, 66 insertions, 21 deletions

diff --git a/data/themes/ulticontroller_2.0/Makefile.am b/data/themes/ulticontroller_2.0/Makefile.am
index 4629bc3..6746843 100644
--- a/data/themes/ulticontroller_2.0/Makefile.am
+++ b/data/themes/ulticontroller_2.0/Makefile.am
@@ -1,21 +1,39 @@
 AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = \
-splashscreen.edc \
+include ../../../Makefile_Edje_Helper.am
+
+images = \
 images/ultimaker_logo.png
 
-include ../../../Makefile_Edje_Helper.am
+fonts =
+
+sounds =
+
+vibrations =
+
+data =
+
+edjes = \
+splashscreen.edc \
+mainscreen.edc
+
+ULTICONTROLLER_CC_FLAGS = \
+-id ${top_srcdir}/data/themes/ulticontroller_2.0/images \
+-fd ${top_srcdir}/data/themes/ulticontroller_2.0/fonts \
+-sd ${top_srcdir}/data/themes/ulticontroller_2.0/sounds \
+-vd ${top_srcdir}/data/themes/ulticontroller_2.0/vibrations \
+-dd ${top_srcdir}/data/themes/ulticontroller_2.0/data
+
+EXTRA_DIST = $(images) $(sounds) $(iamges) $(edjes)
 
 filesdir = $(datadir)/$(PACKAGE)/themes
-files_DATA = splashscreen.edj
-
-splashscreen.edj: Makefile $(EXTRA_DIST)
-	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-	-id ${top_srcdir}/data/themes/ulticontroller_2.0/images \
-	-sd ${top_srcdir}/data/themes/ulticontroller_2.0/sounds \
-	$(top_srcdir)/data/themes/ulticontroller_2.0/splashscreen.edc \
-	$(top_builddir)/data/themes/ulticontroller_2.0/splashscreen.edj
+files_DATA = ulticontroller_2.0.edj
+
+ulticontroller_2.0.edj: Makefile $(EXTRA_DIST)
+	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(ULTICONTROLLER_CC_FLAGS) \
+	$(top_srcdir)/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc \
+	$(top_builddir)/data/themes/ulticontroller_2.0/ulticontroller_2.0.edj
 
 clean-local:
 	rm -f *.edj
diff --git a/data/themes/ulticontroller_2.0/mainscreen.edc b/data/themes/ulticontroller_2.0/mainscreen.edc
new file mode 100644
index 0000000..8c2dff0
--- /dev/null
+++ b/data/themes/ulticontroller_2.0/mainscreen.edc
@@ -0,0 +1,14 @@
+images.image: "ultimaker_logo.png" COMP;
+
+collections {
+   group {
+      name: "test";
+      parts {
+      	 part { name: "main"; type: IMAGE;
+	    description {
+	       image.normal: "ultimaker_logo.png";
+	    }
+	 }
+      }
+   }
+}
diff --git a/data/themes/ulticontroller_2.0/splashscreen.edc b/data/themes/ulticontroller_2.0/splashscreen.edc
index 8c2dff0..cb117d9 100644
--- a/data/themes/ulticontroller_2.0/splashscreen.edc
+++ b/data/themes/ulticontroller_2.0/splashscreen.edc
@@ -1,14 +1,14 @@
 images.image: "ultimaker_logo.png" COMP;
 
 collections {
-   group {
-      name: "test";
-      parts {
-      	 part { name: "main"; type: IMAGE;
-	    description {
-	       image.normal: "ultimaker_logo.png";
-	    }
-	 }
-      }
-   }
+	group {
+		name: "splashscreen";
+		parts {
+			part { name: "main"; type: IMAGE;
+				description {
+					image.normal: "ultimaker_logo.png";
+				}
+			}
+		}
+	}
 }
diff --git a/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc b/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc
new file mode 100644
index 0000000..5ba6aef
--- /dev/null
+++ b/data/themes/ulticontroller_2.0/ulticontroller_2.0.edc
@@ -0,0 +1,13 @@
+#include "splashscreen.edc"
+#include "mainscreen.edc"
+
+data {
+	item: "theme/name"	"Ulticontroller 2.0";
+}
+
+collections {
+	group {
+		name: "page/roots";
+		alias: "page/songs";
+	}
+}
diff --git a/src/eulogium b/src/eulogium
deleted file mode 100755
index 354cdf9..0000000
--- a/src/eulogium
+++ /dev/null