From fda95289bdcd6a4cbbab651adc43fa6c59c1e1e2 Mon Sep 17 00:00:00 2001
From: Edouard Dupin <yui.heero@gmail.com>
Date: Wed, 25 Jan 2012 23:32:14 +0100
Subject: [PATCH] try error

---
 AndroidManifest.xml |  3 ++-
 jni/edn/init.cpp    | 41 +++++++++++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed95013..c3ac04d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,8 @@
           package="com.heeroyui.ednpackage"
           android:versionCode="1"
           android:versionName="1.0">
-	<application android:label="Edn">
+	<application android:label="Edn"
+	             android:icon="@drawable/ic_luncher_edn">
 	             <!--android:hasCode="false"-->
 	             <!-- classpath-->
 		<activity android:name=".edn"
diff --git a/jni/edn/init.cpp b/jni/edn/init.cpp
index db89ce2..05dc0ce 100644
--- a/jni/edn/init.cpp
+++ b/jni/edn/init.cpp
@@ -70,32 +70,36 @@ void APP_Init(int argc, char *argv[])
 	#endif
 	
 	ewol::SetFontFolder("Font");
-	#ifdef EWOL_USE_FREE_TYPE
-		ewol::SetDefaultFont("freefont/FreeMono.ttf", 12);
-		//ewol::SetDefaultFont("freefont/FreeMonoBold.ttf", 12);
-		//ewol::SetDefaultFont("ACharmingFont.ttf", 45);
-		//ewol::SetDefaultFont("Monospace/Monospace", 40);
-		//ewol::SetDefaultFont("unispace.ttf", 12);
-	#else
-		//ewol::SetDefaultFont("ebtfont/Monospace", 14);
-		ewol::SetDefaultFont("ebtfont/Monospace", 22);
-	#endif
-
+	//ewol::SetDefaultFont("freefont/FreeMono.ttf", 12);
+	//ewol::SetDefaultFont("freefont/FreeMonoBold.ttf", 12);
+	//ewol::SetDefaultFont("ACharmingFont.ttf", 45);
+	//ewol::SetDefaultFont("Monospace/Monospace", 40);
+	//ewol::SetDefaultFont("unispace.ttf", 12);
+	
+	
+	EDN_DEBUG("TEST1");
 	// init internal global value
 	globals::init();
+	EDN_DEBUG("TEST2");
 	ClipBoard::Init();
 	
+	EDN_DEBUG("TEST3");
 	
 	// init ALL Singleton :
 	(void)MsgBroadcastCore::getInstance();
+	EDN_DEBUG("TEST4");
 	//(void)AccelKey::getInstance();
 	(void)WindowsManager::getInstance();
+	EDN_DEBUG("TEST5");
 	(void)CTagsManager::getInstance();
+	EDN_DEBUG("TEST6");
 	BufferManager *myBufferManager = BufferManager::getInstance();
+	EDN_DEBUG("TEST7");
 	
 	// set color and other trucs...
 	ColorizeManager *myColorManager = NULL;
 	myColorManager = ColorizeManager::getInstance();
+	EDN_DEBUG("TEST8");
 	etk::String homedir;
 	//homedir = getenv("HOME");
 #ifdef NDEBUG
@@ -106,14 +110,19 @@ void APP_Init(int argc, char *argv[])
 	//homedir += "color_black.xml";
 	homedir = "color_white.xml";
 	myColorManager->LoadFile( homedir.c_str() );
+	EDN_DEBUG("TEST9");
 	myColorManager->DisplayListOfColor();
+	EDN_DEBUG("TEST10");
 	
 	HighlightManager *myHighlightManager = NULL;
 	myHighlightManager = HighlightManager::getInstance();
+	EDN_DEBUG("TEST11");
 	myHighlightManager->loadLanguages();
+	EDN_DEBUG("TEST12");
 
 	// open display
 	MsgBroadcastCore::getInstance()->SendMessage(NULL, EDN_MSG__GUI_SHOW_MAIN_WINDOWS);
+	EDN_DEBUG("TEST13");
 	
 	// get the curent program folder
 	char cCurrentPath[FILENAME_MAX];
@@ -123,10 +132,14 @@ void APP_Init(int argc, char *argv[])
 	cCurrentPath[FILENAME_MAX - 1] = '\0';
 	//EDN_INFO("The current working directory is " << cCurrentPath);
 
+	EDN_DEBUG("TEST14");
 	basicWindows = new MainWindows();
 	
+	EDN_DEBUG("TEST15");
+	
 	// add files
 	EDN_INFO("show list of files : ");
+	/*
 	for( int32_t i=1 ; i<argc; i++) {
 		EDN_INFO("need load file : \"" << argv[i] << "\"" );
 		etk::File myfile((char *)argv[i], etk::FILE_TYPE_DIRECT);
@@ -136,7 +149,9 @@ void APP_Init(int argc, char *argv[])
 				MsgBroadcastCore::getInstance()->SendMessage(NULL, EDN_MSG__CURRENT_CHANGE_BUFFER_ID, idBuffOpened);
 			}
 		}
-	}
+	}*/
+	
+	EDN_DEBUG("TEST16");
 	/*
 	{
 		etk::File myfile((char *)"licence.txt", etk::FILE_TYPE_DIRECT);
@@ -150,9 +165,11 @@ void APP_Init(int argc, char *argv[])
 		EDN_ERROR("Can not allocate the basic windows");
 		ewol::Stop();
 	}
+	EDN_DEBUG("TEST17");
 	
 	// create the specific windows
 	ewol::DisplayWindows(basicWindows);
+	EDN_DEBUG("TEST18");
 	
 }