HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrction of the missing log in android and remove the pb with the rotation remove context of open GL

Browse Source
This commit is contained in:
Edouard Dupin 2012-01-27 02:04:02 +01:00
parent 7bad5d42f2
commit 65b288813e
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@ -9,7 +9,8 @@
<!-- classpath--> <!-- classpath-->
<activity android:name=".edn" <activity android:name=".edn"
android:label="Edn Text-Editor" android:label="Edn Text-Editor"
android:icon="@drawable/ic_luncher_edn"> android:icon="@drawable/ic_luncher_edn"
android:configChanges="orientation">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

7
jni/Android.mk
View File

@ -15,8 +15,11 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \
LOCAL_LDLIBS := -llog -landroid LOCAL_LDLIBS := -llog -landroid
LOCAL_CFLAGS := -DEWOL_USE_FREE_TYPE \ LOCAL_CFLAGS := -D__PLATFORM__Android \
-DEDN_DEBUG_LEVEL=3 -DEWOL_USE_FREE_TYPE \
-DETK_DEBUG_LEVEL=3 \
-DEDN_DEBUG_LEVEL=3 \
-DDATA_IN_APK
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

18
jni/edn/init.cpp
View File

@ -77,29 +77,21 @@ void APP_Init(int argc, char *argv[])
//ewol::SetDefaultFont("unispace.ttf", 12); //ewol::SetDefaultFont("unispace.ttf", 12);
EDN_DEBUG("TEST1");
// init internal global value // init internal global value
globals::init(); globals::init();
EDN_DEBUG("TEST2");
ClipBoard::Init(); ClipBoard::Init();
EDN_DEBUG("TEST3");
// init ALL Singleton : // init ALL Singleton :
(void)MsgBroadcastCore::getInstance(); (void)MsgBroadcastCore::getInstance();
EDN_DEBUG("TEST4");
//(void)AccelKey::getInstance(); //(void)AccelKey::getInstance();
(void)WindowsManager::getInstance(); (void)WindowsManager::getInstance();
EDN_DEBUG("TEST5");
(void)CTagsManager::getInstance(); (void)CTagsManager::getInstance();
EDN_DEBUG("TEST6");
BufferManager *myBufferManager = BufferManager::getInstance(); BufferManager *myBufferManager = BufferManager::getInstance();
EDN_DEBUG("TEST7");
// set color and other trucs... // set color and other trucs...
ColorizeManager *myColorManager = NULL; ColorizeManager *myColorManager = NULL;
myColorManager = ColorizeManager::getInstance(); myColorManager = ColorizeManager::getInstance();
EDN_DEBUG("TEST8");
etk::String homedir; etk::String homedir;
//homedir = getenv("HOME"); //homedir = getenv("HOME");
#ifdef NDEBUG #ifdef NDEBUG
@ -110,19 +102,14 @@ void APP_Init(int argc, char *argv[])
//homedir += "color_black.xml"; //homedir += "color_black.xml";
homedir = "color_white.xml"; homedir = "color_white.xml";
myColorManager->LoadFile( homedir.c_str() ); myColorManager->LoadFile( homedir.c_str() );
EDN_DEBUG("TEST9");
myColorManager->DisplayListOfColor(); myColorManager->DisplayListOfColor();
EDN_DEBUG("TEST10");
HighlightManager *myHighlightManager = NULL; HighlightManager *myHighlightManager = NULL;
myHighlightManager = HighlightManager::getInstance(); myHighlightManager = HighlightManager::getInstance();
EDN_DEBUG("TEST11");
myHighlightManager->loadLanguages(); myHighlightManager->loadLanguages();
EDN_DEBUG("TEST12");
// open display // open display
MsgBroadcastCore::getInstance()->SendMessage(NULL, EDN_MSG__GUI_SHOW_MAIN_WINDOWS); MsgBroadcastCore::getInstance()->SendMessage(NULL, EDN_MSG__GUI_SHOW_MAIN_WINDOWS);
EDN_DEBUG("TEST13");
// get the curent program folder // get the curent program folder
char cCurrentPath[FILENAME_MAX]; char cCurrentPath[FILENAME_MAX];
@ -132,10 +119,8 @@ void APP_Init(int argc, char *argv[])
cCurrentPath[FILENAME_MAX - 1] = '\0'; cCurrentPath[FILENAME_MAX - 1] = '\0';
//EDN_INFO("The current working directory is " << cCurrentPath); //EDN_INFO("The current working directory is " << cCurrentPath);
EDN_DEBUG("TEST14");
basicWindows = new MainWindows(); basicWindows = new MainWindows();
EDN_DEBUG("TEST15");
// add files // add files
EDN_INFO("show list of files : "); EDN_INFO("show list of files : ");
@ -150,7 +135,6 @@ void APP_Init(int argc, char *argv[])
} }
} }
EDN_DEBUG("TEST16");
/* /*
{ {
etk::File myfile((char *)"licence.txt", etk::FILE_TYPE_DIRECT); etk::File myfile((char *)"licence.txt", etk::FILE_TYPE_DIRECT);
@ -164,11 +148,9 @@ void APP_Init(int argc, char *argv[])
EDN_ERROR("Can not allocate the basic windows"); EDN_ERROR("Can not allocate the basic windows");
ewol::Stop(); ewol::Stop();
} }
EDN_DEBUG("TEST17");
// create the specific windows // create the specific windows
ewol::DisplayWindows(basicWindows); ewol::DisplayWindows(basicWindows);
EDN_DEBUG("TEST18");
} }