temp buff

9 files changed, 49 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index 29a9268..9efc26e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,9 @@
 *.gcno
 *.gcda
 
-/src/bin/skeleton
-/src/tests/skeleton_tests
-packaging/slackware/skeleton-*.txz
+/src/eulogium
+/src/tests/eulogium_tests
+packaging/slackware/eulogium-*.txz
 skeleton-*.tar.?z*
 po/*.gmo
 po/POTFILES
diff --git a/configure.ac b/configure.ac
index 5ce9a7e..5598443 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ data/desktop/Makefile
 data/desktop/eulogium.desktop
 data/themes/Makefile
 data/themes/default/Makefile
+data/themes/ulticontroller_2.0/Makefile
 doc/Makefile
 packaging/Makefile
 packaging/slackware/Makefile
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 31a2b40..598c0fa 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,4 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = default
-
+SUBDIRS = default ulticontroller_2.0
diff --git a/data/themes/ulticontroller_2.0/Makefile.am b/data/themes/ulticontroller_2.0/Makefile.am
new file mode 100644
index 0000000..4629bc3
--- /dev/null
+++ b/data/themes/ulticontroller_2.0/Makefile.am
@@ -0,0 +1,21 @@
+AUTOMAKE_OPTIONS = subdir-objects
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = \
+splashscreen.edc \
+images/ultimaker_logo.png
+
+include ../../../Makefile_Edje_Helper.am
+
+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
+
+clean-local:
+	rm -f *.edj
diff --git a/data/themes/ulticontroller_2.0/images/ultimaker_logo.png b/data/themes/ulticontroller_2.0/images/ultimaker_logo.png
new file mode 100644
index 0000000..0135877
--- /dev/null
+++ b/data/themes/ulticontroller_2.0/images/ultimaker_logo.png
diff --git a/data/themes/ulticontroller_2.0/splashscreen.edc b/data/themes/ulticontroller_2.0/splashscreen.edc
new file mode 100644
index 0000000..8c2dff0
--- /dev/null
+++ b/data/themes/ulticontroller_2.0/splashscreen.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/src/Makefile.am b/src/Makefile.am
index eb42730..a0417e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,4 +15,4 @@ eulogium_SOURCES = eulogium.c
 eulogium_LDADD = @EFL_LIBS@
 
 localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEFS = -DLOCALE_DIR=\"$(localedir)\" @DEFS@
diff --git a/src/eulogium b/src/eulogium
new file mode 100755
index 0000000..354cdf9
--- /dev/null
+++ b/src/eulogium
diff --git a/src/eulogium.c b/src/eulogium.c
index e97758c..ba97db3 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -50,11 +50,14 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
 
 #if ENABLE_NLS
 	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
+	bindtextdomain(PACKAGE, LOCALE_DIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
 	textdomain(PACKAGE);
 #endif
 
+	if (!eina_init())
+		return EXIT_FAILURE;
+
 	if (!ecore_evas_init())
 		return EXIT_FAILURE;
 	
@@ -76,6 +79,10 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
 	if (args == 1)
 		ecore_getopt_help(stderr, &optdesc);
 
+	
+
+	eina_prefix_free(prefix);
+	eina_shutdown();
 	ecore_evas_shutdown();
 	edje_shutdown();