ewol change his time API

This reverts commit 4012d75279.

.gitignore

@@ -2,16 +2,9 @@
 ###################################
 # folders
 ###################################
-CVS
-.svn
 .gitk-tmp.*
-Object/
-doxygen/API/
-doxygen/ALL/
-bin/
-gen/
-linux/
-obj/
+out/
+Sources/ewolAndroidAbstraction.cpp
 
 ###################################
 # backup files
@@ -32,10 +25,6 @@ obj/
 *.so
 *.pyc
 tags
-edn
-out
-edn_debug
-edn_release
 
 ###################################
 # Packages #

Android/local.properties

@@ -7,4 +7,4 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/home/heero/dev/perso/android/sdk-r15
+sdk.dir=/home/heero/dev/perso/android/sdk

Android/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:13
+target=android-15

Makefile

@@ -8,6 +8,8 @@ PROJECT_VENDOR=heeroyui
 # Binary name ... (no dot, no MAJ no Numerical char)
 PROJECT_NAME=edn
 
+USER_PACKAGES=$(shell pwd)/Sources/
+
 # include basic makefile for EWOL 
 include $(shell pwd)/../ewol/Build/Makefile.mk
 

Makefile_old

@@ -1,340 +0,0 @@
-##################################################################################################################
-#                                                                                                                #
-#   Fichier     :   Makefile                                                                                     #
-#                                                                                                                #
-#   Type        :   Makefile d'un programme complet                                                              #
-#                                                                                                                #
-#   Auteur      :   Heero Yui                                                                                    #
-#                                                                                                                #
-#   Evolutions  :   Date          Auteur        Raison                                                           #
-#                2010-01-29      Heero Yui      Mise en place d'un makefile ultra simple                         #
-#                2011-07-14      Heero Yui      Rework the current dorder includion (simplification)             #
-#                                                                                                                #
-#   Notes       :   This makefile might be edited with an editor compatible with escape char and carrer return   #
-#                   char                                                                                         #
-#                                                                                                                #
-# Concu Pour le projet edn                                                                                       #
-#                                                                                                                #
-##################################################################################################################
-export F_GRAS=
-export F_INVERSER=
-export F_SOUSLIGNER=
-export F_NORMALE=
-export F_NOIR=
-export F_ROUGE=
-export F_VERT=
-export F_MARRON=
-export F_BLUE=
-export F_VIOLET=
-export F_CYAN=
-export F_GRIS=
-export CADRE_HAUT_BAS='	$(F_INVERSER)                                                                    $(F_NORMALE)'
-export CADRE_COTERS='
-	$(F_INVERSER)  $(F_NORMALE)								  $(F_INVERSER)  $(F_NORMALE)'
-
-VERSION_TAG=$(shell git describe --tags)
-#$(info $(VERSION_TAG))
-
-VERSION_TAG_SHORT=$(shell git describe --tags --abbrev=0)
-#$(info $(VERSION_TAG_SHORT))
-
-VERSION_BUILD_TIME=$(shell date)
-#$(info $(VERSION_BUILD_TIME))
-
-###############################################################################
-### Compilateur base system                                                 ###
-###############################################################################
-CXX=g++
-CC=gcc
-AR=ar
-
-DEBUG:=1
-
-###############################################################################
-### Compilation Define                                                      ###
-###############################################################################
-ifeq ("$(DEBUG)", "0")
-    DEFINE= -DEDN_DEBUG_LEVEL=1 -DNDEBUG -DVERSION_TAG_NAME="\"$(VERSION_TAG)-release\""
-else
-    DEFINE= -DEDN_DEBUG_LEVEL=3 -DVERSION_TAG_NAME="\"$(VERSION_TAG)-debug\""
-endif
-DEFINE+= -DVERSION_BUILD_TIME="\"$(VERSION_BUILD_TIME)\""
-
-GTKFLAGS= 
-ifeq ($(shell if `pkg-config --exists gtk+-3.0` ; then echo "yes"; else echo "no"; fi), yes)
-    GTKFLAGS= `pkg-config --cflags --libs gtk+-3.0` -DUSE_GTK_VERSION_3_0
-else
-    ifeq ($(shell if `pkg-config --exists gtk+-2.0` ; then echo "yes"; else echo "no"; fi), yes)
-        GTKFLAGS= `pkg-config --cflags --libs gtk+-2.0` -DUSE_GTK_VERSION_2_0
-    else
-        $(error No GTK 3.0 or 2.0 librairies ...)
-    endif
-endif
-
-###############################################################################
-### Basic Cfags                                                             ###
-###############################################################################
-
-# basic GTK librairy
-CXXFLAGS=  $(GTKFLAGS)
-# Linux thread system
-CXXFLAGS+= -lpthread
-# Enable debug (cgdb edn)
-CXXFLAGS+= -g -O0
-#CXXFLAGS+= -O2
-# display all flags
-CXXFLAGS+= -Wall
-# ...
-CXXFLAGS+= -D_REENTRANT
-# internal defines
-CXXFLAGS+= $(DEFINE)
-
-CFLAGS=    $(CXXFLAGS) -std=c99
-
-# basic GTK librairy
-LDFLAGS=  $(GTKFLAGS)
-# Linux thread system
-LDFLAGS+= -lpthread
-# Dynamic connection of the CALLBACK of the GUI
-LDFLAGS+= -Wl,--export-dynamic
-
-###############################################################################
-### Project Name                                                            ###
-###############################################################################
-PROG_NAME=edn
-
-###############################################################################
-### Basic Project description Files                                         ###
-###############################################################################
-FILE_DIRECTORY=Sources
-OUTPUT_NAME_RELEASE=$(PROG_NAME)_release
-OUTPUT_NAME_DEBUG=$(PROG_NAME)_debug
-OBJECT_DIR=Object
-
-ifeq ("$(DEBUG)", "0")
-    OBJECT_DIRECTORY=$(OBJECT_DIR)/release
-    OUTPUT_NAME = $(OUTPUT_NAME_RELEASE)
-else
-    OBJECT_DIRECTORY=$(OBJECT_DIR)/debug
-    OUTPUT_NAME = $(OUTPUT_NAME_DEBUG)
-endif
-
-
-
-###############################################################################
-### Generique dependency                                                    ###
-###############################################################################
-MAKE_DEPENDENCE=Makefile
-
-###############################################################################
-### Files Listes                                                            ###
-###############################################################################
-
-# tiny XML (extern OPEN Sources) :
-CXXFILES =		tools/tinyXML/tinyxml.cpp				\
-				tools/tinyXML/tinyxmlparser.cpp			\
-				tools/tinyXML/tinyxmlerror.cpp			\
-				tools/tinyXML/tinystr.cpp
-
-# ExuberantCtags reading file tools (extern OPEN Sources) :
-CXXFILES+=		ctags/readtags.cpp                      \
-				ctags/CTagsManager.cpp
-
-
-# Globals debug tool:
-CXXFILES+=		tools/debug/tools_debug.cpp				\
-				tools/globals/tools_globals.cpp			\
-				tools/memory/toolsMemory.cpp
-
-# Buffers internal:
-CXXFILES+=		tools/EdnTemplate/EdnVectorBuf.cpp		\
-				tools/EdnBuf/EdnBuf.cpp					\
-				tools/EdnBuf/EdnBuf_HighLight.cpp		\
-				tools/EdnBuf/EdnBuf_History.cpp			\
-				tools/EdnBuf/EdnBuf_Selection.cpp		\
-				tools/EdnBuf/EdnBufHistory.cpp
-				
-
-# Tools internal:
-CXXFILES+=		tools/Display/Display.cpp				\
-				tools/ClipBoard/ClipBoard.cpp			\
-				tools/MsgBroadcast/MsgBroadcast.cpp		\
-				tools/MsgBroadcast/AccelKey.cpp			\
-				tools/charset/charsetTable.cpp			\
-				tools/charset/charset.cpp				\
-				tools/NameSpaceEdn/File.cpp				\
-				tools/NameSpaceEdn/String.cpp			\
-				tools/NameSpaceEdn/RegExp.cpp
-
-# Gui:
-CXXFILES+=		CustumWidget/BufferView/BufferView.cpp		\
-				CustumWidget/CodeView/CodeView.cpp			\
-				GuiTools/WindowsManager/WindowsManager.cpp	\
-				GuiTools/MainWindows/MainWindows.cpp		\
-				GuiTools/MainWindows/StatusBar.cpp			\
-				GuiTools/MainWindows/MenuBar.cpp			\
-				GuiTools/MainWindows/ToolBar.cpp			\
-				GuiTools/Search/Search.cpp					\
-				GuiTools/Search/SearchData.cpp
-
-# Basic Interface :
-CXXFILES+=		Buffer/Buffer.cpp						\
-				Buffer/BufferText.cpp					\
-				Buffer/BufferEmpty.cpp					\
-				Buffer/BufferManager.cpp				\
-				Colorize/Colorize.cpp					\
-				Colorize/ColorizeManager.cpp			\
-				Highlight/HighlightPattern.cpp			\
-				Highlight/Highlight.cpp					\
-				Highlight/HighlightManager.cpp
-
-# Main entry file : 
-CXXFILES+=		init.cpp
-
-
-###############################################################################
-### Liste of folder where .h can be                                         ###
-###############################################################################
-LISTE_MODULES = $(dir $(CXXFILES))
-INCLUDE_DIRECTORY = $(addprefix -I$(FILE_DIRECTORY)/, $(LISTE_MODULES)) 
-
-###############################################################################
-### Build Object Files List                                                 ###
-###############################################################################
-OBJ =	$(addprefix $(OBJECT_DIRECTORY)/, $(CXXFILES:.cpp=.o))
-
-
-
-###############################################################################
-### Main Part of Makefile                                                   ###
-###############################################################################
-all: build
-
--include $(OBJ:.o=.d) 
-
-build: .encadrer .versionFile $(OUTPUT_NAME)
-
-
-.encadrer:
-	@echo $(CADRE_HAUT_BAS)
-	@echo $(CADRE_COTERS)
-	@echo '
-           DEBUT DE COMPILATION DU PROGRAMME :'$(CADRE_COTERS)
-	@echo '
-             Repertoire Sources : $(FILE_DIRECTORY)/'$(CADRE_COTERS)
-	@echo '
-             Repertoire object  : $(OBJECT_DIRECTORY)/'$(CADRE_COTERS)
-	@echo '
-             Binaire de sortie  : $(F_VIOLET)$(OUTPUT_NAME) $(F_NORMALE)'$(CADRE_COTERS)
-	@echo $(CADRE_COTERS)
-	@echo $(CADRE_HAUT_BAS)
-	@mkdir -p $(addprefix $(OBJECT_DIRECTORY)/, $(LISTE_MODULES))
-
-
-FILE_IMAGES=	data/imagesSources/*.png
-
-
-.versionFile :
-	@rm -f $(OBJECT_DIRECTORY)/GuiTools/WindowsManager/WindowsManager.o
-
-
-# Tool used to create a binary version of every element png or other needed by the application
-pngToCpp: tools/pngToCpp/pngToCpp.c
-	@echo $(F_ROUGE)"
-          (bin) $@"$(F_NORMALE)
-	@$(CXX) $< -o $@
-	@strip -s $@
-
-# Generate basic 
-$(FILE_DIRECTORY)/GuiTools/myImage.cpp: $(FILE_IMAGES) $(MAKE_DEPENDENCE) pngToCpp
-	@echo $(F_BLUE)"
-          (.cpp)  *.png ==> $@"$(F_NORMALE)
-	@./pngToCpp $@ $(FILE_IMAGES)
-
-
-# build C++
-$(OBJECT_DIRECTORY)/%.o: $(FILE_DIRECTORY)/%.cpp $(MAKE_DEPENDENCE)
-	@echo $(F_VERT)"
-          (.o)  $<"$(F_NORMALE)
-	@$(CXX)  $< -c -o $@  $(INCLUDE_DIRECTORY) $(CXXFLAGS) -MMD
-
-# build binary Release Mode
-$(OUTPUT_NAME_RELEASE): $(OBJ) $(MAKE_DEPENDENCE)
-	@echo $(F_ROUGE)"
-          (bin) $@ "$(F_NORMALE)
-	@$(CXX) $(OBJ) $(LDFLAGS) -o $@
-	@cp $@ $(PROG_NAME)
-
-# build binary Debug Mode
-$(OUTPUT_NAME_DEBUG): $(OBJ) $(MAKE_DEPENDENCE)
-	@echo $(F_ROUGE)"
-          (bin) $@ "$(F_NORMALE)
-	@$(CXX) $(OBJ) $(LDFLAGS) -o $@
-	@cp $@ $(PROG_NAME)
-
-clean:
-	@echo $(CADRE_HAUT_BAS)
-	@echo '           CLEANING : $(F_VIOLET)$(OUTPUT_NAME)$(F_NORMALE)'$(CADRE_COTERS)
-	@echo $(CADRE_HAUT_BAS)
-	@echo Remove Folder : $(OBJECT_DIR)
-	@rm -rf $(OBJECT_DIR) 
-	@echo Remove File : $(PROG_NAME) $(OUTPUT_NAME_DEBUG) $(OUTPUT_NAME_RELEASE)
-	@rm -f $(PROG_NAME) $(OUTPUT_NAME_DEBUG) $(OUTPUT_NAME_RELEASE)
-	@echo Remove File : pngToCpp
-	@rm -f pngToCpp
-	@echo Remove File : $(FILE_DIRECTORY)/GuiTools/myImage.*
-	@rm -f $(FILE_DIRECTORY)/GuiTools/myImage.*
-	@echo Remove doxygen  files : doxygen/*
-	@rm -rf doxygen
-	@rm -f doxygen.log
-	@echo Remove temporary files *.bck
-	@rm -f `find . -name "*.bck"`
-
-count:
-	wc -l Makefile `find $(FILE_DIRECTORY)/ -name "*.cpp"` `find $(FILE_DIRECTORY)/ -name "*.h"` 
-
-install: .encadrer .versionFile $(OUTPUT_NAME_RELEASE)
-	@echo $(CADRE_HAUT_BAS)
-	@echo '           INSTALL : $(F_VIOLET)$(OUTPUT_NAME_RELEASE)=>$(PROG_NAME)$(F_NORMALE)'$(CADRE_COTERS)
-	@echo $(CADRE_HAUT_BAS)
-	@echo $(F_ROUGE)"
-          (stripped) $(OUTPUT_NAME_RELEASE) => $(PROG_NAME) "$(F_NORMALE)
-	@cp $(OUTPUT_NAME_RELEASE) $(PROG_NAME)
-	@strip -s $(PROG_NAME)
-	@echo $(F_VERT)"
-          (copy) $(PROG_NAME) /usr/bin/ "$(F_NORMALE)
-	@cp -vf $(PROG_NAME) /usr/bin/
-	@echo $(F_VERT)"
-          (data) data/* ==> /usr/share/edn/ "$(F_NORMALE)
-	@mkdir -p /usr/share/edn/
-	@rm -rf /usr/share/edn/*
-	@cp -vf data/*.xml /usr/share/edn/
-	@mkdir -p /usr/share/edn/images/
-	@cp -vf data/imagesSources/icone.png /usr/share/edn/images/
-	@cp -vf data/imagesSources/delete-24px.png /usr/share/edn/images/
-	# gnome adding for the program at the list (manage icone in .xpm)
-	@cp -vf data/edn.desktop /usr/share/applications/
-	@cp -vf data/imagesSources/icone.png /usr/share/app-install/icons/Edn.png
-	@cp -vf data/imagesSources/icone.xpm /usr/share/pixmaps/Edn.xpm
-
-
-# http://alp.developpez.com/tutoriels/debian/creer-paquet/
-package: .encadrer
-	@echo 'Create Folders ...'
-	@mkdir -p package/$(PROG_NAME)/DEBIAN/
-	@mkdir -p package/$(PROG_NAME)/usr/bin/
-	@mkdir -p package/$(PROG_NAME)/usr/share/doc/
-	@mkdir -p package/$(PROG_NAME)/usr/share/edn/
-	# Create the control file
-	@echo "Package: "$(PROG_NAME) > package/$(PROG_NAME)/DEBIAN/control
-	@echo "Version: "$(VERSION_TAG_SHORT) >> package/$(PROG_NAME)/DEBIAN/control
-	@echo "Section: Development,Editors" >> package/$(PROG_NAME)/DEBIAN/control
-	@echo "Priority: optional" >>package/$(PROG_NAME)/DEBIAN/control
-	@echo "Architecture: all" >> package/$(PROG_NAME)/DEBIAN/control
-	@echo "Depends: bash" >> package/$(PROG_NAME)/DEBIAN/control
-	@echo "Maintainer: Mr DUPIN Edouard <yui.heero@gmail.com>" >> package/$(PROG_NAME)/DEBIAN/control
-	@echo "Description: Text editor for sources code with ctags management" >> package/$(PROG_NAME)/DEBIAN/control
-	@echo "" >> package/$(PROG_NAME)/DEBIAN/control
-	# Create the PostRm
-	@echo "#!/bin/bash" > package/$(PROG_NAME)/DEBIAN/postrm
-	@echo "rm ~/."$(PROG_NAME) >> package/$(PROG_NAME)/DEBIAN/postrm

README.md

@@ -10,19 +10,45 @@ Instructions
 
 download the software :
 
+	mkdir yourDevFolder
+	cd yourDevFolder
+	git clone git://github.com/HeeroYui/ewol.git
+	cd ewol
+	git submodule init
+	git submodule update
+	cd ..
 	git clone git://github.com/HeeroYui/edn.git
 	cd edn
 
-Compile software and install :
+(debug) Compile software & Run debug version:
 
-	sudo make DEBUG=0 install
+	make DEBUG=1
+	or
+	make CLANG=1 DEBUG=1
+	./out_LINUX/debug/obj/usr/bin/edn -l6 yourFile.txt
+	Note : -l6 corespond at the LOG level to display
 
-Run Software :
+(release) Compile software & install & run:
 
+	make
+	./install.sh
 	edn exemple.txt
 
-License
-=======
+(Android) Compile software & install
+
+	cd yourDevFolder
+	mkdir andoid
+	cd android
+	download here in "sdk" and "ndk" the coresponding SDK and NDK of Android:
+		http://developer.android.com/tools/sdk/ndk/index.html
+		http://developer.android.com/sdk/index.html
+		==> you need to download sub package of the NDK (refer to the NDK doccumentation) but only supported android version >4.0
+	cd ../edn
+	make PLATFORM=Android
+	make PLATFORM=Android install
+
+License (like GPL)
+==================
 
 	You can:
 		- Redistribute the sources code and binaries.

Sources/Android.mk

@@ -14,7 +14,7 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=
 $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
 
 # name of the dependency
-LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype libparsersvg libagg
+LOCAL_STATIC_LIBRARIES := ewol
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
 
@@ -23,21 +23,15 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \
 
 LOCAL_LDLIBS    := -llog -landroid
 
-# -frtti
 ifeq ($(DEBUG),1)
-LOCAL_CFLAGS    :=  -D__PLATFORM__Android \
-                    -D__MODE__Touch \
-                    -DETK_DEBUG_LEVEL=3 \
-                    -DAPPL_DEBUG_LEVEL=3 \
-                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" 
+LOCAL_CFLAGS    :=  -D__MODE__Touch \
+                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 else
-LOCAL_CFLAGS    :=  -D__PLATFORM__Android \
-                    -D__MODE__Touch \
-                    -DETK_DEBUG_LEVEL=1 \
-                    -DAPPL_DEBUG_LEVEL=1 \
-
+LOCAL_CFLAGS    :=  -D__MODE__Touch \
                     -DMODE_RELEASE \
-                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" 
+                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 endif
 
 

Sources/Linux.mk

@@ -14,9 +14,9 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=
 $(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
 
 # name of the dependency
-LOCAL_STATIC_LIBRARIES := etk ewol tinyxml libzip libpng libfreetype parsersvg agg
+LOCAL_STATIC_LIBRARIES := ewol
 
-LOCAL_C_INCLUDES := -I$(LOCAL_PATH) $(addprefix -I$(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
 
 LOCAL_SRC_FILES := $(FILE_LIST)
 
@@ -24,16 +24,12 @@ LOCAL_SRC_FILES := $(FILE_LIST)
 LOCAL_LDLIBS    := 
 
 ifeq ($(DEBUG),1)
-LOCAL_CFLAGS    :=  -D__PLATFORM__Linux \
-                    -DETK_DEBUG_LEVEL=3 \
-                    -DAPPL_DEBUG_LEVEL=3 \
-                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" 
+LOCAL_CFLAGS    :=  -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 else
-LOCAL_CFLAGS    :=  -D__PLATFORM__Linux \
-                    -DETK_DEBUG_LEVEL=3 \
-                    -DAPPL_DEBUG_LEVEL=1 \
-                    -DMODE_RELEASE \
-                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" 
+LOCAL_CFLAGS    :=  -DMODE_RELEASE \
+                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
 endif
 
 include $(BUILD_EXECUTABLE)

Sources/Windows.mk

@@ -0,0 +1,40 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# load the common sources file of the platform
+include $(LOCAL_PATH)/file.mk
+
+# name of the librairy
+LOCAL_MODULE := edn
+
+# get the tag of the current project : 
+LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
+LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0)
+$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
+
+# name of the dependency
+LOCAL_STATIC_LIBRARIES := ewol
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(addprefix $(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
+
+LOCAL_SRC_FILES := $(FILE_LIST)
+
+
+LOCAL_LDLIBS    := 
+
+ifeq ($(DEBUG),1)
+LOCAL_CFLAGS    :=  -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
+else
+LOCAL_CFLAGS    :=  -DMODE_RELEASE \
+                    -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
+                    -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
+endif
+
+include $(BUILD_EXECUTABLE)
+
+NDK_MODULE_PATH := $(LOCAL_PATH)/../../
+
+
+$(call import-module,ewol/Sources)

Sources/appl/Buffer/Buffer.cpp

@@ -117,19 +117,19 @@ bool Buffer::NeedToUpdateDisplayPosition(void)
 	return tmpVal;
 }
 
-coord2D_ts Buffer::GetBorderSize(void)
+Vector2D<float>  Buffer::GetBorderSize(void)
 {
-	coord2D_ts tmpVal;
+	Vector2D<float>  tmpVal;
 	tmpVal.x = 30;
 	tmpVal.y = 30;
 	return tmpVal;
 }
 
 
-coord2D_ts Buffer::GetPosition(int32_t fontId,bool& centerRequested)
+Vector2D<float>  Buffer::GetPosition(int32_t fontId,bool& centerRequested)
 {
 	centerRequested = false;
-	coord2D_ts tmpVal;
+	Vector2D<float>  tmpVal;
 	tmpVal.x = 0;
 	tmpVal.y = 0;
 	return tmpVal;

Sources/appl/Buffer/Buffer.h

@@ -117,15 +117,15 @@ class Buffer {
 		// moving with cursor change position:
 	private:
 		bool       m_updatePositionRequested; //!< if a position xhange in the windows ...
-		coord2D_ts m_maximumSize;             //!< current maxSize of the buffer
+		Vector2D<float>  m_maximumSize;             //!< current maxSize of the buffer
 	protected:
 		void RequestUpdateOfThePosition(void) { m_updatePositionRequested = true; };
-		void SetMaximumSize(coord2D_ts maxSize) { m_maximumSize = maxSize; };
+		void SetMaximumSize(Vector2D<float>  maxSize) { m_maximumSize = maxSize; };
 	public:
 		bool                NeedToUpdateDisplayPosition(void);
-		virtual coord2D_ts  GetBorderSize(void);               // this is to requested the minimum size for the buffer that is not consider as visible ...
-		virtual coord2D_ts  GetPosition(int32_t fontId, bool& centerRequested);
-		coord2D_ts          GetMaxSize(void) { return m_maximumSize; };
+		virtual Vector2D<float>   GetBorderSize(void);               // this is to requested the minimum size for the buffer that is not consider as visible ...
+		virtual Vector2D<float>   GetPosition(int32_t fontId, bool& centerRequested);
+		Vector2D<float>           GetMaxSize(void) { return m_maximumSize; };
 	protected:
 		bool              m_fileModify;           //!< 
 		// naming

Sources/appl/Buffer/BufferEmpty.cpp

@@ -79,9 +79,9 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
 	int32_t fontId = OOTextNormal.GetFontID();
 	int32_t letterHeight = ewol::GetHeight(fontId);
 	
-	coord2D_ts textPos;
+	Vector2D<float>  textPos;
 	textPos.x = 20;
-	textPos.y = 20;
+	textPos.y = sizeY - 20 - letterHeight;
 	
 	myColor = ColorizeManager::Get("normal");
 	OOTextBold.SetColor(myColor->GetFG());
@@ -90,11 +90,11 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
 	
 	myColor = ColorizeManager::Get("commentDoxygen");
 	OOTextNormal.SetColor(myColor->GetFG());
-	textPos.y = (int32_t)(textPos.y + letterHeight*1.30);
+	textPos.y = (int32_t)(textPos.y - letterHeight*1.30);
 	tmpDisplay = "No Buffer Availlable to display";
 	OOTextNormal.Text(textPos, tmpDisplay);
 	
-	OOColored.SetColor(etk::color::color_White);
+	OOColored.SetColor(etk::color::white);
 	OOColored.Rectangle( 0, 0, sizeX, sizeY);
 	
 	return ERR_NONE;

Sources/appl/Buffer/BufferManager.cpp

@@ -33,39 +33,12 @@
 #undef __class__
 #define __class__	"classBufferManager"
 
-//!< EObject name :
-extern const char * const TYPE_EOBJECT_EDN_BUFFER_MANAGER = "BufferManager";
-
 class classBufferManager: public ewol::EObject
 {
 	public:
 		// Constructeur
 		classBufferManager(void);
 		~classBufferManager(void);
-
-		/**
-		 * @brief Check if the object has the specific type.
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type of the object we want to check
-		 * @return true if the object is compatible, otherwise false
-		 */
-		bool CheckObjectType(const char * const objectType)
-		{
-			if (NULL == objectType) {
-				EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_BUFFER_MANAGER << "\" != NULL(pointer) ");
-				return false;
-			}
-			if (objectType == TYPE_EOBJECT_EDN_BUFFER_MANAGER) {
-				return true;
-			} else {
-				if(true == ewol::EObject::CheckObjectType(objectType)) {
-					return true;
-				}
-				EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_BUFFER_MANAGER << "\" != \"" << objectType << "\"");
-				return false;
-			}
-		}
-		
 		/**
 		 * @brief Get the current Object type of the EObject
 		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
@@ -74,7 +47,7 @@ class classBufferManager: public ewol::EObject
 		 */
 		const char * const GetObjectType(void)
 		{
-			return TYPE_EOBJECT_EDN_BUFFER_MANAGER;
+			return "ApplBufferManager";
 		}
 	public:
 		/**
@@ -107,15 +80,13 @@ class classBufferManager: public ewol::EObject
 
 	private:
 		
-		etk::VectorType<Buffer*> listBuffer;  //!< element List of the char Elements
+		etk::Vector<Buffer*> listBuffer;  //!< element List of the char Elements
 		
 		void        RemoveAll(void);          //!< remove all buffer
 		int32_t     m_idSelected;
 		Buffer *    BufferNotExiste;          //!< When an error arrive in get buffer we return the Error buffer (not writable)
 };
 
-#define EDN_CAST_BUFFER_MANAGER(curentPointer) EWOL_CAST(TYPE_EOBJECT_EDN_BUFFER_MANAGER,classBufferManager,curentPointer)
-
 
 // Constructeur
 /**
@@ -177,7 +148,7 @@ void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const ch
 			APPL_ERROR("Request select buffer ID = \"\" ");
 		} else {
 			int32_t newID = -1;
-			sscanf(data.Utf8Data(), "%d", &newID);
+			sscanf(data.c_str(), "%d", &newID);
 			if(true == Exist(newID)) {
 				m_idSelected = newID;
 			} else {
@@ -221,7 +192,7 @@ void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const ch
 				}
 			} else {
 				int32_t newId;
-				sscanf(data.Utf8Data(), "%d", &newId);
+				sscanf(data.c_str(), "%d", &newId);
 				if (false == Exist(newId)) {
 					APPL_ERROR("Request a save As with a non existant ID=" << newId);
 				} else {
@@ -248,7 +219,7 @@ void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const ch
 					APPL_DEBUG("Close specific buffer ID" << closeID);
 				} else {
 					// close specific buffer ...
-					sscanf(data.Utf8Data(), "%d", &closeID);
+					sscanf(data.c_str(), "%d", &closeID);
 					APPL_DEBUG("Close specific buffer ID="<< closeID);
 				}
 				if(true == Exist(closeID)) {
@@ -272,8 +243,8 @@ void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const ch
 							}
 						}
 						// set it to the currect display
-						SendMultiCast(ednMsgBufferId, destBuffer);
 						m_idSelected = destBuffer;
+						SendMultiCast(ednMsgBufferId, destBuffer);
 					}
 					// Remove requested buffer
 					Remove(closeID);
@@ -289,7 +260,7 @@ void classBufferManager::OnReceiveMessage(ewol::EObject * CallerObject, const ch
 			APPL_ERROR("Null data for changing buffer ID file ... ");
 		} else {
 			int32_t newId;
-			sscanf(data.Utf8Data(), "%d", &newId);
+			sscanf(data.c_str(), "%d", &newId);
 			if (true == Exist(newId)) {
 				m_idSelected = newId;
 			} else {
@@ -558,7 +529,7 @@ void BufferManager::UnInit(void)
 		EWOL_ERROR("classBufferManager ==> request UnInit, but does not exist ...");
 		return;
 	}
-	ewol::EObjectManager::MarkToRemoved(localManager);
+	delete(localManager);
 	localManager = NULL;
 }
 

Sources/appl/Buffer/BufferText.cpp

@@ -125,7 +125,7 @@ BufferText::BufferText(etk::File &fileName) : Buffer(fileName)
 	FILE * myFile = NULL;
 	// try to open the file. if not existed, new file
 	
-	myFile = fopen(fileName.GetCompleateName().Utf8Data(), "r");
+	myFile = fopen(fileName.GetCompleateName().c_str(), "r");
 	if (NULL != myFile) {
 		m_EdnBuf.DumpFrom(myFile);
 		// close the input file
@@ -152,7 +152,7 @@ void BufferText::Save(void)
 {
 	APPL_INFO("Save File : \"" <<  GetFileName() << "\"" );
 	FILE * myFile = NULL;
-	myFile = fopen(GetFileName().GetCompleateName().Utf8Data(), "w");
+	myFile = fopen(GetFileName().GetCompleateName().c_str(), "w");
 	if (NULL != myFile) {
 		m_EdnBuf.DumpIn(myFile);
 		fclose(myFile);
@@ -214,7 +214,7 @@ void BufferText::DrawLineNumber(ewol::OObject2DTextColored* OOText, ewol::OObjec
 	OOColored->Rectangle( 0, positionY, sizeX+0.5*SEPARATION_SIZE_LINE_NUMBER, sizeY);
 	OOText->SetColor(ColorizeManager::Get(COLOR_CODE_LINE_NUMBER));
 	
-	coord2D_ts textPos;
+	Vector2D<float>  textPos;
 	textPos.x = 1;
 	textPos.y = positionY;
 	etk::UString tmppp = tmpLineNumber;
@@ -225,7 +225,7 @@ void BufferText::DrawLineNumber(ewol::OObject2DTextColored* OOText, ewol::OObjec
 #define CURSOR_THICKNESS       (1.2)
 void BufferText::DrawCursor(ewol::OObject2DColored* OOColored, int32_t x, int32_t y, int32_t letterHeight, int32_t letterWidth, clipping_ts &clip)
 {
-	color_ts & tmpppppp = ColorizeManager::Get(COLOR_CODE_CURSOR);
+	etk::Color & tmpppppp = ColorizeManager::Get(COLOR_CODE_CURSOR);
 	OOColored->SetColor(tmpppppp);
 	if (true == ewol::IsSetInsert()) {
 		OOColored->Rectangle( x, y, letterWidth, letterHeight);
@@ -299,7 +299,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	
 	// update the display position with the scroll ofset : 
 	int32_t displayStartBufferPos = m_EdnBuf.CountForwardNLines(0, displayStartLineId);
-	coord2D_ts maxSize;
+	Vector2D<float>  maxSize;
 	maxSize.x = 0.0;
 	maxSize.y = m_EdnBuf.NumberOfLines() * letterHeight;
 	int32_t nbColoneForLineNumber = GetLineNumberNumberOfElement();
@@ -309,7 +309,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	m_displaySize.y = (sizeY/letterHeight) + 1;
 	APPL_VERBOSE("main DIPLAY " << m_displaySize.x << " char * " << m_displaySize.y << " char");
 	
-	selHave = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, selStart, selEnd, selIsRect, selRectStart, selRectEnd);
+	selHave = m_EdnBuf.GetSelectionPos(selStart, selEnd, selIsRect, selRectStart, selRectEnd);
 	
 	colorInformation_ts * HLColor = NULL;
 	
@@ -317,8 +317,8 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	// Get color : 
 	Colorize *  myColor           = ColorizeManager::Get("normal");
 	Colorize *  myColorSel        = ColorizeManager::Get("SelectedText");
-	color_ts &  myColorSpace      = ColorizeManager::Get(COLOR_CODE_SPACE);
-	color_ts &  myColorTab        = ColorizeManager::Get(COLOR_CODE_TAB);
+	etk::Color &  myColorSpace    = ColorizeManager::Get(COLOR_CODE_SPACE);
+	etk::Color &  myColorTab      = ColorizeManager::Get(COLOR_CODE_TAB);
 	Colorize *  selectColor       = NULL;
 	ewol::OObject2DTextColored* OOTextSelected = NULL;
 	
@@ -329,13 +329,13 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	OOColored.SetColor(ColorizeManager::Get(COLOR_CODE_BASIC_BG));
 	OOColored.Rectangle( 0, 0, sizeX, sizeY);
 	
-	int64_t startTime = GetCurrentTime();
+	int64_t startTime = ewol::GetTime();
 	int displayLines = 0;
 	// Regenerate the colorizing if necessary ...
 	displayHLData_ts m_displayLocalSyntax;
 	m_EdnBuf.HightlightGenerateLines(m_displayLocalSyntax, displayStartBufferPos, m_displaySize.y);
 	
-	int64_t stopTime = GetCurrentTime();
+	int64_t stopTime = ewol::GetTime();
 	APPL_DEBUG("Parsing Highlight = " << stopTime - startTime << " micro-s");
 	
 	uniChar_t displayChar[MAX_EXP_CHAR_LEN];
@@ -346,6 +346,9 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	APPL_VERBOSE("Start display of text buffer [" << displayStartBufferPos<< ".." << mylen << "]");
 	APPL_VERBOSE("cursor Pos : " << m_cursorPos << "start at pos=" << displayStartBufferPos);
 	
+	// note corection of the openGl invertion system :
+	y = sizeY - y;
+	y -= letterHeight;
 	
 	OOTextNormal.clippingDisable();
 	OOColored.clippingDisable();
@@ -370,7 +373,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	OOTextBoldItalic.clippingSet(drawClippingTextArea);
 	OOColored.clippingSet(drawClippingTextArea);
 	
-	etkFloat_t lineMaxSize = 0.0;
+	float lineMaxSize = 0.0;
 	for (iii=displayStartBufferPos; iii<mylen && displayLines < m_displaySize.y ; iii = new_i) {
 		//APPL_DEBUG("diplay element=" << iii);
 		int displaywidth;
@@ -411,7 +414,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 					haveBg = selectColor->HaveBg();
 				}
 			}
-			coord2D_ts textPos;
+			Vector2D<float>  textPos;
 			textPos.x = pixelX-offsetX;
 			textPos.y = y;
 			if (true == selectColor->GetItalic() ) {
@@ -450,7 +453,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 			lineMaxSize = 0.0;
 			idX =0;
 			pixelX = x_base + SEPARATION_SIZE_LINE_NUMBER;
-			y += letterHeight;
+			y -= letterHeight;
 			displayLines++;
 			currentLineID++;
 			OOTextNormal.clippingDisable();
@@ -466,7 +469,7 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
 	}
 	// set the maximum size for the display ...
 	SetMaximumSize(maxSize);
-	int64_t stopTime2 = GetCurrentTime();
+	int64_t stopTime2 = ewol::GetTime();
 	APPL_DEBUG("DRAW text (brut) = " << stopTime2 - stopTime << " micro-s");
 
 	return ERR_NONE;
@@ -553,7 +556,7 @@ void BufferText::MouseEvent(int32_t fontId, int32_t width, int32_t height)
 		/*if (m_cursorPreferredCol < 0) {
 			m_cursorPreferredCol = posX;
 		}*/
-		m_EdnBuf.Unselect(SELECTION_PRIMARY);
+		m_EdnBuf.Unselect();
 
 		RequestUpdateOfThePosition();
 	}
@@ -577,7 +580,7 @@ void BufferText::MouseSelectFromCursorTo(int32_t fontId, int32_t width, int32_t
 	
 	int32_t selStart, selEnd, selRectStart, selRectEnd;
 	bool selIsRect;
-	int32_t selHave = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, selStart, selEnd, selIsRect, selRectStart, selRectEnd);
+	int32_t selHave = m_EdnBuf.GetSelectionPos(selStart, selEnd, selIsRect, selRectStart, selRectEnd);
 	//APPL_DEBUG("BufferText:: " << selHave << " = BufGetSelectionPos(SELECTION_PRIMARY," << selStart << "," << selEnd << "," << selIsRect << "," << selRectStart << "," << selRectEnd << ");" );
 	int32_t rememberCursorPos = m_cursorPos;
 	// move the cursor
@@ -589,12 +592,12 @@ void BufferText::MouseSelectFromCursorTo(int32_t fontId, int32_t width, int32_t
 	}*/
 	
 	if (false == selHave) {
-		m_EdnBuf.Select(SELECTION_PRIMARY, rememberCursorPos, m_cursorPos);
+		m_EdnBuf.Select(rememberCursorPos, m_cursorPos);
 	} else {
 		if (rememberCursorPos == selStart) {
-			m_EdnBuf.Select(SELECTION_PRIMARY, m_cursorPos, selEnd);
+			m_EdnBuf.Select(m_cursorPos, selEnd);
 		} else {
-			m_EdnBuf.Select(SELECTION_PRIMARY, selStart, m_cursorPos);
+			m_EdnBuf.Select(selStart, m_cursorPos);
 		}
 	}
 	Copy(ewol::clipBoard::CLIPBOARD_SELECTION);
@@ -615,7 +618,7 @@ void BufferText::MouseEventDouble(void)
 {
 	int32_t beginPos, endPos;
 	if (true == m_EdnBuf.SelectAround(m_cursorPos, beginPos, endPos)) {
-		m_EdnBuf.Select(SELECTION_PRIMARY, beginPos, endPos);
+		m_EdnBuf.Select(beginPos, endPos);
 		m_cursorPos = endPos;
 	}
 	Copy(ewol::clipBoard::CLIPBOARD_SELECTION);
@@ -632,7 +635,7 @@ void BufferText::MouseEventDouble(void)
  */
 void BufferText::MouseEventTriple(void)
 {
-	m_EdnBuf.Select(SELECTION_PRIMARY, m_EdnBuf.StartOfLine(m_cursorPos), m_EdnBuf.EndOfLine(m_cursorPos));
+	m_EdnBuf.Select(m_EdnBuf.StartOfLine(m_cursorPos), m_EdnBuf.EndOfLine(m_cursorPos));
 	m_cursorPos = m_EdnBuf.EndOfLine(m_cursorPos);
 	Copy(ewol::clipBoard::CLIPBOARD_SELECTION);
 }
@@ -648,14 +651,14 @@ void BufferText::RemoveLine(void)
 
 void BufferText::SelectAll(void)
 {
-	m_EdnBuf.Select(SELECTION_PRIMARY, 0, m_EdnBuf.Size());
+	m_EdnBuf.Select(0, m_EdnBuf.Size());
 	m_cursorPos = m_EdnBuf.Size();
 	Copy(ewol::clipBoard::CLIPBOARD_SELECTION);
 }
 
 void BufferText::SelectNone(void)
 {
-	m_EdnBuf.Unselect(SELECTION_PRIMARY);
+	m_EdnBuf.Unselect();
 }
 
 
@@ -671,13 +674,13 @@ void BufferText::SetInsertPosition(int32_t newPos, bool insertChar)
 {
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	int32_t rememberCursorPos = m_cursorPos;
 
 	//APPL_DEBUG("newPos=" << newPos);
 
 	// unselect buffer:
-	m_EdnBuf.Unselect(SELECTION_PRIMARY);
+	m_EdnBuf.Unselect();
 	/* make sure new position is ok, do nothing if it hasn't changed */
 	if (newPos != m_cursorPos) {
 		if (newPos < 0){
@@ -695,19 +698,19 @@ void BufferText::SetInsertPosition(int32_t newPos, bool insertChar)
 		return;
 	}
 	
-	if(		false == haveSelectionActive
-		&&	true  == ewol::IsSetShift() )
+	if(    false == haveSelectionActive
+	    && true  == ewol::IsSetShift() )
 	{
 		// new selection
-		m_EdnBuf.Select(SELECTION_PRIMARY, rememberCursorPos, m_cursorPos);
-	} else if(		true == ewol::IsSetShift()
-				&&	true == haveSelectionActive)
+		m_EdnBuf.Select(rememberCursorPos, m_cursorPos);
+	} else if(    true == ewol::IsSetShift()
+	           && true == haveSelectionActive)
 	{
 		// update selection
 		if (rememberCursorPos == SelectionStart) {
-			m_EdnBuf.Select(SELECTION_PRIMARY, m_cursorPos, SelectionEnd);
+			m_EdnBuf.Select(m_cursorPos, SelectionEnd);
 		} else {
-			m_EdnBuf.Select(SELECTION_PRIMARY, SelectionStart, m_cursorPos);
+			m_EdnBuf.Select(SelectionStart, m_cursorPos);
 		}
 	}
 }
@@ -849,11 +852,11 @@ void BufferText::cursorMove(ewol::eventKbMoveType_te moveTypeEvent)
  * @return ---
  *
  */
-coord2D_ts BufferText::GetPosition(int32_t fontId, bool& centerRequested)
+Vector2D<float>  BufferText::GetPosition(int32_t fontId, bool& centerRequested)
 {
 	centerRequested = m_centerRequested;
 	m_centerRequested = false;
-	coord2D_ts outputPosition;
+	Vector2D<float>  outputPosition;
 
 	// Display position (Y mode):
 	APPL_INFO("change the position : " << m_cursorPos);
@@ -867,8 +870,8 @@ coord2D_ts BufferText::GetPosition(int32_t fontId, bool& centerRequested)
 	
 	// get font porperties :
 	// TODO : change this :
-	etkFloat_t letterWidth = ewol::GetWidth(fontId, "A");
-	etkFloat_t letterHeight = ewol::GetHeight(fontId);
+	float letterWidth = ewol::GetWidth(fontId, "A");
+	float letterHeight = ewol::GetHeight(fontId);
 	outputPosition.x *= letterWidth;
 	outputPosition.y *= letterHeight;
 	return outputPosition;
@@ -876,7 +879,7 @@ coord2D_ts BufferText::GetPosition(int32_t fontId, bool& centerRequested)
 	/* if we request a center : 
 	} else {
 		// center the line at the middle of the screen :
-		coord2D_ts outputPosition;
+		Vector2D<float>  outputPosition;
 		//APPL_DEBUG(" -------------------------------------------------");
 		outputPosition.y = m_EdnBuf.CountLines(0, m_cursorPos);
 		//APPL_DEBUG(" cursor position : " << m_cursorPos << " ==> ligne=" << outputPosition.y);
@@ -907,10 +910,10 @@ void BufferText::AddChar(uniChar_t unicodeData)
 {
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	if (unicodeData == 0x09) {
 		if (false == haveSelectionActive) {
-			etk::VectorType<int8_t> tmpVect;
+			etk::Vector<int8_t> tmpVect;
 			tmpVect.PushBack(0x09);
 			m_EdnBuf.Insert(m_cursorPos, tmpVect);
 			SetInsertPosition(m_cursorPos+1, true);
@@ -919,20 +922,20 @@ void BufferText::AddChar(uniChar_t unicodeData)
 			// count the number of line : 
 			int32_t nbSelectedLines = m_EdnBuf.CountLines(SelectionStart, SelectionEnd);
 			if (0 == nbSelectedLines) {
-				etk::VectorType<int8_t> tmpVect;
+				etk::Vector<int8_t> tmpVect;
 				tmpVect.PushBack(0x09);
-				m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, tmpVect);
+				m_EdnBuf.ReplaceSelected(tmpVect);
 				SetInsertPosition(SelectionStart+tmpVect.Size(), true);
 			} else {
 				if (true == ewol::IsSetShift() ) {
-					m_cursorPos = m_EdnBuf.UnIndent(SELECTION_PRIMARY);
+					m_cursorPos = m_EdnBuf.UnIndent();
 				} else {
-					m_cursorPos = m_EdnBuf.Indent(SELECTION_PRIMARY);
+					m_cursorPos = m_EdnBuf.Indent();
 				}
 			}
 		}
 	} else if (unicodeData == '\n') {
-		etk::VectorType<int8_t> tmpVect;
+		etk::Vector<int8_t> tmpVect;
 		if (true == ewol::IsSetShift()) {
 			tmpVect.PushBack('\r');
 		} else {
@@ -963,7 +966,7 @@ void BufferText::AddChar(uniChar_t unicodeData)
 			m_EdnBuf.Insert(m_cursorPos, tmpVect);
 			SetInsertPosition(m_cursorPos+tmpVect.Size(), true);
 		} else {
-			m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, tmpVect);
+			m_EdnBuf.ReplaceSelected(tmpVect);
 			SetInsertPosition(SelectionStart+tmpVect.Size(), true);
 		}
 	} else if (unicodeData == 0x7F ) {
@@ -971,7 +974,7 @@ void BufferText::AddChar(uniChar_t unicodeData)
 		if (false == haveSelectionActive) {
 			m_EdnBuf.Remove(m_cursorPos, m_cursorPos+1);
 		} else {
-			m_EdnBuf.RemoveSelected(SELECTION_PRIMARY);
+			m_EdnBuf.RemoveSelected();
 			SetInsertPosition(SelectionStart, true);
 		}
 	} else if (unicodeData == 0x08) {
@@ -980,7 +983,7 @@ void BufferText::AddChar(uniChar_t unicodeData)
 			m_EdnBuf.Remove(m_cursorPos-1, m_cursorPos);
 			SetInsertPosition(m_cursorPos-1, true);
 		} else {
-			m_EdnBuf.RemoveSelected(SELECTION_PRIMARY);
+			m_EdnBuf.RemoveSelected();
 			SetInsertPosition(SelectionStart, true);
 		}
 	} else {
@@ -988,14 +991,14 @@ void BufferText::AddChar(uniChar_t unicodeData)
 		if (true == m_EdnBuf.GetUTF8Mode()) {
 			char tmpUTF8[16];
 			unicode::convertUnicodeToUtf8(unicodeData, tmpUTF8);
-			etk::VectorType<int8_t> tmpVect;
+			etk::Vector<int8_t> tmpVect;
 			int32_t localOfset = strlen(tmpUTF8);
 			tmpVect.PushBack((int8_t*)tmpUTF8, localOfset);
 			if (false == haveSelectionActive) {
 				m_EdnBuf.Insert(m_cursorPos, tmpVect);
 				SetInsertPosition(m_cursorPos+localOfset, true);
 			} else {
-				m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, tmpVect);
+				m_EdnBuf.ReplaceSelected(tmpVect);
 				SetInsertPosition(SelectionStart+localOfset, true);
 			}
 		} else {
@@ -1003,13 +1006,13 @@ void BufferText::AddChar(uniChar_t unicodeData)
 			char output_ISO;
 			unicode::convertUnicodeToIso(m_EdnBuf.GetCharsetType(), unicodeData, output_ISO);
 			//printf(" insert : \"%s\"==> 0x%08x=%d ", UTF8data, (unsigned int)output_ISO, (int)output_ISO);
-			etk::VectorType<int8_t> tmpVect;
+			etk::Vector<int8_t> tmpVect;
 			tmpVect.PushBack(output_ISO);
 			if (false == haveSelectionActive) {
 				m_EdnBuf.Insert(m_cursorPos, tmpVect);
 				SetInsertPosition(m_cursorPos+1, true);
 			} else {
-				m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, tmpVect);
+				m_EdnBuf.ReplaceSelected(tmpVect);
 				SetInsertPosition(SelectionStart+1, true);
 			}
 		}
@@ -1027,7 +1030,7 @@ int32_t BufferText::FindLine(etk::UString &data)
 		return 0;
 	}
 	APPL_INFO("Search data line : \"" << data << "\"");
-	etk::VectorType<uniChar_t> mVectSearch;
+	etk::Vector<uniChar_t> mVectSearch;
 	mVectSearch = data.GetVector();
 	//APPL_INFO("search data Forward : startSearchPos=" << startSearchPos );
 	/*
@@ -1047,7 +1050,7 @@ int32_t BufferText::FindLine(etk::UString &data)
 void BufferText::JumpAtLine(int32_t newLine)
 {
 	int32_t positionLine = m_EdnBuf.CountForwardNLines(0, newLine);
-	m_EdnBuf.Unselect(SELECTION_PRIMARY);
+	m_EdnBuf.Unselect();
 	APPL_DEBUG("jump at the line : " << newLine );
 	SetInsertPosition(positionLine);
 	m_centerRequested = true;
@@ -1075,7 +1078,7 @@ void BufferText::Search(etk::UString &data, bool back, bool caseSensitive, bool
 	
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	
 	int32_t startSearchPos = m_cursorPos;
 	if (true == haveSelectionActive) {
@@ -1090,46 +1093,41 @@ void BufferText::Search(etk::UString &data, bool back, bool caseSensitive, bool
 		APPL_WARNING("no search data");
 		return;
 	}
-	etk::VectorType<uniChar_t> mVectSearch;
-	mVectSearch = data.GetVector();
-	APPL_TODO("Remove for now ...");
-	/*
 	if (false == back) {
 		//APPL_INFO("search data Forward : startSearchPos=" << startSearchPos );
 		int32_t foundPos;
-		bool findSomething = m_EdnBuf.SearchForward(startSearchPos, mVectSearch, &foundPos, caseSensitive);
+		int32_t foundPosEnd;
+		bool findSomething = m_EdnBuf.SearchForward(startSearchPos, data, &foundPos, &foundPosEnd, caseSensitive);
 		if(		false == findSomething
 			&&	true == wrap)
 		{
 			//APPL_INFO("WrapMode !!! 0 ==> end");
-			findSomething = m_EdnBuf.SearchForward(0, mVectSearch, &foundPos, caseSensitive);
+			findSomething = m_EdnBuf.SearchForward(0, data, &foundPos, &foundPosEnd, caseSensitive);
 		}
 		// if find data : 
 		if (true == findSomething) {
 			// select new position
-			int32_t endSelectionPos = foundPos+mVectSearch.Size();
-			SetInsertPosition(endSelectionPos);
-			m_EdnBuf.Select(SELECTION_PRIMARY, foundPos, endSelectionPos);
+			SetInsertPosition(foundPosEnd);
+			m_EdnBuf.Select(foundPos, foundPosEnd);
 		}
 	} else {
 		//APPL_INFO("search data Backward : " << data.GetDirectPointer() );
 		int32_t foundPos;
-		bool findSomething = m_EdnBuf.SearchBackward(startSearchPos, mVectSearch, &foundPos, caseSensitive);
+		int32_t foundPosEnd;
+		bool findSomething = m_EdnBuf.SearchBackward(startSearchPos, data, &foundPos, &foundPosEnd, caseSensitive);
 		if(		false == findSomething
 			&&	true == wrap)
 		{
 			//APPL_INFO("WrapMode !!! end ==> 0");
-			findSomething = m_EdnBuf.SearchBackward(m_EdnBuf.Size(), mVectSearch, &foundPos, caseSensitive);
+			findSomething = m_EdnBuf.SearchBackward(m_EdnBuf.Size(), data, &foundPos, &foundPosEnd, caseSensitive);
 		}
 		// if find data : 
 		if (true == findSomething) {
 			// select new position
-			int32_t endSelectionPos = foundPos+mVectSearch.Size();
 			SetInsertPosition(foundPos);
-			m_EdnBuf.Select(SELECTION_PRIMARY, foundPos, endSelectionPos);
+			m_EdnBuf.Select(foundPos, foundPosEnd);
 		}
 	}
-	*/
 	m_centerRequested = true;
 	RequestUpdateOfThePosition();
 }
@@ -1139,10 +1137,10 @@ void BufferText::Replace(etk::UString &data)
 {
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	if (true == haveSelectionActive) {
 		// Replace Data : 
-		int32_t size = m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, data);
+		int32_t size = m_EdnBuf.ReplaceSelected(data);
 		SetInsertPosition(SelectionStart + size);
 	}
 	SetModify(true);
@@ -1161,8 +1159,8 @@ void BufferText::Copy(int8_t clipboardID)
 {
 	etk::UString mVect;
 	// get the curent selected data
-	if (true == m_EdnBuf.SelectHasSelection(SELECTION_PRIMARY) ) {
-		m_EdnBuf.GetSelectionText(SELECTION_PRIMARY, mVect);
+	if (true == m_EdnBuf.SelectHasSelection() ) {
+		m_EdnBuf.GetSelectionText(mVect);
 	}
 	// copy data in the click board : 
 	ewol::clipBoard::Set(clipboardID, mVect);
@@ -1182,14 +1180,14 @@ void BufferText::Cut(int8_t clipboardID)
 
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	
 	// copy data
 	Copy(clipboardID);
 	// remove data : 
 	if (true == haveSelectionActive ) {
 		APPL_INFO("REMOVE SELECTION");
-		m_EdnBuf.RemoveSelected(SELECTION_PRIMARY);
+		m_EdnBuf.RemoveSelected();
 		m_cursorPos = SelectionStart;
 	}
 	RequestUpdateOfThePosition();
@@ -1213,11 +1211,11 @@ void BufferText::Paste(int8_t clipboardID)
 	
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SELECTION_PRIMARY, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = m_EdnBuf.GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	
 	if (true == haveSelectionActive ) {
 		// replace data
-		int32_t size = m_EdnBuf.ReplaceSelected(SELECTION_PRIMARY, mVect );
+		int32_t size = m_EdnBuf.ReplaceSelected(mVect );
 		m_cursorPos = SelectionStart + size;
 	} else {
 		// insert data

Sources/appl/Buffer/BufferText.h

@@ -85,7 +85,7 @@ class BufferText : public Buffer {
 		
 		// Direct buffer IO
 		EdnBuf                  m_EdnBuf;                   //!< buffer associated on this displayer
-		coord2D_ts              m_displaySize;              //!< number of char displayable in the screan
+		Vector2D<float>         m_displaySize;              //!< number of char displayable in the screan
 		// Cursor :
 		int32_t                 m_cursorPos;                //!< position in the buffer of the cursor
 		int32_t                 m_cursorPreferredCol;       //!< colomn of the last up and down ...
@@ -96,7 +96,7 @@ class BufferText : public Buffer {
 	private:
 		bool m_centerRequested;
 	public:
-		virtual coord2D_ts      GetPosition(int32_t fontId, bool& centerRequested);
+		virtual Vector2D<float> GetPosition(int32_t fontId, bool& centerRequested);
 	private:
 		bool     TextDMoveUp(int32_t offset);
 		bool     TextDMoveDown(int32_t offset);

Sources/appl/Buffer/EdnBuf/EdnBuf.cpp

@@ -56,18 +56,10 @@ EdnBuf::EdnBuf(void)
 	m_useTabs = true;
 
 	// Current selection
-	m_selectionList[SELECTION_PRIMARY].selected = false;
-	m_selectionList[SELECTION_PRIMARY].zeroWidth = false;
-	m_selectionList[SELECTION_PRIMARY].rectangular = false;
-	m_selectionList[SELECTION_PRIMARY].start = m_selectionList[SELECTION_PRIMARY].end = 0;
-	m_selectionList[SELECTION_SECONDARY].selected = false;
-	m_selectionList[SELECTION_SECONDARY].zeroWidth = false;
-	m_selectionList[SELECTION_SECONDARY].rectangular = false;
-	m_selectionList[SELECTION_SECONDARY].start = m_selectionList[SELECTION_SECONDARY].end = 0;
-	m_selectionList[SELECTION_HIGHTLIGHT].selected = false;
-	m_selectionList[SELECTION_HIGHTLIGHT].zeroWidth = false;
-	m_selectionList[SELECTION_HIGHTLIGHT].rectangular = false;
-	m_selectionList[SELECTION_HIGHTLIGHT].start = m_selectionList[SELECTION_HIGHTLIGHT].end = 0;
+	m_selectionList.selected = false;
+	m_selectionList.zeroWidth = false;
+	m_selectionList.rectangular = false;
+	m_selectionList.start = m_selectionList.end = 0;
 
 	// charset : 
 	m_isUtf8 = false;
@@ -116,7 +108,7 @@ bool EdnBuf::DumpFrom(FILE *myFile)
 {
 	if (true == m_data.DumpFrom(myFile) ) {
 		// set no selection
-		UpdateSelections(0, 0, m_data.Size() );
+		UpdateSelection(0, 0, m_data.Size() );
 		// generate HighLight
 		CleanHighLight();
 		GenerateHighLightAt(0, m_data.Size());
@@ -127,7 +119,7 @@ bool EdnBuf::DumpFrom(FILE *myFile)
 }
 
 
-void EdnBuf::GetAll(etk::VectorType<int8_t> &text)
+void EdnBuf::GetAll(etk::Vector<int8_t> &text)
 {
 	// Clean output vector
 	text.Clear();
@@ -136,9 +128,9 @@ void EdnBuf::GetAll(etk::VectorType<int8_t> &text)
 }
 
 
-void EdnBuf::SetAll(etk::VectorType<int8_t> &text)
+void EdnBuf::SetAll(etk::Vector<int8_t> &text)
 {
-	etk::VectorType<int8_t> deletedText;
+	etk::Vector<int8_t> deletedText;
 	
 	// extract all data of the buffer :
 	GetAll(deletedText);
@@ -150,13 +142,13 @@ void EdnBuf::SetAll(etk::VectorType<int8_t> &text)
 	m_data.Insert(0, text);
 	
 	// Zero all of the existing selections
-	UpdateSelections(0, deletedText.Size(), 0);
+	UpdateSelection(0, deletedText.Size(), 0);
 	
 	// Call the modification Event Manager
 	eventModification(0, m_data.Size(), deletedText); 
 }
 
-void EdnBuf::GetRange(int32_t start, int32_t end, etk::VectorType<int8_t> &output)
+void EdnBuf::GetRange(int32_t start, int32_t end, etk::Vector<int8_t> &output)
 {
 	// Remove all data ...
 	output.Clear();
@@ -170,14 +162,14 @@ void EdnBuf::GetRange(int32_t start, int32_t end, etk::UString &output)
 	// Remove all data ...
 	output = "";
 	// import data : 
-	etk::VectorType<int8_t> localOutput;
+	etk::Vector<int8_t> localOutput;
 	m_data.Get(start, end-start, localOutput);
 	// transcript in UNICODE ...
 	if (true == m_isUtf8) {
 		localOutput.PushBack('\0');
 		output = (char*)&localOutput[0];
 	} else {
-		etk::VectorType<uniChar_t> tmpUnicodeData;
+		etk::Vector<uniChar_t> tmpUnicodeData;
 		// transform in unicode :
 		convertIsoToUnicode(m_charsetType, localOutput, tmpUnicodeData);
 		output = tmpUnicodeData;
@@ -210,7 +202,7 @@ int8_t EdnBuf::operator[] (int32_t pos)
  * @return ---
  * 
  */
-int32_t EdnBuf::Insert(int32_t pos, etk::VectorType<int8_t> &insertText)
+int32_t EdnBuf::Insert(int32_t pos, etk::Vector<int8_t> &insertText)
 {
 	// if pos is not contiguous to existing text, make it
 	pos = etk_avg(0, pos, m_data.Size() );
@@ -218,7 +210,7 @@ int32_t EdnBuf::Insert(int32_t pos, etk::VectorType<int8_t> &insertText)
 	int32_t sizeInsert=LocalInsert(pos, insertText);
 
 	// Call the redisplay ...
-	etk::VectorType<int8_t> deletedText;
+	etk::Vector<int8_t> deletedText;
 	eventModification(pos, insertText.Size(), deletedText);
 	return sizeInsert;
 }
@@ -230,7 +222,7 @@ int32_t EdnBuf::Insert(int32_t pos, etk::UString &insertText)
 	int32_t sizeInsert=LocalInsert(pos, insertText);
 
 	// Call the redisplay ...
-	etk::VectorType<int8_t> deletedText;
+	etk::Vector<int8_t> deletedText;
 	eventModification(pos, insertText.Size(), deletedText);
 	return sizeInsert;
 }
@@ -245,27 +237,34 @@ int32_t EdnBuf::Insert(int32_t pos, etk::UString &insertText)
  * @return nb Octet inserted
  * 
  */
-int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::VectorType<int8_t> &insertText)
+int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::Vector<int8_t> &insertText)
 {
-	etk::VectorType<int8_t> deletedText;
+	if (end-start == 0) {
+		return 0;
+	}
+	etk::Vector<int8_t> deletedText;
 	GetRange(start, end, deletedText);
 	m_data.Replace(start, end-start, insertText);
 	// update internal elements
 	eventModification(start, insertText.Size(), deletedText);
 	return insertText.Size();
 }
+
 int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::UString &insertText)
 {
-	etk::VectorType<int8_t> deletedText;
+	if (end-start == 0) {
+		return 0;
+	}
+	etk::Vector<int8_t> deletedText;
 	GetRange(start, end, deletedText);
-	etk::VectorType<int8_t> tmpInsertText;
+	etk::Vector<int8_t> tmpInsertText;
 	if (true == m_isUtf8) {
-		char * tmpPointer = insertText.Utf8Data();
+		char * tmpPointer = insertText.c_str();
 		while (*tmpPointer != '\0') {
 			tmpInsertText.PushBack(*tmpPointer++);
 		}
 	} else {
-		etk::VectorType<unsigned int> tmppp = insertText.GetVector();
+		etk::Vector<unsigned int> tmppp = insertText.GetVector();
 		convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
 	}
 	if (tmpInsertText.Size()>0) {
@@ -297,7 +296,7 @@ int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::UString &insertText)
 void EdnBuf::Remove(int32_t start, int32_t end)
 {
 
-	etk::VectorType<int8_t> deletedText;
+	etk::Vector<int8_t> deletedText;
 	// Make sure the arguments make sense
 	if (start > end) {
 		int32_t temp = start;
@@ -314,21 +313,21 @@ void EdnBuf::Remove(int32_t start, int32_t end)
 }
 
 
-int32_t EdnBuf::Indent(selectionType_te select)
+int32_t EdnBuf::Indent(void)
 {
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = GetSelectionPos(select, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	
 	if (false == haveSelectionActive) {
 		return SelectionEnd;
 	}
 	// Disable selection:
-	Unselect(select);
+	Unselect();
 	// Get Range :
 	int32_t l_start = StartOfLine(SelectionStart);
 	int32_t l_end = EndOfLine(SelectionEnd);
-	etk::VectorType<int8_t> l_tmpData;
+	etk::Vector<int8_t> l_tmpData;
 	GetRange(l_start, l_end, l_tmpData);
 	
 	l_tmpData.Insert(0, '\n');
@@ -348,26 +347,26 @@ int32_t EdnBuf::Indent(selectionType_te select)
 	Replace(l_start, l_end, l_tmpData);
 	// Set the new selection :
 	l_end = l_start + l_tmpData.Size();
-	Select(select, l_start, l_end);
+	Select(l_start, l_end);
 	// Return the position of the cursor
 	return l_end;
 }
 
-int32_t EdnBuf::UnIndent(selectionType_te select)
+int32_t EdnBuf::UnIndent(void)
 {
 	int32_t SelectionStart, SelectionEnd, SelectionRectStart, SelectionRectEnd;
 	bool SelectionIsRect;
-	bool haveSelectionActive = GetSelectionPos(select, SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
+	bool haveSelectionActive = GetSelectionPos(SelectionStart, SelectionEnd, SelectionIsRect, SelectionRectStart, SelectionRectEnd);
 	
 	if (false == haveSelectionActive) {
 		return SelectionEnd;
 	}
 	// Disable selection:
-	Unselect(select);
+	Unselect();
 	// Get Range :
 	int32_t l_start = StartOfLine(SelectionStart);
 	int32_t l_end = EndOfLine(SelectionEnd);
-	etk::VectorType<int8_t> l_tmpData;
+	etk::Vector<int8_t> l_tmpData;
 	GetRange(l_start, l_end, l_tmpData);
 	
 	l_tmpData.Insert(0, '\n');
@@ -394,7 +393,7 @@ int32_t EdnBuf::UnIndent(selectionType_te select)
 	Replace(l_start, l_end, l_tmpData);
 	// Set the new selection :
 	l_end = l_start + l_tmpData.Size();
-	Select(select, l_start, l_end);
+	Select(l_start, l_end);
 	// Return the position of the cursor
 	return l_end;
 }
@@ -409,7 +408,7 @@ int32_t EdnBuf::UnIndent(selectionType_te select)
  * @return ---
  * 
  */
-void EdnBuf::GetLineText(int32_t pos, etk::VectorType<int8_t> &text)
+void EdnBuf::GetLineText(int32_t pos, etk::Vector<int8_t> &text)
 {
 	GetRange( StartOfLine(pos), EndOfLine(pos), text);
 }
@@ -842,9 +841,9 @@ int32_t EdnBuf::CountLines(int32_t startPos, int32_t endPos)
  * @return number of line found
  * 
  */
-int32_t EdnBuf::CountLines(etk::VectorType<int8_t> &data)
+int32_t EdnBuf::CountLines(etk::Vector<int8_t> &data)
 {
-	etk::VectorType<int8_t>::Iterator myPosIt = data.Begin();
+	etk::Vector<int8_t>::Iterator myPosIt = data.Begin();
 	int32_t lineCount = 0;
 	
 	while(myPosIt) {
@@ -986,13 +985,25 @@ bool EdnBuf::charMatch(char first, char second, bool caseSensitive)
  * @return false ==> not found data
  * 
  */
-bool EdnBuf::SearchForward(int32_t startPos, etk::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive)
+bool EdnBuf::SearchForward(int32_t startPos, etk::UString &search, int32_t *foundPos, int32_t *foundPosEnd, bool caseSensitive)
 {
+	etk::Vector<int8_t> searchVect;
+	if (true == m_isUtf8) {
+		char * tmpPointer = search.c_str();
+		while (*tmpPointer != '\0') {
+			searchVect.PushBack(*tmpPointer++);
+		}
+	} else {
+		etk::Vector<unsigned int> tmppp = search.GetVector();
+		convertUnicodeToIso(m_charsetType, tmppp, searchVect);
+	}
+	// remove the '\0' at the end of the string ...
+	searchVect.PopBack();
 	int32_t position;
 	int32_t searchLen = searchVect.Size();
 	int32_t dataLen   = m_data.Size();
 	char currentChar = '\0';
-	//APPL_INFO(" startPos=" << startPos << " searchLen=" << searchLen);
+	APPL_INFO(" startPos=" << startPos << " searchLen=" << searchLen);
 	for (position=startPos; position<dataLen - (searchLen-1); position++) {
 		currentChar = m_data[position];
 		if (true == charMatch(currentChar, searchVect[0], caseSensitive)) {
@@ -1007,11 +1018,13 @@ bool EdnBuf::SearchForward(int32_t startPos, etk::VectorType<int8_t> &searchVect
 			}
 			if (true == found) {
 				*foundPos = position;
+				*foundPosEnd = position + searchVect.Size();
 				return true;
 			}
 		}
 	}
 	*foundPos = m_data.Size();
+	*foundPosEnd = m_data.Size();
 	return false;
 }
 
@@ -1027,8 +1040,21 @@ bool EdnBuf::SearchForward(int32_t startPos, etk::VectorType<int8_t> &searchVect
  * @return false ==> not found data
  * 
  */
-bool EdnBuf::SearchBackward(int32_t startPos, etk::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive)
+bool EdnBuf::SearchBackward(int32_t startPos, etk::UString &search, int32_t *foundPos, int32_t *foundPosEnd, bool caseSensitive)
 {
+	etk::Vector<int8_t> searchVect;
+	if (true == m_isUtf8) {
+		char * tmpPointer = search.c_str();
+		while (*tmpPointer != '\0') {
+			searchVect.PushBack(*tmpPointer++);
+		}
+	} else {
+		etk::Vector<unsigned int> tmppp = search.GetVector();
+		convertUnicodeToIso(m_charsetType, tmppp, searchVect);
+	}
+	// remove the '\0' at the end of the string ...
+	searchVect.PopBack();
+	
 	int32_t position;
 	int32_t searchLen = searchVect.Size();
 	char currentChar = '\0';
@@ -1047,11 +1073,13 @@ bool EdnBuf::SearchBackward(int32_t startPos, etk::VectorType<int8_t> &searchVec
 			}
 			if (true == found) {
 				*foundPos = position - (searchLen-1);
+				*foundPosEnd = position + searchVect.Size();
 				return true;
 			}
 		}
 	}
 	*foundPos = m_data.Size();
+	*foundPosEnd = m_data.Size();
 	return false;
 }
 
@@ -1153,25 +1181,25 @@ bool EdnBuf::SelectAround(int32_t startPos, int32_t &beginPos, int32_t &endPos)
  * @return number of element inserted.
  * 
  */
-int32_t EdnBuf::LocalInsert(int32_t pos, etk::VectorType<int8_t> &insertText)
+int32_t EdnBuf::LocalInsert(int32_t pos, etk::Vector<int8_t> &insertText)
 {
 	// Insert data in buffer
 	m_data.Insert(pos, insertText);
 	// update the current selected area
-	UpdateSelections(pos, 0, insertText.Size() );
+	UpdateSelection(pos, 0, insertText.Size() );
 	// return the number of element inserted ...
 	return insertText.Size();
 }
 int32_t EdnBuf::LocalInsert(int32_t pos, etk::UString &insertText)
 {
-	etk::VectorType<int8_t> tmpInsertText;
+	etk::Vector<int8_t> tmpInsertText;
 	if (true == m_isUtf8) {
-		char * tmpPointer = insertText.Utf8Data();
+		char * tmpPointer = insertText.c_str();
 		while (*tmpPointer != '\0') {
 			tmpInsertText.PushBack(*tmpPointer++);
 		}
 	} else {
-		etk::VectorType<unsigned int> tmppp = insertText.GetVector();
+		etk::Vector<unsigned int> tmppp = insertText.GetVector();
 		convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
 	}
 	if (tmpInsertText.Size()>0) {
@@ -1193,7 +1221,7 @@ int32_t EdnBuf::LocalInsert(int32_t pos, etk::UString &insertText)
  * @return ---
  * 
  */
-void EdnBuf::eventModification(int32_t pos, int32_t nInserted, etk::VectorType<int8_t> &deletedText)
+void EdnBuf::eventModification(int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText)
 {
 	if(		0 == deletedText.Size()
 		&&	0 == nInserted)

Sources/appl/Buffer/EdnBuf/EdnBuf.h

@@ -58,16 +58,8 @@ typedef struct {
 	int32_t rectEnd;        //!< Indent of right edge of rect. selection
 } selection;
 
-typedef enum{
-	SELECTION_PRIMARY,
-	SELECTION_SECONDARY,
-	SELECTION_HIGHTLIGHT,
-	SELECTION_SIZE
-}selectionType_te;
-
-
 typedef struct {
-	etk::VectorType<colorInformation_ts>    HLData;
+	etk::Vector<colorInformation_ts>    HLData;
 	int32_t                                 posHLPass1;
 	int32_t                                 posHLPass2;
 }displayHLData_ts;
@@ -82,24 +74,24 @@ class EdnBuf {
 		// destructer
 		~EdnBuf(void);
 		// public function :
-		void    GetAll(                 etk::VectorType<int8_t> &text);
-		void    SetAll(                 etk::VectorType<int8_t> &text);
-		void    GetRange(               int32_t start, int32_t end, etk::VectorType<int8_t> &output);
+		void    GetAll(                 etk::Vector<int8_t> &text);
+		void    SetAll(                 etk::Vector<int8_t> &text);
+		void    GetRange(               int32_t start, int32_t end, etk::Vector<int8_t> &output);
 		void    GetRange(               int32_t start, int32_t end, etk::UString &output);
 		bool    DumpIn(                 FILE *myFile);
 		bool    DumpFrom(               FILE *myFile);
 		// replace with operator [] ...
 		int8_t  operator[] (int32_t);
-		int32_t Insert(                 int32_t pos, etk::VectorType<int8_t> &insertText);
+		int32_t Insert(                 int32_t pos, etk::Vector<int8_t> &insertText);
 		int32_t Insert(                 int32_t pos, etk::UString &insertText);
-		int32_t Replace(                int32_t start, int32_t end, etk::VectorType<int8_t> &insertText);
+		int32_t Replace(                int32_t start, int32_t end, etk::Vector<int8_t> &insertText);
 		int32_t Replace(                int32_t start, int32_t end, etk::UString &insertText);
 		void    Remove(                 int32_t start, int32_t end);
-		int32_t Indent(                 selectionType_te select);
-		int32_t UnIndent(               selectionType_te select);
+		int32_t Indent(                 void);
+		int32_t UnIndent(               void);
 		
 		
-		void    GetLineText(            int32_t pos, etk::VectorType<int8_t> &text);
+		void    GetLineText(            int32_t pos, etk::Vector<int8_t> &text);
 		int32_t StartOfLine(            int32_t pos);
 		int32_t EndOfLine(              int32_t pos);
 		
@@ -111,39 +103,38 @@ class EdnBuf {
 		int32_t CountForwardDispChars(  int32_t lineStartPos, int32_t nChars);
 		int32_t CountLines(             int32_t startPos, int32_t endPos);
 		int32_t CountLines(             void);
-		int32_t CountLines(             etk::VectorType<int8_t> &data);
+		int32_t CountLines(             etk::Vector<int8_t> &data);
 		int32_t CountForwardNLines(     int32_t startPos, int32_t nLines);
 		int32_t CountBackwardNLines(    int32_t startPos, int32_t nLines);
 		
-		bool    SearchForward(          int32_t startPos, etk::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive = true);
-		bool    SearchBackward(         int32_t startPos, etk::VectorType<int8_t> &searchVect, int32_t *foundPos, bool caseSensitive = true);
+		bool    SearchForward(          int32_t startPos, etk::UString &search, int32_t *foundPos, int32_t *foundPosEnd, bool caseSensitive = true);
+		bool    SearchBackward(         int32_t startPos, etk::UString &search, int32_t *foundPos, int32_t *foundPosEnd, bool caseSensitive = true);
 		bool    SearchForward(          int32_t startPos, char searchChar, int32_t *foundPos);
 		bool    SearchBackward(         int32_t startPos, char searchChar, int32_t *foundPos);
 		bool    SelectAround(           int32_t startPos, int32_t &beginPos, int32_t &endPos);
 
 		// Buffer Size system :
 		int32_t Size(void)              { return m_data.Size(); };
-		int32_t NumberOfLines(void)     {return m_nbLine;};
+		int32_t NumberOfLines(void)     { return m_nbLine; };
 
 	// -----------------------------------------
 	// selection remember...
 	// -----------------------------------------
 	public:
-		bool        SelectHasSelection(     selectionType_te select);
-		void        Select(                 selectionType_te select, int32_t start, int32_t end);
-		void        Unselect(               selectionType_te select);
-		void        RectSelect(             selectionType_te select, int32_t start, int32_t end, int32_t rectStart, int32_t rectEnd);
-		bool        GetSelectionPos(        selectionType_te select, int32_t &start, int32_t &end, bool &isRect, int32_t &rectStart, int32_t &rectEnd);
-		void        GetSelectionText(       selectionType_te select, etk::VectorType<int8_t> &text);
-		void        GetSelectionText(       selectionType_te select, etk::UString &text);
-		void        RemoveSelected(         selectionType_te select);
-		int32_t     ReplaceSelected(        selectionType_te select, etk::VectorType<int8_t> &text);
-		int32_t     ReplaceSelected(        selectionType_te select, etk::UString &text);
+		bool        SelectHasSelection(void);
+		void        Select(            int32_t start, int32_t end);
+		void        Unselect(          void);
+		void        RectSelect(        int32_t start, int32_t end, int32_t rectStart, int32_t rectEnd);
+		bool        GetSelectionPos(   int32_t &start, int32_t &end, bool &isRect, int32_t &rectStart, int32_t &rectEnd);
+		void        GetSelectionText(  etk::Vector<int8_t> &text);
+		void        GetSelectionText(  etk::UString &text);
+		void        RemoveSelected(    void);
+		int32_t     ReplaceSelected(   etk::Vector<int8_t> &text);
+		int32_t     ReplaceSelected(   etk::UString &text);
 	private:
 		// current selection of the buffer
-		selection   m_selectionList[SELECTION_SIZE];    //!< Selection area of the buffer
-		void        UpdateSelection(        selectionType_te select, int32_t pos, int32_t nDeleted, int32_t nInserted);
-		void        UpdateSelections(       int32_t pos, int32_t nDeleted, int32_t nInserted);
+		selection   m_selectionList;   //!< Selection area of the buffer
+		void        UpdateSelection(   int32_t pos, int32_t nDeleted, int32_t nInserted);
 
 	// -----------------------------------------
 	// History section : 
@@ -154,15 +145,15 @@ class EdnBuf {
 	private:
 		bool                                    m_isUndoProcessing;
 		bool                                    m_isRedoProcessing;
-		etk::VectorType<EdnBufHistory*>         m_historyUndo;
-		etk::VectorType<EdnBufHistory*>         m_historyRedo;
+		etk::Vector<EdnBufHistory*>         m_historyUndo;
+		etk::Vector<EdnBufHistory*>         m_historyRedo;
 
 	// -----------------------------------------
 	// hightlight section : 
 	// -----------------------------------------
 	private:
 		Highlight *                             m_Highlight;         //!< internal link with the Highlight system
-		etk::VectorType<colorInformation_ts>    m_HLDataPass1;       //!< colorisation position in the current buffer pass 1
+		etk::Vector<colorInformation_ts>    m_HLDataPass1;       //!< colorisation position in the current buffer pass 1
 		void                                    RegenerateHighLightAt(int32_t pos, int32_t nbDeleted, int32_t nbAdded);
 		void                                    GenerateHighLightAt(int32_t pos, int32_t endPos, int32_t addinPos=0);
 		void                                    CleanHighLight(void);
@@ -206,10 +197,10 @@ class EdnBuf {
 		void    removeSelected(                 selection &sel);
 		void    replaceSelected(                selection &sel, const char *text);
 
-		void    eventModification(              int32_t pos, int32_t nInserted, etk::VectorType<int8_t> &deletedText);
+		void    eventModification(              int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText);
 
 
-		int32_t LocalInsert(                    int32_t pos, etk::VectorType<int8_t> &insertText);
+		int32_t LocalInsert(                    int32_t pos, etk::Vector<int8_t> &insertText);
 		int32_t LocalInsert(                    int32_t pos, etk::UString &insertText);
 		
 		bool    charMatch(                      char first, char second, bool caseSensitive = true);

Sources/appl/Buffer/EdnBuf/EdnBufHistory.cpp

@@ -39,7 +39,7 @@ EdnBufHistory::EdnBufHistory(void)
 	m_nInserted = 0;
 }
 
-EdnBufHistory::EdnBufHistory(int32_t pos, int32_t nInserted, etk::VectorType<int8_t> &deletedText)
+EdnBufHistory::EdnBufHistory(int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText)
 {
 	//APPL_INFO("EdnBufHistory new + data");
 	m_pos = pos;
@@ -47,7 +47,7 @@ EdnBufHistory::EdnBufHistory(int32_t pos, int32_t nInserted, etk::VectorType<int
 	m_deletedText = deletedText;
 }
 
-void EdnBufHistory::Set(int32_t pos, int32_t nInserted, etk::VectorType<int8_t> &deletedText)
+void EdnBufHistory::Set(int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText)
 {
 	//APPL_INFO("EdnBufHistory new + data");
 	m_pos = pos;
@@ -75,7 +75,7 @@ int32_t EdnBufHistory::getnbInserted(void)
 	return m_nInserted;
 }
 
-void EdnBufHistory::getData(etk::VectorType<int8_t> &deletedText)
+void EdnBufHistory::getData(etk::Vector<int8_t> &deletedText)
 {
 	deletedText = m_deletedText;
 }

Sources/appl/Buffer/EdnBuf/EdnBufHistory.h

@@ -27,22 +27,22 @@
 #define __EDN_BUFFER_HISTORY_H__
 
 
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
 
 class EdnBufHistory{
 	public:
 					 EdnBufHistory(void);
-					 EdnBufHistory(int32_t pos, int32_t nInserted, etk::VectorType<int8_t> &deletedText);
+					 EdnBufHistory(int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText);
 					~EdnBufHistory(void);
-		void		 Set(int32_t pos, int32_t nInserted, etk::VectorType<int8_t> &deletedText);
+		void		 Set(int32_t pos, int32_t nInserted, etk::Vector<int8_t> &deletedText);
 		int32_t		 getPos(void);
 		int32_t		 getnbDeleted(void);
 		int32_t		 getnbInserted(void);
-		void		 getData(etk::VectorType<int8_t> &deletedText);
+		void		 getData(etk::Vector<int8_t> &deletedText);
 	private:
 		int32_t m_pos;
 		int32_t m_nInserted;
-		etk::VectorType<int8_t> m_deletedText;
+		etk::Vector<int8_t> m_deletedText;
 };
 
 #endif

Sources/appl/Buffer/EdnBuf/EdnBuf_HighLight.cpp

@@ -367,4 +367,4 @@ colorInformation_ts * EdnBuf::GetElementColorAtPosition(displayHLData_ts & MData
 		}
 	}
 	return GetElementColorAtPosition(pos, MData.posHLPass1);
-}
+}

Sources/appl/Buffer/EdnBuf/EdnBuf_History.cpp

@@ -53,7 +53,7 @@ int32_t EdnBuf::Undo(void)
 	int32_t pos        = m_historyUndo[nbElement]->getPos();
 	int32_t nbDeleted  = m_historyUndo[nbElement]->getnbDeleted();
 	int32_t nbInserted = m_historyUndo[nbElement]->getnbInserted();
-	etk::VectorType<int8_t> deletedText;
+	etk::Vector<int8_t> deletedText;
 	m_historyUndo[nbElement]->getData(deletedText);
 	m_isUndoProcessing = true;
 	if (0 == nbInserted) {
@@ -101,7 +101,7 @@ int32_t EdnBuf::Redo(void)
 	int32_t pos        = m_historyRedo[nbElement]->getPos();
 	int32_t nbDeleted  = m_historyRedo[nbElement]->getnbDeleted();
 	int32_t nbInserted = m_historyRedo[nbElement]->getnbInserted();
-	etk::VectorType<int8_t> deletedText;
+	etk::Vector<int8_t> deletedText;
 	m_historyRedo[nbElement]->getData(deletedText);
 	m_isRedoProcessing = true;
 	if (0 == nbInserted) {

Sources/appl/Buffer/EdnBuf/EdnBuf_Selection.cpp

@@ -0,0 +1,310 @@
+/**
+ *******************************************************************************
+ * @file EdnBuf_Selection.cpp
+ * @brief Editeur De N'ours : Buffer for internal Data - section selection (Sources)
+ * @author Edouard DUPIN
+ * @date 23/03/2011
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+
+#include <appl/Debug.h>
+#include <appl/global.h>
+#include <EdnBuf.h>
+
+
+#undef __class__
+#define __class__	"EdnBuf{Selection}"
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+bool EdnBuf::SelectHasSelection(void)
+{
+	return m_selectionList.selected;
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+void EdnBuf::Select(int32_t start, int32_t end)
+{
+	//selection oldSelection = m_selectionList[select];
+	m_selectionList.selected = start != end;
+	m_selectionList.zeroWidth = (start == end) ? true : false;
+	m_selectionList.rectangular = false;
+	m_selectionList.start = etk_min(start, end);
+	m_selectionList.end = etk_max(start, end);
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+void EdnBuf::Unselect(void)
+{
+	//selection oldSelection = m_selectionList[select];
+	m_selectionList.selected = false;
+	m_selectionList.zeroWidth = false;
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * @param[in,out] ---
+ * @param[in,out] ---
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+void EdnBuf::RectSelect(int32_t start, int32_t end, int32_t rectStart, int32_t rectEnd)
+{
+	m_selectionList.selected = rectStart < rectEnd;
+	m_selectionList.zeroWidth = (rectStart == rectEnd) ? false : true;
+	m_selectionList.rectangular = true;
+	m_selectionList.start = start;
+	m_selectionList.end = end;
+	m_selectionList.rectStart = rectStart;
+	m_selectionList.rectEnd = rectEnd;
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+bool EdnBuf::GetSelectionPos(int32_t &start, int32_t &end, bool &isRect, int32_t &rectStart, int32_t &rectEnd)
+{
+	/* Always fill in the parameters (zero-width can be requested too). */
+	isRect = m_selectionList.rectangular;
+	start = m_selectionList.start;
+	end = m_selectionList.end;
+	if (m_selectionList.rectangular) {
+		rectStart = m_selectionList.rectStart;
+		rectEnd = m_selectionList.rectEnd;
+	}
+	return m_selectionList.selected;
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+void EdnBuf::GetSelectionText(etk::Vector<int8_t> &text)
+{
+	int32_t start, end, rectStart, rectEnd;
+	bool isRect;
+	// remove output data
+	text.Clear();
+	
+	bool isSelected = GetSelectionPos(start, end, isRect, rectStart, rectEnd);
+	
+	// No data selected ...
+	if (false == isSelected) {
+		return;
+	}
+	
+	// Rectangular selection
+	if (true == isRect) {
+		//GetTextInRect(start, end, rectStart, rectEnd, text);
+		// TODO : ...
+	} else {
+		GetRange(start, end, text);
+	}
+}
+void EdnBuf::GetSelectionText(etk::UString &text)
+{
+	int32_t start, end, rectStart, rectEnd;
+	bool isRect;
+	// remove output data
+	text = "";
+	
+	bool isSelected = GetSelectionPos(start, end, isRect, rectStart, rectEnd);
+	
+	// No data selected ...
+	if (false == isSelected) {
+		return;
+	}
+	
+	// Rectangular selection
+	if (true == isRect) {
+		//GetTextInRect(start, end, rectStart, rectEnd, text);
+		// TODO : ...
+	} else {
+		GetRange(start, end, text);
+	}
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+void EdnBuf::RemoveSelected(void)
+{
+	int32_t start, end;
+	int32_t rectStart, rectEnd;
+	bool isRect;
+	bool isSelected = GetSelectionPos(start, end, isRect, rectStart, rectEnd);
+	
+	// No data selected ...
+	if (false == isSelected) {
+		return;
+	}
+	// Rectangular selection
+	if (true == isRect) {
+		//RemoveRect(start, end, rectStart, rectEnd);
+		// TODO : ...
+	} else {
+		Remove(start, end);
+	}
+	Unselect();
+}
+
+
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+int32_t EdnBuf::ReplaceSelected(etk::Vector<int8_t> &text)
+{
+	int32_t start, end, rectStart, rectEnd;
+	bool isRect;
+	bool isSelected = GetSelectionPos(start, end, isRect, rectStart, rectEnd);
+	
+	// No data selected ...
+	if (false == isSelected) {
+		return 0;
+	}
+	int32_t returnSize = 0;
+	// Rectangular selection
+	if (true == isRect) {
+		//ReplaceRect(start, end, rectStart, rectEnd, text);
+		// TODO : ...
+	} else {
+		returnSize = Replace(start, end, text);
+	}
+	// Clean selection
+	m_selectionList.selected = false;
+	return returnSize;
+}
+int32_t EdnBuf::ReplaceSelected(etk::UString &text)
+{
+	int32_t start, end, rectStart, rectEnd;
+	bool isRect;
+	bool isSelected = GetSelectionPos(start, end, isRect, rectStart, rectEnd);
+	
+	// No data selected ...
+	if (false == isSelected) {
+		return 0;
+	}
+	int32_t returnSize = 0;
+	// Rectangular selection
+	if (true == isRect) {
+		//ReplaceRect(start, end, rectStart, rectEnd, text);
+		// TODO : ...
+	} else {
+		returnSize = Replace(start, end, text);
+	}
+	// Clean selection
+	m_selectionList.selected = false;
+	return returnSize;
+}
+
+
+/*
+** Update an individual selection for changes in the corresponding text
+*/
+/**
+ * @brief 
+ * 
+ * @param[in,out] ---
+ * 
+ * @return ---
+ * 
+ */
+void EdnBuf::UpdateSelection(int32_t pos, int32_t nDeleted, int32_t nInserted)
+{
+	if(		(		false == m_selectionList.selected
+				&&	false == m_selectionList.zeroWidth)
+		||	pos > m_selectionList.end )
+	{
+		return;
+	}
+	if (pos+nDeleted <= m_selectionList.start) {
+		m_selectionList.start += nInserted - nDeleted;
+		m_selectionList.end += nInserted - nDeleted;
+	} else if(		pos <= m_selectionList.start
+				&&	pos+nDeleted >= m_selectionList.end)
+	{
+		m_selectionList.start = pos;
+		m_selectionList.end = pos;
+		m_selectionList.selected = false;
+		m_selectionList.zeroWidth = false;
+	} else if(		pos <= m_selectionList.start
+				&&	pos+nDeleted < m_selectionList.end)
+	{
+		m_selectionList.start = pos;
+		m_selectionList.end = nInserted + m_selectionList.end - nDeleted;
+	} else if(pos < m_selectionList.end) {
+		m_selectionList.end += nInserted - nDeleted;
+		if (m_selectionList.end <= m_selectionList.start) {
+			m_selectionList.selected = false;
+		}
+	}
+}
+

Sources/appl/Buffer/EdnVectorBuf.cpp

@@ -225,7 +225,7 @@ int8_t& EdnVectorBuf::Get(int32_t pos)
  * @return ---
  * 
  */
-void EdnVectorBuf::Get(int32_t pos, int32_t nbElement, etk::VectorType<int8_t> &tmpBuffer)
+void EdnVectorBuf::Get(int32_t pos, int32_t nbElement, etk::Vector<int8_t> &tmpBuffer)
 {
 	tmpBuffer.Clear();
 	if (pos < m_gapStart) {
@@ -397,7 +397,7 @@ void EdnVectorBuf::Insert(int32_t pos, const int8_t& item)
  * @return ---
  * 
  */
-void EdnVectorBuf::Insert(int32_t pos, etk::VectorType<int8_t>& items)
+void EdnVectorBuf::Insert(int32_t pos, etk::Vector<int8_t>& items)
 {
 	if(		pos > Size()
 		||	pos < 0 ) {
@@ -453,7 +453,7 @@ void EdnVectorBuf::Replace(int32_t pos, const int8_t& item)
  * @return ---
  * 
  */
-void EdnVectorBuf::Replace(int32_t pos, int32_t nbRemoveElement, etk::VectorType<int8_t>& items)
+void EdnVectorBuf::Replace(int32_t pos, int32_t nbRemoveElement, etk::Vector<int8_t>& items)
 {
 	if(		pos > Size()
 		||	pos < 0 ) {
@@ -650,7 +650,7 @@ void TestEdnVectorBuf(void)
 	myBufferTmp.Display();
 	plop='m';
 	
-	etk::VectorType<int8_t> items;
+	etk::Vector<int8_t> items;
 	items.PushBack('i');
 	items.PushBack('j');
 	items.PushBack('k');

Sources/appl/Buffer/EdnVectorBuf.h

@@ -26,7 +26,7 @@
 #ifndef __EDN_VECTOR_BUF_H__
 #define __EDN_VECTOR_BUF_H__
 
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
 
 #undef __class__
 #define __class__	"EdnVectorBuf"
@@ -271,14 +271,14 @@ class EdnVectorBuf
 		EdnVectorBuf &					operator=(	const EdnVectorBuf & Evb);
 		int8_t							operator[] (int32_t pos);
 		int8_t &						Get(		int32_t pos);
-		void							Get(		int32_t pos, int32_t nbElement, etk::VectorType<int8_t> &tmpBuffer);
+		void							Get(		int32_t pos, int32_t nbElement, etk::Vector<int8_t> &tmpBuffer);
 		// insert functions
 		void							PushBack(	const int8_t& item);
 		void							Insert(		int32_t pos, const int8_t& item);
-		void							Insert(		int32_t pos, etk::VectorType<int8_t>& items);
+		void							Insert(		int32_t pos, etk::Vector<int8_t>& items);
 		// Remove and insert functions
 		void							Replace(	int32_t pos, const int8_t& item);
-		void							Replace(	int32_t pos, int32_t nbRemoveElement, etk::VectorType<int8_t>& items);
+		void							Replace(	int32_t pos, int32_t nbRemoveElement, etk::Vector<int8_t>& items);
 		// Revove fonctions
 		void							Remove(		int32_t pos, int32_t nbRemoveElement = 1);
 		void							PopBack(	void);

Sources/appl/Colorize/Colorize.cpp

@@ -35,8 +35,8 @@
 Colorize::Colorize(	etk::UString &newColorName)
 {
 
-	m_colorFG = etk::color::color_Black;
-	m_colorBG = etk::color::color_Black;
+	m_colorFG = etk::color::black;
+	m_colorBG = etk::color::black;
 	
 	italic	= false;
 	bold	= false;
@@ -50,8 +50,8 @@ Colorize::Colorize(void)
 {
 	ColorName = "no_name";
 	
-	m_colorFG = etk::color::color_Black;
-	m_colorBG = etk::color::color_Black;
+	m_colorFG = etk::color::black;
+	m_colorBG = etk::color::black;
 	
 	italic	= false;
 	bold	= false;
@@ -89,14 +89,14 @@ etk::UString Colorize::GetName(void)
 void Colorize::SetFgColor(const char *myColor)
 {
 	haveFG = true;
-	m_colorFG = etk::color::Parse(myColor);
+	m_colorFG = myColor;
 	APPL_VERBOSE(myColor << " ==> "<< m_colorFG );
 }
 
 void Colorize::SetBgColor(const char *myColor)
 {
 	haveBG = true;
-	m_colorBG = etk::color::Parse(myColor);
+	m_colorBG = myColor;
 	APPL_VERBOSE(myColor << " ==> "<< m_colorBG );
 }
 

Sources/appl/Colorize/Colorize.h

@@ -40,8 +40,8 @@ class Colorize {
 		void SetFgColor(const char *myColor);
 		void SetBgColor(const char *myColor);
 		
-		color_ts & GetFG(void) { return m_colorFG; };
-		color_ts & GetBG(void) { return m_colorBG; };
+		etk::Color & GetFG(void) { return m_colorFG; };
+		etk::Color & GetBG(void) { return m_colorBG; };
 
 		bool HaveBg(void);
 		
@@ -54,8 +54,8 @@ class Colorize {
 
 	private:
 		etk::UString ColorName;						//!< curent color Name
-		color_ts m_colorFG;
-		color_ts m_colorBG;
+		etk::Color m_colorFG;
+		etk::Color m_colorBG;
 		
 		bool italic;
 		bool bold;

Sources/appl/Colorize/ColorizeManager.cpp

@@ -31,38 +31,12 @@
 
 #define PFX	"ColorizeManager "
 
-
-//!< EObject name :
-extern const char * const TYPE_EOBJECT_EDN_COLORIZE_MANAGER = "ColorizeManager";
-
 class classColorManager: public ewol::EObject
 {
 	public:
 		// Constructeur
 		classColorManager(void);
 		~classColorManager(void);
-		/**
-		 * @brief Check if the object has the specific type.
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type of the object we want to check
-		 * @return true if the object is compatible, otherwise false
-		 */
-		bool CheckObjectType(const char * const objectType)
-		{
-			if (NULL == objectType) {
-				EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_COLORIZE_MANAGER << "\" != NULL(pointer) ");
-				return false;
-			}
-			if (objectType == TYPE_EOBJECT_EDN_COLORIZE_MANAGER) {
-				return true;
-			} else {
-				if(true == ewol::EObject::CheckObjectType(objectType)) {
-					return true;
-				}
-				EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_COLORIZE_MANAGER << "\" != \"" << objectType << "\"");
-				return false;
-			}
-		}
 		
 		/**
 		 * @brief Get the current Object type of the EObject
@@ -72,7 +46,7 @@ class classColorManager: public ewol::EObject
 		 */
 		const char * const GetObjectType(void)
 		{
-			return TYPE_EOBJECT_EDN_COLORIZE_MANAGER;
+			return "ApplColorManager";
 		}
 		/**
 		 * @brief Receive a message from an other EObject with a specific eventId and data
@@ -87,20 +61,18 @@ class classColorManager: public ewol::EObject
 		void        LoadFile(const char * xmlFilename);
 		Colorize *  Get(const char *colorName);
 		Colorize *  Get(etk::UString &colorName);
-		color_ts &  Get(basicColor_te myColor);
+		etk::Color& Get(basicColor_te myColor);
 		bool        Exist(etk::UString &colorName);
 		bool        Exist(const char *colorName);
 		void        DisplayListOfColor(void);
 
 	private:
-		etk::UString                 m_fileColor;
-		etk::VectorType<Colorize*>  listMyColor;		//!< List of ALL Color
+		etk::UString                m_fileColor;
+		etk::Vector<Colorize*>  listMyColor;		//!< List of ALL Color
 		Colorize *                  errorColor;
-		color_ts                    basicColors[COLOR_NUMBER_MAX];
+		etk::Color                  basicColors[COLOR_NUMBER_MAX];
 };
 
-#define EDN_CAST_COLORIZE_MANAGER(curentPointer) EWOL_CAST(TYPE_EOBJECT_EDN_COLORIZE_MANAGER,classColorManager,curentPointer)
-
 
 classColorManager::classColorManager(void)
 {
@@ -144,7 +116,7 @@ void classColorManager::OnReceiveMessage(ewol::EObject * CallerObject, const cha
 void classColorManager::LoadFile(etk::UString &xmlFilename)
 {
 	// TODO : Remove this
-	LoadFile(xmlFilename.Utf8Data());
+	LoadFile(xmlFilename.c_str());
 }
 
 // TODO : Remove this ...
@@ -253,7 +225,7 @@ void classColorManager::LoadFile(const char * xmlFilename)
 						}
 						const char *color = pGuiNode->ToElement()->Attribute("val");
 						if (NULL != color) {
-							basicColors[id] = etk::color::Parse(color);
+							basicColors[id] = color;
 						}
 					} else {
 						APPL_ERROR("(l "<<pGuiNode->Row()<<") node not suported : \""<<pGuiNode->Value()<<"\" must be [color]");
@@ -341,10 +313,10 @@ Colorize *classColorManager::Get(const char *colorName)
 Colorize *classColorManager::Get(etk::UString &colorName)
 {
 	// TODO : Remove this
-	return Get(colorName.Utf8Data());
+	return Get(colorName.c_str());
 }
 
-color_ts & classColorManager::Get(basicColor_te myColor)
+etk::Color & classColorManager::Get(basicColor_te myColor)
 {
 	if (myColor < COLOR_NUMBER_MAX) {
 		return basicColors[myColor];
@@ -370,7 +342,7 @@ bool classColorManager::Exist(const char *colorName)
 bool classColorManager::Exist(etk::UString &colorName)
 {
 	// TODO : Remove this
-	return Exist(colorName.Utf8Data());
+	return Exist(colorName.c_str());
 }
 
 void classColorManager::DisplayListOfColor(void)
@@ -408,7 +380,7 @@ void ColorizeManager::UnInit(void)
 		EWOL_ERROR("ColorizeManager ==> request UnInit, but does not exist ...");
 		return;
 	}
-	ewol::EObjectManager::MarkToRemoved(localManager);
+	delete(localManager);
 	localManager = NULL;
 }
 
@@ -445,9 +417,9 @@ Colorize* ColorizeManager::Get(etk::UString &colorName)
 	return localManager->Get(colorName);
 }
 
-color_ts errorColor;
+etk::Color errorColor;
 
-color_ts& ColorizeManager::Get(basicColor_te myColor)
+etk::Color& ColorizeManager::Get(basicColor_te myColor)
 {
 	if (NULL == localManager) {
 		return errorColor;

Sources/appl/Colorize/ColorizeManager.h

@@ -57,7 +57,7 @@ namespace ColorizeManager
 	void        LoadFile(const char * xmlFilename);
 	Colorize *  Get(const char *colorName);
 	Colorize *  Get(etk::UString &colorName);
-	color_ts &  Get(basicColor_te myColor);
+	etk::Color& Get(basicColor_te myColor);
 	bool        Exist(etk::UString &colorName);
 	bool        Exist(const char *colorName);
 	void        DisplayListOfColor(void);

Sources/appl/Debug.h

@@ -0,0 +1,44 @@
+/**
+ *******************************************************************************
+ * @file Debug.h
+ * @brief Application log implementation
+ * @author Edouard DUPIN
+ * @date 10/04/2012
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+ 
+#ifndef __DEBUG_H__
+#define __DEBUG_H__
+
+#include <etk/Types.h>
+#include <etk/Debug.h>
+
+extern const char * applLog;
+
+#define APPL_CRITICAL(data)			ETK_CRITICAL(applLog, data)
+#define APPL_WARNING(data)			ETK_WARNING(applLog, data)
+#define APPL_ERROR(data)			ETK_ERROR(applLog, data)
+#define APPL_INFO(data)				ETK_INFO(applLog, data)
+#define APPL_DEBUG(data)			ETK_DEBUG(applLog, data)
+#define APPL_VERBOSE(data)			ETK_VERBOSE(applLog, data)
+#define APPL_ASSERT(cond, data)		ETK_ASSERT(applLog, cond, data)
+#define APPL_CHECK_INOUT(cond)		ETK_CHECK_INOUT(applLog, cond)
+#define APPL_TODO(cond)				ETK_TODO(applLog, cond)
+
+#endif

Sources/appl/Gui/BufferView.cpp

@@ -35,8 +35,6 @@
 #define __class__	"BufferView"
 
 
-extern const char * const TYPE_EOBJECT_EDN_BUFFER_VIEW = "BufferView";
-
 BufferView::BufferView(void)
 {
 	SetCanHaveFocus(true);
@@ -52,39 +50,6 @@ BufferView::~BufferView(void)
 
 }
 
-/**
- * @brief Check if the object has the specific type.
- * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
- * @param[in] objectType type of the object we want to check
- * @return true if the object is compatible, otherwise false
- */
-bool BufferView::CheckObjectType(const char * const objectType)
-{
-	if (NULL == objectType) {
-		EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_BUFFER_VIEW << "\" != NULL(pointer) ");
-		return false;
-	}
-	if (objectType == TYPE_EOBJECT_EDN_BUFFER_VIEW) {
-		return true;
-	} else {
-		if(true == ewol::List::CheckObjectType(objectType)) {
-			return true;
-		}
-		EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_BUFFER_VIEW << "\" != \"" << objectType << "\"");
-		return false;
-	}
-}
-
-/**
- * @brief Get the current Object type of the EObject
- * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
- * @param[in] objectType type description
- * @return true if the object is compatible, otherwise false
- */
-const char * const BufferView::GetObjectType(void)
-{
-	return TYPE_EOBJECT_EDN_BUFFER_VIEW;
-}
 
 /**
  * @brief Receive a message from an other EObject with a specific eventId and data
@@ -97,17 +62,17 @@ void BufferView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve
 {
 	ewol::List::OnReceiveMessage(CallerObject, eventId, data);
 	if (eventId == ednMsgBufferListChange) {
-		MarkToReedraw();
+		MarkToRedraw();
 	}else if (eventId == ednMsgBufferId) {
 		m_selectedIdRequested = BufferManager::GetSelected();
-		MarkToReedraw();
+		MarkToRedraw();
 	}else if (eventId == ednMsgBufferState) {
-		MarkToReedraw();
+		MarkToRedraw();
 	}
 }
 
 
-color_ts BufferView::GetBasicBG(void)
+etk::Color BufferView::GetBasicBG(void)
 {
 	return ColorizeManager::Get(COLOR_LIST_BG_1);
 }
@@ -117,7 +82,7 @@ uint32_t BufferView::GetNuberOfColomn(void)
 	return 1;
 }
 
-bool BufferView::GetTitle(int32_t colomn, etk::UString &myTitle, color_ts &fg, color_ts &bg)
+bool BufferView::GetTitle(int32_t colomn, etk::UString &myTitle, etk::Color &fg, etk::Color &bg)
 {
 	myTitle = "Buffers : ";
 	return true;
@@ -128,7 +93,7 @@ uint32_t BufferView::GetNuberOfRaw(void)
 	return BufferManager::SizeOpen();
 }
 
-bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, color_ts &fg, color_ts &bg)
+bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, etk::Color &fg, etk::Color &bg)
 {
 	etk::File name;
 	bool isModify;
@@ -186,7 +151,7 @@ bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToW
 	return true;
 }
 
-bool BufferView::OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent,  int32_t colomn, int32_t raw, etkFloat_t x, etkFloat_t y)
+bool BufferView::OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent,  int32_t colomn, int32_t raw, float x, float y)
 {
 	if (1 == IdInput && typeEvent == ewol::EVENT_INPUT_TYPE_SINGLE) {
 		APPL_INFO("Event on List : IdInput=" << IdInput << " colomn=" << colomn << " raw=" << raw );
@@ -196,7 +161,7 @@ bool BufferView::OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent,
 			SendMultiCast(ednMsgBufferId, selectBuf);
 		}
 	}
-	MarkToReedraw();
+	MarkToRedraw();
 	return false;
 }
 

Sources/appl/Gui/BufferView.h

@@ -31,29 +31,19 @@
 #include <appl/globalMsg.h>
 #include <ewol/widget/List.h>
 
-//!< EObject name :
-extern const char * const TYPE_EOBJECT_EDN_BUFFER_VIEW;
-
 class BufferView : public ewol::List
 {
 	public:
 		// Constructeur
 		BufferView(void);
 		~BufferView(void);
-		/**
-		 * @brief Check if the object has the specific type.
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type of the object we want to check
-		 * @return true if the object is compatible, otherwise false
-		 */
-		bool CheckObjectType(const char * const objectType);
 		/**
 		 * @brief Get the current Object type of the EObject
 		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
 		 * @param[in] objectType type description
 		 * @return true if the object is compatible, otherwise false
 		 */
-		const char * const GetObjectType(void);
+		const char * const GetObjectType(void) { return "ApplBufferView"; };
 		/**
 		 * @brief Receive a message from an other EObject with a specific eventId and data
 		 * @param[in] CallerObject Pointer on the EObject that information came from
@@ -64,18 +54,17 @@ class BufferView : public ewol::List
 		virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data);
 	protected:
 		// function call to display the list :
-		virtual color_ts GetBasicBG(void);
+		virtual etk::Color GetBasicBG(void);
 		virtual uint32_t GetNuberOfColomn(void);
-		virtual bool GetTitle(int32_t colomn, etk::UString &myTitle, color_ts &fg, color_ts &bg);
+		virtual bool GetTitle(int32_t colomn, etk::UString &myTitle, etk::Color &fg, etk::Color &bg);
 		virtual uint32_t GetNuberOfRaw(void);
-		virtual bool GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, color_ts &fg, color_ts &bg);
-		virtual bool OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent,  int32_t colomn, int32_t raw, etkFloat_t x, etkFloat_t y);
+		virtual bool GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, etk::Color &fg, etk::Color &bg);
+		virtual bool OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent,  int32_t colomn, int32_t raw, float x, float y);
 	private:
 		int32_t               m_selectedIdRequested;
 		int32_t               m_selectedID;
 };
 
-#define EDN_CAST_BUFFER_VIEW(curentPointer) EWOL_CAST(TYPE_EOBJECT_EDN_BUFFER_VIEW,BufferView,curentPointer)
 
 #endif
 

Sources/appl/Gui/CodeView.cpp

@@ -42,8 +42,6 @@
 #define __class__	"CodeView"
 
 
-extern const char * const TYPE_EOBJECT_EDN_CODE_VIEW = "CodeView";
-
 CodeView::CodeView(void)
 {
 	m_label = "CodeView is disable ...";
@@ -58,10 +56,10 @@ CodeView::CodeView(void)
 	
 	m_lineNumberList.Clear();
 	
-	m_textColorFg = etk::color::color_Black;
+	m_textColorFg = etk::color::black;
 	
-	m_textColorBg = etk::color::color_Black;
-	m_textColorBg.alpha = 0.25;
+	m_textColorBg = etk::color::black;
+	m_textColorBg.alpha = 0x40;
 	SetCanHaveFocus(true);
 	RegisterMultiCast(ednMsgBufferId);
 	RegisterMultiCast(ednMsgGuiCopy);
@@ -72,6 +70,9 @@ CodeView::CodeView(void)
 	RegisterMultiCast(ednMsgGuiRm);
 	RegisterMultiCast(ednMsgGuiSelect);
 	RegisterMultiCast(ednMsgGuiChangeCharset);
+	RegisterMultiCast(ednMsgGuiFind);
+	RegisterMultiCast(ednMsgGuiReplace);
+	SetLimitScrolling(0.2);
 }
 
 CodeView::~CodeView(void)
@@ -87,7 +88,7 @@ CodeView::~CodeView(void)
  */
 void CodeView::UpdateNumberOfLineReference(int32_t bufferID)
 {
-	coord2D_ts tmpCoord;
+	Vector2D<float>  tmpCoord;
 	tmpCoord.x = 0;
 	tmpCoord.y = 0;
 	if (m_lineNumberList.Size()<=bufferID) {
@@ -100,41 +101,6 @@ void CodeView::UpdateNumberOfLineReference(int32_t bufferID)
 }
 
 
-/**
- * @brief Check if the object has the specific type.
- * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
- * @param[in] objectType type of the object we want to check
- * @return true if the object is compatible, otherwise false
- */
-bool CodeView::CheckObjectType(const char * const objectType)
-{
-	if (NULL == objectType) {
-		APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_CODE_VIEW << "\" != NULL(pointer) ");
-		return false;
-	}
-	if (objectType == TYPE_EOBJECT_EDN_CODE_VIEW) {
-		return true;
-	} else {
-		if(true == ewol::WidgetScrooled::CheckObjectType(objectType)) {
-			return true;
-		}
-		APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_CODE_VIEW << "\" != \"" << objectType << "\"");
-		return false;
-	}
-}
-
-/**
- * @brief Get the current Object type of the EObject
- * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
- * @param[in] objectType type description
- * @return true if the object is compatible, otherwise false
- */
-const char * const CodeView::GetObjectType(void)
-{
-	return TYPE_EOBJECT_EDN_CODE_VIEW;
-}
-
-
 bool CodeView::CalculateMinSize(void)
 {
 	m_minSize.x = 50;
@@ -150,59 +116,59 @@ void CodeView::CalculateMaxSize(void)
 }
 
 
-void CodeView::OnDraw(void)
+void CodeView::OnDraw(ewol::DrawProperty& displayProp)
 {
-	m_OObjectsColored[      m_currentDrawId].Draw();
-	m_OObjectTextNormal[    m_currentDrawId].Draw();
-	m_OObjectTextBold[      m_currentDrawId].Draw();
-	m_OObjectTextItalic[    m_currentDrawId].Draw();
-	m_OObjectTextBoldItalic[m_currentDrawId].Draw();
+	m_OObjectsColored.Draw();
+	m_OObjectTextNormal.Draw();
+	m_OObjectTextBold.Draw();
+	m_OObjectTextItalic.Draw();
+	m_OObjectTextBoldItalic.Draw();
+	WidgetScrooled::OnDraw(displayProp);
 }
 
 void CodeView::OnRegenerateDisplay(void)
 {
 	if (true == NeedRedraw()) {
-		int64_t startTime = GetCurrentTime();
+		int64_t startTime = ewol::GetTime();
 		
 		// For the scrooling windows
 		CalculateMaxSize();
 		
 		// clean internal elements ...
-		m_OObjectTextNormal[    m_currentCreateId].SetFontID(m_fontNormal);
-		m_OObjectTextBold[      m_currentCreateId].SetFontID(m_fontBold);
-		m_OObjectTextItalic[    m_currentCreateId].SetFontID(m_fontItalic);
-		m_OObjectTextBoldItalic[m_currentCreateId].SetFontID(m_fontBoldItalic);
+		m_OObjectTextNormal.SetFontID(m_fontNormal);
+		m_OObjectTextBold.SetFontID(m_fontBold);
+		m_OObjectTextItalic.SetFontID(m_fontItalic);
+		m_OObjectTextBoldItalic.SetFontID(m_fontBoldItalic);
 		
-		m_OObjectTextNormal[    m_currentCreateId].Clear();
-		m_OObjectTextBold[      m_currentCreateId].Clear();
-		m_OObjectTextItalic[    m_currentCreateId].Clear();
-		m_OObjectTextBoldItalic[m_currentCreateId].Clear();
-		m_OObjectsColored[      m_currentCreateId].Clear();
+		m_OObjectTextNormal.Clear();
+		m_OObjectTextBold.Clear();
+		m_OObjectTextItalic.Clear();
+		m_OObjectTextBoldItalic.Clear();
+		m_OObjectsColored.Clear();
 		
 		
 		if(true == BufferManager::Get(m_bufferID)->NeedToUpdateDisplayPosition() ) {
-			coord2D_ts borderWidth = BufferManager::Get(m_bufferID)->GetBorderSize();
+			Vector2D<float>  borderWidth = BufferManager::Get(m_bufferID)->GetBorderSize();
 			bool centerRequested = false;
-			coord2D_ts currentPosition = BufferManager::Get(m_bufferID)->GetPosition(m_OObjectTextNormal[m_currentCreateId].GetFontID(), centerRequested);
+			Vector2D<float>  currentPosition = BufferManager::Get(m_bufferID)->GetPosition(m_OObjectTextNormal.GetFontID(), centerRequested);
 			SetScrollingPositionDynamic(borderWidth, currentPosition, centerRequested);
 		} // else : nothing to do ...
 		
 		// generate the objects :
-		BufferManager::Get(m_bufferID)->Display(m_OObjectTextNormal[m_currentCreateId],
-		                                        m_OObjectTextBold[m_currentCreateId],
-		                                        m_OObjectTextItalic[m_currentCreateId],
-		                                        m_OObjectTextBoldItalic[m_currentCreateId],
-		                                        m_OObjectsColored[m_currentCreateId],
+		BufferManager::Get(m_bufferID)->Display(m_OObjectTextNormal,
+		                                        m_OObjectTextBold,
+		                                        m_OObjectTextItalic,
+		                                        m_OObjectTextBoldItalic,
+		                                        m_OObjectsColored,
 		                                        m_originScrooled.x, m_originScrooled.y, m_size.x, m_size.y);
 		// set the current size of the windows
 		SetMaxSize(BufferManager::Get(m_bufferID)->GetMaxSize());
 		
-		int64_t stopTime = GetCurrentTime();
+		int64_t stopTime = ewol::GetTime();
 		APPL_DEBUG("Display Code Generation = " << stopTime - startTime << " micro-s");
 		
 		// call the herited class...
 		WidgetScrooled::OnRegenerateDisplay();
-		m_needFlipFlop = true;
 	}
 }
 
@@ -212,7 +178,7 @@ bool CodeView::OnEventKb(ewol::eventKbType_te typeEvent, uniChar_t unicodeData)
 	//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
 	if (typeEvent == ewol::EVENT_KB_TYPE_DOWN) {
 		BufferManager::Get(m_bufferID)->AddChar(unicodeData);
-		MarkToReedraw();
+		MarkToRedraw();
 	}
 	return true;
 }
@@ -222,7 +188,7 @@ bool CodeView::OnEventKbMove(ewol::eventKbType_te typeEvent, ewol::eventKbMoveTy
 {
 	if (typeEvent == ewol::EVENT_KB_TYPE_DOWN) {
 		BufferManager::Get(m_bufferID)->cursorMove(moveTypeEvent);
-		MarkToReedraw();
+		MarkToRedraw();
 	}
 	return true;
 }
@@ -230,21 +196,25 @@ bool CodeView::OnEventKbMove(ewol::eventKbType_te typeEvent, ewol::eventKbMoveTy
 
 /**
  * @brief Event on an input of this Widget
+ * @param[in] type Type of the input (ewol::INPUT_TYPE_MOUSE/ewol::INPUT_TYPE_FINGER ...)
  * @param[in] IdInput Id of the current Input (PC : left=1, right=2, middle=3, none=0 / Tactil : first finger=1 , second=2 (only on this widget, no knowledge at ouside finger))
  * @param[in] typeEvent ewol type of event like EVENT_INPUT_TYPE_DOWN/EVENT_INPUT_TYPE_MOVE/EVENT_INPUT_TYPE_UP/EVENT_INPUT_TYPE_SINGLE/EVENT_INPUT_TYPE_DOUBLE/...
  * @param[in] pos Absolute position of the event
  * @return true the event is used
  * @return false the event is not used
  */
-bool CodeView::OnEventInput(int32_t IdInput, ewol::eventInputType_te typeEvent, coord2D_ts pos)
+bool CodeView::OnEventInput(ewol::inputType_te type, int32_t IdInput, ewol::eventInputType_te typeEvent, Vector2D<float>  pos)
 {
-	coord2D_ts relativePos = RelativePosition(pos);
+	Vector2D<float>  relativePos = RelativePosition(pos);
+	// corection for the openGl abstraction
+	relativePos.y = m_size.y - relativePos.y;
+	
 	if (m_bufferID < 0) {
 		return false;
 	}
-	if (true == WidgetScrooled::OnEventInput(IdInput, typeEvent, pos)) {
+	if (true == WidgetScrooled::OnEventInput(type, IdInput, typeEvent, pos)) {
 		ewol::widgetManager::FocusKeep(this);
-		// nothing to do ... done on upper widet ...
+		// nothing to do ... done on upper widget ...
 		return true;
 	}
 	if (1 == IdInput) {
@@ -253,27 +223,27 @@ bool CodeView::OnEventInput(int32_t IdInput, ewol::eventInputType_te typeEvent,
 				m_buttunOneSelected = true;
 				ewol::widgetManager::FocusKeep(this);
 				BufferManager::Get(m_bufferID)->MouseEvent(m_fontNormal, relativePos.x+m_originScrooled.x, relativePos.y+m_originScrooled.y);
-				MarkToReedraw();
+				MarkToRedraw();
 			} else if (ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
 				m_buttunOneSelected = false;
 				BufferManager::Get(m_bufferID)->Copy(ewol::clipBoard::CLIPBOARD_SELECTION);
-				MarkToReedraw();
+				MarkToRedraw();
 			} else 
 		#endif
 		if (ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent) {
 			#ifdef __MODE__Touch
 				ewol::widgetManager::FocusKeep(this);
 				BufferManager::Get(m_bufferID)->MouseEvent(m_fontNormal, relativePos.x+m_originScrooled.x, relativePos.y+m_originScrooled.y);
-				MarkToReedraw();
+				MarkToRedraw();
 			#else
 				// nothing to do ...
 			#endif
 		} else if (ewol::EVENT_INPUT_TYPE_DOUBLE == typeEvent) {
 			BufferManager::Get(m_bufferID)->MouseEventDouble();
-			MarkToReedraw();
+			MarkToRedraw();
 		} else if (ewol::EVENT_INPUT_TYPE_TRIPLE == typeEvent) {
 			BufferManager::Get(m_bufferID)->MouseEventTriple();
-			MarkToReedraw();
+			MarkToRedraw();
 		} else if (ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
 			if (true == m_buttunOneSelected) {
 				int xxx, yyy;
@@ -287,14 +257,14 @@ bool CodeView::OnEventInput(int32_t IdInput, ewol::eventInputType_te typeEvent,
 				}
 				//APPL_INFO("mouse-motion BT1 %d, %d", xxx, yyy);
 				BufferManager::Get(m_bufferID)->MouseSelectFromCursorTo(m_fontNormal, xxx+m_originScrooled.x, yyy+m_originScrooled.y);
-				MarkToReedraw();
+				MarkToRedraw();
 			}
 		}
 	} else if (2 == IdInput) {
 		if (ewol::EVENT_INPUT_TYPE_SINGLE == typeEvent) {
 			BufferManager::Get(m_bufferID)->MouseEvent(m_fontNormal, relativePos.x+m_originScrooled.x, relativePos.y+m_originScrooled.y);
 			BufferManager::Get(m_bufferID)->Paste(ewol::clipBoard::CLIPBOARD_SELECTION);
-			MarkToReedraw();
+			MarkToRedraw();
 			ewol::widgetManager::FocusKeep(this);
 		}
 	}
@@ -322,7 +292,7 @@ void CodeView::OnReceiveMessage(ewol::EObject * CallerObject, const char * event
 			m_lineNumberList[m_bufferID] = m_originScrooled;
 		}
 		int32_t bufferID = 0;
-		sscanf(data.Utf8Data(), "%d", &bufferID);
+		sscanf(data.c_str(), "%d", &bufferID);
 		APPL_INFO("Select a new Buffer ... " << bufferID);
 		// set the new buffer ID
 		m_bufferID = bufferID;
@@ -374,33 +344,26 @@ void CodeView::OnReceiveMessage(ewol::EObject * CallerObject, const char * event
 		} else {
 			APPL_ERROR(" on event " << eventId << " unknow data=\"" << data << "\"" );
 		}
+	} else if (eventId == ednMsgGuiFind) {
+		etk::UString myDataString;
+		SearchData::GetSearch(myDataString);
+		if (data == "Next") {
+			BufferManager::Get(m_bufferID)->Search(myDataString, false, SearchData::GetCase(), SearchData::GetWrap(), SearchData::GetRegExp() );
+		} else if (data == "Previous") {
+			BufferManager::Get(m_bufferID)->Search(myDataString, true, SearchData::GetCase(), SearchData::GetWrap(), SearchData::GetRegExp() );
+		}
+	} else if (eventId == ednMsgGuiReplace) {
+		etk::UString myDataString;
+		SearchData::GetReplace(myDataString);
+		if (data == "Normal") {
+			BufferManager::Get(m_bufferID)->Replace(myDataString);
+		} else if (data == "All") {
+			
+		}
 	}
 	/*
 	switch (id)
 	{
-		case APPL_MSG__CURRENT_FIND_PREVIOUS:
-			{
-				etk::UString myDataString;
-				SearchData::GetSearch(myDataString);
-				BufferManager::Get(m_bufferID)->Search(myDataString, true, SearchData::GetCase(), SearchData::GetWrap(), SearchData::GetRegExp() );
-			}
-			break;
-		case APPL_MSG__CURRENT_FIND_NEXT:
-			{
-				etk::UString myDataString;
-				SearchData::GetSearch(myDataString);
-				BufferManager::Get(m_bufferID)->Search(myDataString, false, SearchData::GetCase(), SearchData::GetWrap(), SearchData::GetRegExp() );
-			}
-			break;
-		case APPL_MSG__CURRENT_REPLACE:
-			{
-				etk::UString myDataString;
-				SearchData::GetReplace(myDataString);
-				BufferManager::Get(m_bufferID)->Replace(myDataString);
-			}
-			break;
-		case APPL_MSG__CURRENT_REPLACE_ALL:
-			break;
 		case APPL_MSG__CURRENT_GOTO_LINE:
 			if (dataID<0) {
 				dataID = 0;
@@ -413,7 +376,7 @@ void CodeView::OnReceiveMessage(ewol::EObject * CallerObject, const char * event
 	}
 	*/
 	// Force redraw of the widget
-	MarkToReedraw();
+	MarkToRedraw();
 }
 
 

Sources/appl/Gui/CodeView.h

@@ -34,43 +34,33 @@
 #include <etk/Types.h>
 #include <ewol/widget/WidgetScrolled.h>
 
-//!< EObject name :
-extern const char * const TYPE_EOBJECT_EDN_CODE_VIEW;
-
 class CodeView :public ewol::WidgetScrooled
 {
 	public:
 		         CodeView(void);
 		virtual ~CodeView(void);
-		/**
-		 * @brief Check if the object has the specific type.
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type of the object we want to check
-		 * @return true if the object is compatible, otherwise false
-		 */
-		bool CheckObjectType(const char * const objectType);
 		/**
 		 * @brief Get the current Object type of the EObject
 		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
 		 * @param[in] objectType type description
 		 * @return true if the object is compatible, otherwise false
 		 */
-		const char * const GetObjectType(void);
+		const char * const GetObjectType(void) { return "ApplCodeView"; };
 		virtual bool   CalculateMinSize(void);
 	private:
 		etk::UString                 m_label;
-		color_ts                     m_textColorFg;  //!< Text color
-		color_ts                     m_textColorBg;  //!< Background color
+		etk::Color                   m_textColorFg;  //!< Text color
+		etk::Color                   m_textColorBg;  //!< Background color
 		int32_t                      m_bufferID;
 		bool                         m_buttunOneSelected;
-		etk::VectorType<coord2D_ts>  m_lineNumberList;
+		etk::Vector<Vector2D<float> >  m_lineNumberList;
 		void                         UpdateNumberOfLineReference(int32_t bufferID);
 		// drawing elements :
-		ewol::OObject2DTextColored   m_OObjectTextNormal[NB_BOUBLE_BUFFER];
-		ewol::OObject2DTextColored   m_OObjectTextBold[NB_BOUBLE_BUFFER];
-		ewol::OObject2DTextColored   m_OObjectTextItalic[NB_BOUBLE_BUFFER];
-		ewol::OObject2DTextColored   m_OObjectTextBoldItalic[NB_BOUBLE_BUFFER];
-		ewol::OObject2DColored       m_OObjectsColored[NB_BOUBLE_BUFFER];
+		ewol::OObject2DTextColored   m_OObjectTextNormal;
+		ewol::OObject2DTextColored   m_OObjectTextBold;
+		ewol::OObject2DTextColored   m_OObjectTextItalic;
+		ewol::OObject2DTextColored   m_OObjectTextBoldItalic;
+		ewol::OObject2DColored       m_OObjectsColored;
 		
 	public:
 		virtual void   OnRegenerateDisplay(void);
@@ -85,13 +75,14 @@ class CodeView :public ewol::WidgetScrooled
 	public:
 		/**
 		 * @brief Event on an input of this Widget
+		 * @param[in] type Type of the input (ewol::INPUT_TYPE_MOUSE/ewol::INPUT_TYPE_FINGER ...)
 		 * @param[in] IdInput Id of the current Input (PC : left=1, right=2, middle=3, none=0 / Tactil : first finger=1 , second=2 (only on this widget, no knowledge at ouside finger))
 		 * @param[in] typeEvent ewol type of event like EVENT_INPUT_TYPE_DOWN/EVENT_INPUT_TYPE_MOVE/EVENT_INPUT_TYPE_UP/EVENT_INPUT_TYPE_SINGLE/EVENT_INPUT_TYPE_DOUBLE/...
 		 * @param[in] pos Absolute position of the event
 		 * @return true the event is used
 		 * @return false the event is not used
 		 */
-		virtual bool OnEventInput(int32_t IdInput, ewol::eventInputType_te typeEvent, coord2D_ts pos);
+		virtual bool OnEventInput(ewol::inputType_te type, int32_t IdInput, ewol::eventInputType_te typeEvent, Vector2D<float>  pos);
 		virtual bool OnEventKb(ewol::eventKbType_te typeEvent, uniChar_t unicodeData);
 		virtual bool OnEventKbMove(ewol::eventKbType_te typeEvent, ewol::eventKbMoveType_te moveTypeEvent);
 		
@@ -112,10 +103,8 @@ class CodeView :public ewol::WidgetScrooled
 	private:
 		void CalculateMaxSize(void);
 	protected:
-		virtual void OnDraw(void);
+		virtual void OnDraw(ewol::DrawProperty& displayProp);
 };
 
-#define EDN_CAST_CODE_VIEW(curentPointer) EWOL_CAST(TYPE_EOBJECT_EDN_CODE_VIEW,CodeView,curentPointer)
-
 #endif
 

Sources/appl/Gui/MainWindows.cpp

@@ -28,6 +28,7 @@
 #include <MainWindows.h>
 #include <CodeView.h>
 #include <BufferView.h>
+#include <Search.h>
 
 #include <ewol/widget/Button.h>
 #include <ewol/widget/CheckBox.h>
@@ -41,18 +42,85 @@
 #include <ewol/widget/Spacer.h>
 #include <ewol/widget/Menu.h>
 #include <ewol/widgetMeta/FileChooser.h>
+#include <ewol/widgetMeta/Parameter.h>
 #include <ewol/WidgetManager.h>
 #include <ewol/EObject.h>
 
+
+
+
+#undef __class__
+#define __class__	"AboutGui"
+
+#include <ewol/widget/Label.h>
+#include <ewol/widget/Spacer.h>
+
+class ParameterAboutGui : public ewol::SizerVert
+{
+	public :
+		ParameterAboutGui(void)
+		{
+			ewol::Spacer* mySpacer = NULL;
+			
+			mySpacer = new ewol::Spacer();
+			if (NULL == mySpacer) {
+				APPL_ERROR("Can not allocate widget ==> display might be in error");
+			} else {
+				mySpacer->SetExpendX(true);
+				mySpacer->SetExpendY(true);
+				SubWidgetAdd(mySpacer);
+			}
+			AddElement("        libPng");
+			AddElement("        ogg-tremor");
+			AddElement("        portaudio");
+			AddElement("        libZip");
+			AddElement("        tinyXml");
+			AddElement("        freetype");
+			AddElement("        agg2.4");
+			AddElement("        etk (BSD)");
+			AddElement("    ewol is based on");
+			AddElement("    Website : https://github.com/HeeroYui/ewol");
+			AddElement("    Licence : BSD like");
+			AddElement("    Copyright 2010 Edouard DUPIN, all right reserved");
+			AddElement("    Supported OS : Linux, Android" );
+			AddElement(etk::UString("    OpenGl librairy : v") + ewol::GetVersion() );
+			AddElement("Ewol", true);
+			AddElement("");
+			AddElement("    Website : https://github.com/HeeroYui/edn");
+			AddElement("    Licence : GPL");
+			AddElement("    Copyright 2010 Edouard DUPIN, all right reserved");
+			AddElement(etk::UString("    Build Time : ") + etk::UString(BUILD_TIME));
+			AddElement("    Source Code Editor");
+			AddElement(etk::UString("    Editeur De N'ours : v") + etk::UString(APPL_VERSION_TAG_NAME));
+			AddElement("Edn", true);
+			
+		};
+		
+		~ParameterAboutGui(void) { };
+		
+		void AddElement(etk::UString label, bool bold=false, bool italic=false)
+		{
+			ewol::Label* myLabel = new ewol::Label(label);
+			if (NULL == myLabel) {
+				APPL_ERROR("Can not allocate widget ==> display might be in error");
+			} else {
+				myLabel->SetExpendX(true);
+				SubWidgetAdd(myLabel);
+			}
+		};
+		
+};
+
+
+
 #undef __class__
 #define __class__	"MainWindows"
 
-extern const char * const TYPE_EOBJECT_EDN_MAIN_WINDOWS = "MainWindows";
-
 MainWindows::MainWindows(void)
 {
 	APPL_DEBUG("CREATE WINDOWS ... ");
 	ewol::SizerVert * mySizerVert = NULL;
+	ewol::SizerVert * mySizerVert2 = NULL;
 	ewol::SizerHori * mySizerHori = NULL;
 	//ewol::Button * myButton = NULL;
 	CodeView * myCodeView = NULL;
@@ -62,6 +130,35 @@ MainWindows::MainWindows(void)
 	mySizerVert = new ewol::SizerVert();
 	SetSubWidget(mySizerVert);
 	
+		mySizerHori = new ewol::SizerHori();
+		mySizerVert->SubWidgetAdd(mySizerHori);
+			myBufferView = new BufferView();
+			myBufferView->SetExpendX(false);
+			myBufferView->SetExpendY(true);
+			myBufferView->SetFillX(true);
+			myBufferView->SetFillY(true);
+			mySizerHori->SubWidgetAdd(myBufferView);
+			
+			mySizerVert2 = new ewol::SizerVert();
+			mySizerHori->SubWidgetAdd(mySizerVert2);
+				
+				// main buffer Area :
+				myCodeView = new CodeView();
+				myCodeView->SetExpendX(true);
+				myCodeView->SetExpendY(true);
+				myCodeView->SetFillX(true);
+				myCodeView->SetFillY(true);
+				myCodeView->SetFontSize(11);
+				myCodeView->SetFontNameNormal(    "freefont/FreeMono.ttf");
+				myCodeView->SetFontNameBold(      "freefont/FreeMonoBold.ttf");
+				myCodeView->SetFontNameItalic(    "freefont/FreeMonoOblique.ttf");
+				myCodeView->SetFontNameBoldItalic("freefont/FreeMonoBoldOblique.ttf");
+				mySizerVert2->SubWidgetAdd(myCodeView);
+				
+				// search area : 
+				Search * mySearch = new Search();
+				mySizerVert2->SubWidgetAdd(mySearch);
+			
 		mySizerHori = new ewol::SizerHori();
 		mySizerVert->SubWidgetAdd(mySizerHori);
 			
@@ -77,6 +174,8 @@ MainWindows::MainWindows(void)
 				(void)myMenu->Add(idMenuFile, "Save As ...",  "", ednMsgGuiSaveAs);
 				(void)myMenu->AddSpacer();
 				//(void)myMenu->Add(idMenuFile, "Exit", "", ednMsgGuiExit);
+				(void)myMenu->AddSpacer();
+				(void)myMenu->Add(idMenuFile, "Properties",   "icon/Parameter.svg", ednMsgProperties);
 			int32_t idMenuEdit = myMenu->AddTitle("Edit");
 				(void)myMenu->Add(idMenuEdit, "Undo",         "icon/Undo.svg", ednMsgGuiUndo);
 				(void)myMenu->Add(idMenuEdit, "Redo",         "icon/Redo.svg", ednMsgGuiRedo);
@@ -109,45 +208,16 @@ MainWindows::MainWindows(void)
 				(void)myMenu->AddSpacer();
 				(void)myMenu->Add(idMenugDisplay, "Color Black",          "", ednMsgGuiChangeColor, "Black");
 				(void)myMenu->Add(idMenugDisplay, "Color White",          "", ednMsgGuiChangeColor, "White");
-			(void)myMenu->AddTitle("?", "", ednMsgGuiAbout);
 			
 			m_widgetLabelFileName = new ewol::Label("FileName");
 			m_widgetLabelFileName->SetExpendX(true);
 			m_widgetLabelFileName->SetFillY(true);
 			mySizerHori->SubWidgetAdd(m_widgetLabelFileName);
 		
-		mySizerHori = new ewol::SizerHori();
-		mySizerVert->SubWidgetAdd(mySizerHori);
-			myBufferView = new BufferView();
-			myBufferView->SetExpendX(false);
-			myBufferView->SetExpendY(true);
-			myBufferView->SetFillX(true);
-			myBufferView->SetFillY(true);
-			mySizerHori->SubWidgetAdd(myBufferView);
-			myCodeView = new CodeView();
-			myCodeView->SetExpendX(true);
-			myCodeView->SetExpendY(true);
-			myCodeView->SetFillX(true);
-			myCodeView->SetFillY(true);
-			
-			myCodeView->SetFontSize(11);
-			myCodeView->SetFontNameNormal(    "freefont/FreeMono.ttf");
-			myCodeView->SetFontNameBold(      "freefont/FreeMonoBold.ttf");
-			myCodeView->SetFontNameItalic(    "freefont/FreeMonoOblique.ttf");
-			myCodeView->SetFontNameBoldItalic("freefont/FreeMonoBoldOblique.ttf");
-			/*
-			myCodeView->SetFontSize(11);
-			myCodeView->SetFontNameNormal(    "ubuntu/UbuntuMono-R.ttf");
-			myCodeView->SetFontNameBold(      "ubuntu/UbuntuMono-B.ttf");
-			myCodeView->SetFontNameItalic(    "ubuntu/UbuntuMono-RI.ttf");
-			myCodeView->SetFontNameBoldItalic("ubuntu/UbuntuMono-BI.ttf");
-			*/
-			mySizerHori->SubWidgetAdd(myCodeView);
-			
 	// Generic event ...
 	RegisterMultiCast(ednMsgGuiSaveAs);
+	RegisterMultiCast(ednMsgProperties);
 	RegisterMultiCast(ednMsgGuiOpen);
-	RegisterMultiCast(ednMsgGuiAbout);
 	// to update the title ... 
 	RegisterMultiCast(ednMsgBufferState);
 	RegisterMultiCast(ednMsgBufferId);
@@ -159,40 +229,6 @@ MainWindows::~MainWindows(void)
 	
 }
 
-/**
- * @brief Check if the object has the specific type.
- * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
- * @param[in] objectType type of the object we want to check
- * @return true if the object is compatible, otherwise false
- */
-bool MainWindows::CheckObjectType(const char * const objectType)
-{
-	if (NULL == objectType) {
-		APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_MAIN_WINDOWS << "\" != NULL(pointer) ");
-		return false;
-	}
-	if (objectType == TYPE_EOBJECT_EDN_MAIN_WINDOWS) {
-		return true;
-	} else {
-		if(true == ewol::Windows::CheckObjectType(objectType)) {
-			return true;
-		}
-		APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_MAIN_WINDOWS << "\" != \"" << objectType << "\"");
-		return false;
-	}
-}
-
-/**
- * @brief Get the current Object type of the EObject
- * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
- * @param[in] objectType type description
- * @return true if the object is compatible, otherwise false
- */
-const char * const MainWindows::GetObjectType(void)
-{
-	return TYPE_EOBJECT_EDN_MAIN_WINDOWS;
-}
-
 
 const char *const ednEventPopUpFileSelected = "edn-mainWindows-openSelected";
 const char *const ednEventPopUpFileSaveAs   = "edn-mainWindows-saveAsSelected";
@@ -225,14 +261,8 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
 		PopUpWidgetPush(tmpWidget);
 		tmpWidget->RegisterOnEvent(this, ewolEventFileChooserValidate, ednEventPopUpFileSelected);
 	} else if (eventId == ednEventPopUpFileSelected) {
-		// get widget:
-		ewol::FileChooser * tmpWidget = EWOL_CAST_WIDGET_FILE_CHOOSER(CallerObject);
-		if (NULL == tmpWidget) {
-			APPL_ERROR("impossible to get pop_upWidget " << CallerObject);
-			return;
-		}
 		// get the filename : 
-		etk::UString tmpData = tmpWidget->GetCompleateFileName();
+		etk::UString tmpData = data;
 		APPL_DEBUG("Request opening the file : " << tmpData);
 		SendMultiCast(ednMsgOpenFile, tmpData);
 	} else if (eventId == ednMsgGuiSaveAs) {
@@ -243,7 +273,7 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
 			if (data == "current") {
 				m_currentSavingAsIdBuffer = BufferManager::GetSelected();
 			} else {
-				sscanf(data.Utf8Data(), "%d", &m_currentSavingAsIdBuffer);
+				sscanf(data.c_str(), "%d", &m_currentSavingAsIdBuffer);
 			}
 			
 			if (false == BufferManager::Exist(m_currentSavingAsIdBuffer)) {
@@ -251,30 +281,28 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
 			} else {
 				Buffer * myBuffer = BufferManager::Get(m_currentSavingAsIdBuffer);
 				ewol::FileChooser* tmpWidget = new ewol::FileChooser();
-				tmpWidget->SetTitle("Save Files As...");
-				tmpWidget->SetValidateLabel("Save");
-				etk::UString folder = "/home/";
-				etk::UString fileName = "";
-				if (true == myBuffer->HaveName()) {
-					etk::File tmpName = myBuffer->GetFileName();
-					folder = tmpName.GetFolder();
-					fileName = tmpName.GetShortFilename();
+				if (NULL == tmpWidget) {
+					APPL_ERROR("Can not allocate widget ==> display might be in error");
+				} else {
+					tmpWidget->SetTitle("Save Files As...");
+					tmpWidget->SetValidateLabel("Save");
+					etk::UString folder = "/home/";
+					etk::UString fileName = "";
+					if (true == myBuffer->HaveName()) {
+						etk::File tmpName = myBuffer->GetFileName();
+						folder = tmpName.GetFolder();
+						fileName = tmpName.GetShortFilename();
+					}
+					tmpWidget->SetFolder(folder);
+					tmpWidget->SetFileName(fileName);
+					PopUpWidgetPush(tmpWidget);
+					tmpWidget->RegisterOnEvent(this, ewolEventFileChooserValidate, ednEventPopUpFileSaveAs);
 				}
-				tmpWidget->SetFolder(folder);
-				tmpWidget->SetFileName(fileName);
-				PopUpWidgetPush(tmpWidget);
-				tmpWidget->RegisterOnEvent(this, ewolEventFileChooserValidate, ednEventPopUpFileSaveAs);
 			}
 		}
 	} else if (eventId == ednEventPopUpFileSaveAs) {
-		// get widget:
-		ewol::FileChooser * tmpWidget = EWOL_CAST_WIDGET_FILE_CHOOSER(CallerObject);
-		if (NULL == tmpWidget) {
-			APPL_ERROR("impossible to get pop_upWidget " << CallerObject);
-			return;
-		}
 		// get the filename : 
-		etk::UString tmpData = tmpWidget->GetCompleateFileName();
+		etk::UString tmpData = data;
 		APPL_DEBUG("Request Saving As file : " << tmpData);
 		
 		BufferManager::Get(m_currentSavingAsIdBuffer)->SetFileName(tmpData);
@@ -304,38 +332,41 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
 		}
 		return;
 		// TODO : Set the Title ....
-	} else if (eventId == ednMsgGuiAbout) {
-	/*
-		//Title 
-			"Edn"
-		// version
-			VERSION_TAG_NAME
-		// comments:
-			"Editeur De N'ours\n"
-			"L'Editeur Desoxyribo-Nucleique.\n"
-			"Source Code Editor\n"
-			"Build Time : " VERSION_BUILD_TIME;
-		// copyright
-			"Copyright 2010 Edouard DUPIN, all right reserved";
-		// licence
-			"This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY\n\n"
-			"You can:\n"
-			"    * Redistribute the sources code and binaries.\n"
-			"    * Modify the Sources code.\n"
-			"    * Use a part of the sources (less than 50%) in an other software, just write somewhere \"Edn is great\" visible by the user (on your product or on your website with a link to my page).\n"
-			"    * Redistribute the modification only if you want.\n"
-			"    * Send me the bug-fix (it could be great).\n"
-			"    * Pay me a beer or some other things.\n"
-			"    * Print the source code on WC paper ...\n\n"
-			"You can NOT:\n"
-			"    * Earn money with this Software (But I can).\n"
-			"    * Add malware in the Sources.\n"
-			"    * Do something bad with the sources.\n"
-			"    * Use it to travel in the space with a toaster.\n\n"
-			"I reserve the right to change this licence. If it change the version of the copy you have keep its own license."
-		*/
+	} else if (eventId == ednMsgProperties) {
+		// Request the parameter GUI
+		ewol::Parameter* tmpWidget = new ewol::Parameter();
+		if (NULL == tmpWidget) {
+			APPL_ERROR("Can not allocate widget ==> display might be in error");
+		} else {
+			tmpWidget->SetTitle("Properties");
+			PopUpWidgetPush(tmpWidget);
+			tmpWidget->MenuAddGroup("Editor");
+			ewol::Widget* tmpSubWidget = new globals::ParameterGlobalsGui();
+			tmpWidget->MenuAdd("Editor",          "", tmpSubWidget);
+			tmpWidget->MenuAdd("Polices & Color", "", NULL);
+			tmpWidget->MenuAdd("Highlight",       "", NULL);
+			tmpWidget->MenuAddGroup("Genral");
+			tmpWidget->MenuAdd("Affichage",       "", NULL);
+			tmpSubWidget = new ParameterAboutGui();
+			tmpWidget->MenuAdd("About",           "", tmpSubWidget);
+		}
 	}
 	
+	
 	return;
 }
 
+
+/**
+* @brief Inform object that an other object is removed ...
+* @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject
+* @note : Sub classes must call this class
+* @return ---
+*/
+void MainWindows::OnObjectRemove(ewol::EObject * removeObject)
+{
+	ewol::Windows::OnObjectRemove(removeObject);
+	if (m_widgetLabelFileName == removeObject) {
+		m_widgetLabelFileName = NULL;
+	}
+}

Sources/appl/Gui/MainWindows.h

@@ -33,8 +33,6 @@
 #include <BufferManager.h>
 #include <ewol/widget/Label.h>
 
-extern const char * const TYPE_EOBJECT_EDN_MAIN_WINDOWS;
-
 class MainWindows : public ewol::Windows
 {
 	private:
@@ -44,20 +42,13 @@ class MainWindows : public ewol::Windows
 		// Constructeur
 		MainWindows(void);
 		~MainWindows(void);
-		/**
-		 * @brief Check if the object has the specific type.
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type of the object we want to check
-		 * @return true if the object is compatible, otherwise false
-		 */
-		bool CheckObjectType(const char * const objectType);
 		/**
 		 * @brief Get the current Object type of the EObject
 		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
 		 * @param[in] objectType type description
 		 * @return true if the object is compatible, otherwise false
 		 */
-		const char * const GetObjectType(void);
+		const char * const GetObjectType(void) { return "MainWindows"; };
 		/**
 		 * @brief Receive a message from an other EObject with a specific eventId and data
 		 * @param[in] CallerObject Pointer on the EObject that information came from
@@ -66,6 +57,13 @@ class MainWindows : public ewol::Windows
 		 * @return ---
 		 */
 		virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data);
+		/**
+		 * @brief Inform object that an other object is removed ...
+		 * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject
+		 * @note : Sub classes must call this class
+		 * @return ---
+		 */
+		virtual void OnObjectRemove(ewol::EObject * removeObject);
 };
 
 #define EDN_CAST_MAIN_WINDOWS(curentPointer) EWOL_CAST(TYPE_EOBJECT_EDN_MAIN_WINDOWS,MainWindows,curentPointer)

Sources/appl/Gui/Search.cpp

@@ -0,0 +1,253 @@
+/**
+ *******************************************************************************
+ * @file Search.cpp
+ * @brief Editeur De N'ours : Search system
+ * @author Edouard DUPIN
+ * @date 03/01/2011
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+
+
+#include "appl/global.h"
+#include "Search.h"
+#include "SearchData.h"
+#include "BufferManager.h"
+#include "MainWindows.h"
+#include "appl/globalMsg.h"
+
+#include <ewol/widget/ButtonImage.h>
+
+
+#undef __class__
+#define __class__	"Search"
+
+const char* const l_eventSearchEntry        = "appl-search-entry";
+const char* const l_eventSearchEntryEnter   = "appl-search-entry-enter";
+const char* const l_eventReplaceEntry       = "appl-replace-entry";
+const char* const l_eventReplaceEntryEnter  = "appl-replace-entry-enter";
+const char* const l_eventSearchBt      = "appl-search-button";
+const char* const l_eventReplaceBt     = "appl-replace-button";
+const char* const l_eventCaseCb        = "appl-case-sensitive-CheckBox";
+const char* const l_eventWrapCb        = "appl-wrap-CheckBox";
+const char* const l_eventForwardCb     = "appl-forward-CheckBox";
+const char* const l_eventHideBt        = "appl-hide-button";
+
+Search::Search(void) :
+	m_searchEntry(NULL),
+	m_replaceEntry(NULL)
+{
+	m_forward = false;
+	
+	ewol::ButtonImage * myButtonImage = NULL;
+	
+	myButtonImage = new ewol::ButtonImage("icon/Remove.svg");
+	if (NULL == myButtonImage) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		myButtonImage->SetMinSize(32,32);
+		myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventHideBt);
+		SubWidgetAdd(myButtonImage);
+	}
+	
+	m_searchEntry = new ewol::Entry();
+	if (NULL == m_searchEntry) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		m_searchEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventSearchEntry);
+		m_searchEntry->RegisterOnEvent(this, ewolEventEntryEnter,  l_eventSearchEntryEnter);
+		m_searchEntry->SetExpendX(true);
+		m_searchEntry->SetFillX(true);
+		SubWidgetAdd(m_searchEntry);
+	}
+	
+	myButtonImage = new ewol::ButtonImage("icon/Search.svg");
+	if (NULL == myButtonImage) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		myButtonImage->SetMinSize(32,32);
+		myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventSearchBt);
+		SubWidgetAdd(myButtonImage);
+	}
+	
+	m_replaceEntry = new ewol::Entry();
+	if (NULL == m_replaceEntry) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		m_replaceEntry->RegisterOnEvent(this, ewolEventEntryModify, l_eventReplaceEntry);
+		m_replaceEntry->RegisterOnEvent(this, ewolEventEntryEnter, l_eventReplaceEntryEnter);
+		m_replaceEntry->SetExpendX(true);
+		m_replaceEntry->SetFillX(true);
+		SubWidgetAdd(m_replaceEntry);
+	}
+	
+	myButtonImage = new ewol::ButtonImage("icon/Replace.svg");
+	if (NULL == myButtonImage) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		myButtonImage->SetMinSize(32,32);
+		myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventReplaceBt);
+		SubWidgetAdd(myButtonImage);
+	}
+	
+	myButtonImage = new ewol::ButtonImage("icon/CaseSensitive.svg");
+	if (NULL == myButtonImage) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		myButtonImage->SetImageSelected("icon/CaseSensitive.svg", 0xFFFFFF5F);
+		myButtonImage->SetMinSize(32,32);
+		myButtonImage->SetToggleMode(true);
+		myButtonImage->SetValue(SearchData::GetCase());
+		myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventCaseCb);
+		SubWidgetAdd(myButtonImage);
+	}
+	
+	myButtonImage = new ewol::ButtonImage("icon/WrapAround.svg");
+	if (NULL == myButtonImage) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		myButtonImage->SetImageSelected("icon/WrapAround.svg", 0xFFFFFF5F);
+		myButtonImage->SetMinSize(32,32);
+		myButtonImage->SetToggleMode(true);
+		myButtonImage->SetValue(SearchData::GetWrap());
+		myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventWrapCb);
+		SubWidgetAdd(myButtonImage);
+	}
+	
+	myButtonImage = new ewol::ButtonImage("icon/Up.svg");
+	if (NULL == myButtonImage) {
+		APPL_ERROR("Widget allocation error ==> it will missing in the display");
+	} else {
+		myButtonImage->SetImageSelected("icon/Down.svg");
+		myButtonImage->SetMinSize(32,32);
+		myButtonImage->SetToggleMode(true);
+		myButtonImage->SetValue(m_forward);
+		myButtonImage->RegisterOnEvent(this, ewolEventButtonPressed, l_eventForwardCb);
+		SubWidgetAdd(myButtonImage);
+	}
+	
+	RegisterMultiCast(ednMsgGuiSearch);
+	// basicly hiden ...
+	Hide();
+}
+
+Search::~Search(void)
+{
+	
+}
+
+
+/**
+ * @brief Receive a message from an other EObject with a specific eventId and data
+ * @param[in] CallerObject Pointer on the EObject that information came from
+ * @param[in] eventId Message registered by this class
+ * @param[in] data Data registered by this class
+ * @return ---
+ */
+void Search::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data)
+{
+	ewol::SizerHori::OnReceiveMessage(CallerObject, eventId, data);
+	//APPL_INFO("Search receive message : \"" << eventId << "\" data=\"" << data << "\"");
+	if ( eventId == l_eventSearchEntry) {
+		SearchData::SetSearch(data);
+	} else if ( eventId == l_eventSearchEntryEnter) {
+		SearchData::SetSearch(data);
+		if (true==m_forward) {
+			SendMultiCast(ednMsgGuiFind, "Previous");
+		} else {
+			SendMultiCast(ednMsgGuiFind, "Next");
+		}
+	} else if ( eventId == l_eventReplaceEntry) {
+		SearchData::SetReplace(data);
+	} else if ( eventId == l_eventReplaceEntryEnter) {
+		SearchData::SetReplace(data);
+		SendMultiCast(ednMsgGuiReplace, "Normal");
+		if (true==m_forward) {
+			SendMultiCast(ednMsgGuiFind, "Previous");
+		} else {
+			SendMultiCast(ednMsgGuiFind, "Next");
+		}
+	} else if ( eventId == l_eventSearchBt) {
+		if (true==m_forward) {
+			SendMultiCast(ednMsgGuiFind, "Previous");
+		} else {
+			SendMultiCast(ednMsgGuiFind, "Next");
+		}
+	} else if ( eventId == l_eventReplaceBt) {
+		SendMultiCast(ednMsgGuiReplace, "Normal");
+		if (true==m_forward) {
+			SendMultiCast(ednMsgGuiFind, "Previous");
+		} else {
+			SendMultiCast(ednMsgGuiFind, "Next");
+		}
+	} else if ( eventId == l_eventCaseCb) {
+		if (data == "true") {
+			SearchData::SetCase(true);
+		} else {
+			SearchData::SetCase(false);
+		}
+	} else if ( eventId == l_eventWrapCb) {
+		if (data == "true") {
+			SearchData::SetWrap(true);
+		} else {
+			SearchData::SetWrap(false);
+		}
+	} else if ( eventId == l_eventForwardCb) {
+		if (data == "true") {
+			m_forward = true;
+		} else {
+			m_forward = false;
+		}
+	} else if ( eventId == l_eventHideBt) {
+		Hide();
+	} else if ( eventId == ednMsgGuiSearch) {
+		if (true == IsHide()) {
+			Show();
+			if (m_searchEntry!= NULL) {
+				m_searchEntry->KeepFocus();
+			}
+		} else {
+			if(    (m_searchEntry!=NULL  && true==m_searchEntry->GetFocus())
+			    || (m_replaceEntry!=NULL && true==m_replaceEntry->GetFocus()) ) {
+				Hide();
+			} else if (m_searchEntry!= NULL) {
+				m_searchEntry->KeepFocus();
+			} else {
+				Hide();
+			}
+		}
+	}
+}
+
+/**
+ * @brief Inform object that an other object is removed ...
+ * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject
+ * @note : Sub classes must call this class
+ * @return ---
+ */
+void Search::OnObjectRemove(ewol::EObject * removeObject)
+{
+	ewol::SizerHori::OnObjectRemove(removeObject);
+	if (removeObject == m_searchEntry) {
+		m_searchEntry = NULL;
+	}
+	if (removeObject == m_replaceEntry) {
+		m_replaceEntry = NULL;
+	}
+}
+

Sources/appl/Gui/Search.h

@@ -0,0 +1,69 @@
+/**
+ *******************************************************************************
+ * @file Search.h
+ * @brief Editeur De N'ours : Search system (header)
+ * @author Edouard DUPIN
+ * @date 03/01/2011
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+ 
+#ifndef __SEARCH_H__
+#define __SEARCH_H__
+
+#include <appl/Debug.h>
+#include <ewol/widget/SizerHori.h>
+#include <ewol/widget/Entry.h>
+
+class Search : public ewol::SizerHori
+{
+	public:
+		// Constructeur
+		Search(void);
+		~Search(void);
+		/**
+		 * @brief Get the current Object type of the EObject
+		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
+		 * @param[in] objectType type description
+		 * @return true if the object is compatible, otherwise false
+		 */
+		const char * const GetObjectType(void) { return "ApplSearch"; };
+		/**
+		 * @brief Receive a message from an other EObject with a specific eventId and data
+		 * @param[in] CallerObject Pointer on the EObject that information came from
+		 * @param[in] eventId Message registered by this class
+		 * @param[in] data Data registered by this class
+		 * @return ---
+		 */
+		virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data);
+		/**
+		 * @brief Inform object that an other object is removed ...
+		 * @param[in] removeObject Pointer on the EObject remeved ==> the user must remove all reference on this EObject
+		 * @note : Sub classes must call this class
+		 * @return ---
+		 */
+		virtual void OnObjectRemove(ewol::EObject * removeObject);
+	private:
+		bool    m_forward;
+		ewol::Entry * m_searchEntry;
+		ewol::Entry * m_replaceEntry;
+};
+
+#endif
+
+

Sources/appl/Highlight/Highlight.cpp

@@ -33,7 +33,7 @@
 #define __class__	"Highlight"
 
 
-void Highlight::ParseRules(TiXmlNode *child, etk::VectorType<HighlightPattern*> &mListPatern, int32_t level)
+void Highlight::ParseRules(TiXmlNode *child, etk::Vector<HighlightPattern*> &mListPatern, int32_t level)
 {
 	// Create the patern ...
 	HighlightPattern *myPattern = new HighlightPattern();
@@ -236,7 +236,7 @@ void Highlight::Display(void)
 // TODO : Celui qui appelle suprime des element pour rien ... Enfin c'est pas trègrave... Il suffirait juste de suprimer celuis d'avant si il n'est pas terminer...
 void Highlight::Parse(int32_t start,
                       int32_t stop,
-                      etk::VectorType<colorInformation_ts> &metaData,
+                      etk::Vector<colorInformation_ts> &metaData,
                       int32_t addingPos,
                       EdnVectorBuf &buffer)
 {
@@ -300,7 +300,7 @@ void Highlight::Parse(int32_t start,
  */
 void Highlight::Parse2(int32_t start,
                        int32_t stop,
-                       etk::VectorType<colorInformation_ts> &metaData,
+                       etk::Vector<colorInformation_ts> &metaData,
                        EdnVectorBuf &buffer)
 {
 	//APPL_DEBUG("Parse element 0 => " << m_listHighlightPass2.size() << " ==> position search: (" << start << "," << stop << ")" );

Sources/appl/Highlight/Highlight.h

@@ -59,19 +59,19 @@ class Highlight {
 		void ReloadColor(void);
 		void Parse(int32_t start,
 		           int32_t stop,
-		           etk::VectorType<colorInformation_ts> &metaData,
+		           etk::Vector<colorInformation_ts> &metaData,
 		           int32_t addingPos,
 		           EdnVectorBuf &buffer);
 		void Parse2(int32_t start,
 		            int32_t stop,
-		            etk::VectorType<colorInformation_ts> &metaData,
+		            etk::Vector<colorInformation_ts> &metaData,
 		            EdnVectorBuf &buffer);
 	private:
-		void                                ParseRules(TiXmlNode *child, etk::VectorType<HighlightPattern*> &mListPatern, int32_t level);
+		void                                ParseRules(TiXmlNode *child, etk::Vector<HighlightPattern*> &mListPatern, int32_t level);
 		etk::UString                        m_styleName;               //!< curent style name (like "c++" or "c" or "script Bash")
-		etk::VectorType<etk::UString*>      m_listExtentions;          //!< List of possible extention for this high-light, like : ".c", ".cpp", ".h"
-		etk::VectorType<HighlightPattern*>  m_listHighlightPass1;      //!< List of ALL hightlight modules (pass 1 ==> when we load and wride data on the buffer)
-		etk::VectorType<HighlightPattern*>  m_listHighlightPass2;      //!< List of ALL hightlight modules (pass 2 ==> When we display the buffer( only the display area (100 lines)) )
+		etk::Vector<etk::UString*>      m_listExtentions;          //!< List of possible extention for this high-light, like : ".c", ".cpp", ".h"
+		etk::Vector<HighlightPattern*>  m_listHighlightPass1;      //!< List of ALL hightlight modules (pass 1 ==> when we load and wride data on the buffer)
+		etk::Vector<HighlightPattern*>  m_listHighlightPass2;      //!< List of ALL hightlight modules (pass 2 ==> When we display the buffer( only the display area (100 lines)) )
 };
 
 

Sources/appl/Highlight/HighlightManager.cpp

@@ -32,14 +32,10 @@
 #undef __class__
 #define __class__	"HighlightManager"
 
-
-//!< EObject name :
-extern const char * const TYPE_EOBJECT_EDN_HIGHLIGHT_MANAGER = "HighlightManager";
-
 class localClassHighlightManager: public ewol::EObject
 {
 	private:
-		etk::VectorType<Highlight*> listHighlight;		//!< List of ALL hightlight modules
+		etk::Vector<Highlight*> listHighlight;		//!< List of ALL hightlight modules
 	public:
 		// Constructeur
 		localClassHighlightManager(void) {
@@ -58,29 +54,6 @@ class localClassHighlightManager: public ewol::EObject
 			listHighlight.Clear();
 		};
 		
-		/**
-		 * @brief Check if the object has the specific type.
-		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
-		 * @param[in] objectType type of the object we want to check
-		 * @return true if the object is compatible, otherwise false
-		 */
-		bool CheckObjectType(const char * const objectType)
-		{
-			if (NULL == objectType) {
-				APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_HIGHLIGHT_MANAGER << "\" != NULL(pointer) ");
-				return false;
-			}
-			if (objectType == TYPE_EOBJECT_EDN_HIGHLIGHT_MANAGER) {
-				return true;
-			} else {
-				if(true == ewol::EObject::CheckObjectType(objectType)) {
-					return true;
-				}
-				APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_HIGHLIGHT_MANAGER << "\" != \"" << objectType << "\"");
-				return false;
-			}
-		}
-		
 		/**
 		 * @brief Get the current Object type of the EObject
 		 * @note In Embended platforme, it is many time no -rtti flag, then it is not possible to use dynamic cast ==> this will replace it
@@ -89,7 +62,7 @@ class localClassHighlightManager: public ewol::EObject
 		 */
 		const char * const GetObjectType(void)
 		{
-			return TYPE_EOBJECT_EDN_HIGHLIGHT_MANAGER;
+			return "ApplHighlightManager";
 		}
 		
 		/**
@@ -174,6 +147,14 @@ class localClassHighlightManager: public ewol::EObject
 			myHightline = new Highlight(xmlFilename);
 			listHighlight.PushBack(myHightline);
 			
+			xmlFilename = "lang_lua.xml";
+			myHightline = new Highlight(xmlFilename);
+			listHighlight.PushBack(myHightline);
+			
+			xmlFilename = "lang_in.xml";
+			myHightline = new Highlight(xmlFilename);
+			listHighlight.PushBack(myHightline);
+			
 			//myHightline->Display();
 		}
 
@@ -204,7 +185,7 @@ void HighlightManager::UnInit(void)
 		APPL_ERROR("HighlightManager ==> request UnInit, but does not exist ...");
 		return;
 	}
-	ewol::EObjectManager::MarkToRemoved(localManager);
+	delete(localManager);
 	localManager = NULL;
 }
 

Sources/appl/Highlight/HighlightPattern.h

@@ -33,7 +33,7 @@ class HighlightPattern;
 
 #include <etk/RegExp.h>
 #include <Colorize.h>
-#include <etk/VectorType.h>
+#include <etk/Vector.h>
 #include <tinyXML/tinyxml.h>
 #include <EdnVectorBuf.h>
 
@@ -81,8 +81,8 @@ class HighlightPattern {
 		bool                                m_haveStopPatern;           //!< Stop patern presence
 		bool                                m_multiline;                //!< The patern is multiline
 		uniChar_t                           m_escapeChar;               //!< Escape char to prevent exeit of patern ....
-		etk::VectorType<HighlightPattern *> m_subPatern;                //!< Under patern of this one
-//		etk::VectorType<HighlightPattern *> m_subColor;                 //!< Under Color in the start RegExp ...
+		etk::Vector<HighlightPattern *> m_subPatern;                //!< Under patern of this one
+//		etk::Vector<HighlightPattern *> m_subColor;                 //!< Under Color in the start RegExp ...
 };
 
 #endif

Sources/appl/ctags/CTagsManager.cpp

@@ -93,7 +93,7 @@ etk::UString CTagsManager::GetFolder(etk::UString &inputString)
 	return out;
 }
 
-bool CTagsManager::OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y)
+bool CTagsManager::OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, float x, float y)
 {
 	/*
 	switch (id)
@@ -344,11 +344,11 @@ void CTagsManager::JumpTo(void)
 /*
 	m_currentList.Clear();
 	if (NULL != m_ctagFile) {
-		etk::VectorType<int8_t> data;
+		etk::Vector<int8_t> data;
 		// get the middle button of the clipboard ==> represent the current selection ...
 		ClipBoard::Get(COPY_MIDDLE_BUTTON, data);
 		if (data.Size() == 0) {
-			APPL_INFO("No current Sélection");
+			APPL_INFO("No current S\E9lection");
 		}
 		tagEntry entry;
 		data.PushBack('\0');

Sources/appl/ctags/CTagsManager.h

@@ -50,7 +50,7 @@ class CTagsManager: public etk::Singleton<CTagsManager>, public ewol::Widget
 		~CTagsManager(void);
 
 	public:
-		virtual bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, etkFloat_t x, etkFloat_t y);
+		virtual bool OnEventAreaExternal(int32_t widgetID, const char * generateEventId, const char * eventExternId, float x, float y);
 	private:
 		int32_t                    m_currentSelectedID;
 		void                       LoadTagFile(void);
@@ -64,8 +64,8 @@ class CTagsManager: public etk::Singleton<CTagsManager>, public ewol::Widget
 		// history system
 		void                       AddToHistory(int32_t bufferID);
 		int32_t                    m_historyPos;
-		etk::VectorType<etk::File*>   m_historyList;
-		etk::VectorType<TagListFind_ts> m_currentList;
+		etk::Vector<etk::File*>   m_historyList;
+		etk::Vector<TagListFind_ts> m_currentList;
 		void                       JumpAtID(int32_t selectID);
 };
 */

Sources/appl/global.cpp

@@ -0,0 +1,218 @@
+/**
+ *******************************************************************************
+ * @file tools_Globals.cpp
+ * @brief Editeur De N'ours : Globals Values
+ * @author Edouard DUPIN
+ * @date 05/12/2010
+ * @par Project
+ * Edn
+ *
+ * @par Copyright
+ * Copyright 2010 Edouard DUPIN, all right reserved
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY.
+ *
+ * Licence summary : 
+ *    You can modify and redistribute the sources code and binaries.
+ *    You can send me the bug-fix
+ *    You can not earn money with this Software (if the source extract from Edn
+ *        represent less than 50% of original Sources)
+ * Term of the licence in in the file licence.txt.
+ *
+ *******************************************************************************
+ */
+
+#include <appl/global.h>
+#include <ColorizeManager.h>
+#include <appl/globalMsg.h>
+#include <ewol/EObject.h>
+
+#undef __class__
+#define __class__	"globals"
+
+
+
+
+erreurCode_te globals::init(void)
+{
+	erreurCode_te ret = ERR_NONE;
+	
+
+	return ret;
+}
+
+
+
+// -----------------------------------------------------------
+static bool displayEOL = false;
+bool globals::IsSetDisplayEndOfLine(void)
+{
+	return displayEOL;
+}
+
+void globals::SetDisplayEndOfLine(bool newVal)
+{
+	APPL_INFO("Set EndOfLine " << newVal);
+	displayEOL = newVal;
+	//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
+}
+
+// -----------------------------------------------------------
+static bool displaySpaceChar = true;
+bool globals::IsSetDisplaySpaceChar(void)
+{
+	return displaySpaceChar;
+}
+
+void globals::SetDisplaySpaceChar(bool newVal)
+{
+	APPL_INFO("Set SpaceChar " << newVal);
+	displaySpaceChar = newVal;
+	//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
+}
+// -----------------------------------------------------------
+static bool displayTabChar = true;
+bool globals::IsSetDisplayTabChar(void)
+{
+	return displayTabChar;
+}
+
+void globals::SetDisplayTabChar(bool newVal)
+{
+	APPL_INFO("Set SpaceChar " << newVal);
+	displayTabChar = newVal;
+	//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
+}
+
+// -----------------------------------------------------------
+static bool AutoIndent = true;
+bool globals::IsSetAutoIndent(void)
+{
+	return AutoIndent;
+}
+
+void globals::SetAutoIndent(bool newVal)
+{
+	APPL_INFO("Set AutoIndent " << newVal);
+	AutoIndent = newVal;
+}
+
+// -----------------------------------------------------------
+
+
+
+
+int32_t globals::getNbColoneBorder(void)
+{
+	return 6;
+}
+
+int32_t globals::getNbLineBorder(void)
+{
+	return 3;
+}
+
+
+#include <ewol/widget/CheckBox.h>
+#include <ewol/widget/Spacer.h>
+static const char * const l_changeIndentation = "edn-event-change-indentation";
+static const char * const l_changeSpace       = "edn-event-change-spaces";
+static const char * const l_changeTabulation  = "edn-event-change-tabulation";
+static const char * const l_changeEndOfLine   = "edn-event-change-endOfLine";
+
+globals::ParameterGlobalsGui::ParameterGlobalsGui(void) 
+{
+	ewol::CheckBox* myCheckbox = NULL;
+	ewol::Spacer* mySpacer = NULL;
+	
+	mySpacer = new ewol::Spacer();
+	if (NULL == mySpacer) {
+		APPL_ERROR("Can not allocate widget ==> display might be in error");
+	} else {
+		mySpacer->SetExpendX(true);
+		mySpacer->SetExpendY(true);
+		SubWidgetAdd(mySpacer);
+	}
+	myCheckbox = new ewol::CheckBox("Automatic Indentation");
+	if (NULL == myCheckbox) {
+		APPL_ERROR("Can not allocate widget ==> display might be in error");
+	} else {
+		myCheckbox->SetExpendX(true);
+		myCheckbox->SetValue(IsSetAutoIndent());
+		myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeIndentation);
+		SubWidgetAdd(myCheckbox);
+	}
+	myCheckbox = new ewol::CheckBox("Display space char (' ')");
+	if (NULL == myCheckbox) {
+		APPL_ERROR("Can not allocate widget ==> display might be in error");
+	} else {
+		myCheckbox->SetExpendX(true);
+		myCheckbox->SetValue(IsSetDisplaySpaceChar());
+		myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeSpace);
+		SubWidgetAdd(myCheckbox);
+	}
+	myCheckbox = new ewol::CheckBox("Display tabulation char ('\\t')");
+	if (NULL == myCheckbox) {
+		APPL_ERROR("Can not allocate widget ==> display might be in error");
+	} else {
+		myCheckbox->SetExpendX(true);
+		myCheckbox->SetValue(IsSetDisplayTabChar());
+		myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeTabulation);
+		SubWidgetAdd(myCheckbox);
+	}
+	myCheckbox = new ewol::CheckBox("Display end of line ('\\n')");
+	if (NULL == myCheckbox) {
+		APPL_ERROR("Can not allocate widget ==> display might be in error");
+	} else {
+		myCheckbox->SetExpendX(true);
+		myCheckbox->SetValue(IsSetDisplayEndOfLine());
+		myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeEndOfLine);
+		SubWidgetAdd(myCheckbox);
+	}
+}
+
+globals::ParameterGlobalsGui::~ParameterGlobalsGui(void) 
+{
+	
+}
+
+
+/**
+ * @brief Receive a message from an other EObject with a specific eventId and data
+ * @param[in] CallerObject Pointer on the EObject that information came from
+ * @param[in] eventId Message registered by this class
+ * @param[in] data Data registered by this class
+ * @return ---
+ */
+void globals::ParameterGlobalsGui::OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data)
+{
+	ewol::SizerVert::OnReceiveMessage(CallerObject, eventId, data);
+	
+	if (eventId == l_changeEndOfLine) {
+		if (data == "true") {
+			SetDisplayEndOfLine(true);
+		} else {
+			SetDisplayEndOfLine(false);
+		}
+	} else if (eventId == l_changeIndentation) {
+		if (data == "true") {
+			SetAutoIndent(true);
+		} else {
+			SetAutoIndent(false);
+		}
+	} else if (eventId == l_changeSpace) {
+		if (data == "true") {
+			SetDisplaySpaceChar(true);
+		} else {
+			SetDisplaySpaceChar(false);
+		}
+	} else if (eventId == l_changeTabulation) {
+		if (data == "true") {
+			SetDisplayTabChar(true);
+		} else {
+			SetDisplayTabChar(false);
+		}
+	}
+	
+}

Sources/appl/global.h

@@ -28,6 +28,7 @@
 
 #include <appl/Debug.h>
 #include <etk/Types.h>
+#include <ewol/widget/SizerVert.h>
 
 
 namespace globals
@@ -42,10 +43,29 @@ namespace globals
 	bool    IsSetDisplaySpaceChar(void);
 	void    SetDisplaySpaceChar(bool newVal);
 	
+	bool    IsSetDisplayTabChar(void);
+	void    SetDisplayTabChar(bool newVal);
+	
 	bool    IsSetAutoIndent(void);
 	void    SetAutoIndent(bool newVal);
 
 	void    init2(void);
+	
+	
+	class ParameterGlobalsGui : public ewol::SizerVert
+	{
+		public :
+			ParameterGlobalsGui(void);
+			~ParameterGlobalsGui(void);
+			/**
+			 * @brief Receive a message from an other EObject with a specific eventId and data
+			 * @param[in] CallerObject Pointer on the EObject that information came from
+			 * @param[in] eventId Message registered by this class
+			 * @param[in] data Data registered by this class
+			 * @return ---
+			 */
+			virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data);
+	};
 
 }
 

Sources/appl/globalMsg.cpp

@@ -34,6 +34,7 @@ extern const char* const ednMsgGuiOpen       = "edn-Msg-Gui-Open";
 extern const char* const ednMsgGuiClose      = "edn-Msg-Gui-Close";
 extern const char* const ednMsgGuiSave       = "edn-Msg-Gui-Save";
 extern const char* const ednMsgGuiSaveAs     = "edn-Msg-Gui-SaveAs";
+extern const char* const ednMsgProperties    = "edn-Msg-Gui-Properties";
 
 extern const char* const ednMsgGuiUndo       = "edn-Msg-Gui-Undo";
 extern const char* const ednMsgGuiRedo       = "edn-Msg-Gui-Redo";
@@ -55,7 +56,6 @@ extern const char* const ednMsgGuiShowEndOfLine = "edn-Msg-Gui-ShowEndOfLine";
 
 extern const char* const ednMsgGuiCtags         = "edn-Msg-Gui-CTags";
 
-extern const char* const ednMsgGuiAbout         = "edn-Msg-Gui-About";
 
 
 ////////////////////////////////////////////////////////////////////////

Sources/appl/globalMsg.h

@@ -34,6 +34,7 @@
 	extern const char* const ednMsgGuiClose;      // data : "current" "All"
 	extern const char* const ednMsgGuiSave;       // data : ""
 	extern const char* const ednMsgGuiSaveAs;     // data : ""
+	extern const char* const ednMsgProperties;    // data : ""
 	
 	extern const char* const ednMsgGuiUndo;       // data : ""
 	extern const char* const ednMsgGuiRedo;       // data : ""
@@ -45,7 +46,7 @@
 	extern const char* const ednMsgGuiGotoLine;   // data : "???" / "1" ... "999999999999"
 	
 	extern const char* const ednMsgGuiSearch;     // data : ""
-	extern const char* const ednMsgGuiReplace;    // data : ""
+	extern const char* const ednMsgGuiReplace;    // data : "Normal" "All"
 	extern const char* const ednMsgGuiFind;       // data : "Next" "Previous" "All" "None"
 	
 	extern const char* const ednMsgGuiChangeColor;   // data : "Black" "White"
@@ -55,7 +56,6 @@
 	
 	extern const char* const ednMsgGuiCtags;         // data : "Load" "ReLoad" "Jump" "Back"
 	
-	extern const char* const ednMsgGuiAbout;         // data : ""
 
 
 ////////////////////////////////////////////////////////////////////////

Sources/appl/init.cpp

@@ -31,6 +31,7 @@
 #include <appl/Debug.h>
 #include <appl/global.h>
 #include <etk/File.h>
+#include <etk/tool.h>
 #include <Gui/MainWindows.h>
 #include <BufferManager.h>
 #include <ColorizeManager.h>
@@ -49,7 +50,7 @@ MainWindows * basicWindows = NULL;
  */
 void APP_Init(void)
 {
-	#ifdef __PLATFORM__Linux
+	#ifdef __TARGET_OS__Linux
 		#ifdef MODE_RELEASE
 			APPL_INFO("==> Init "PROJECT_NAME" (START) (Linux) (Release)");
 		#else
@@ -63,30 +64,11 @@ void APP_Init(void)
 		#endif
 	#endif
 	ewol::ChangeSize(800, 600);
+	etk::InitDefaultFolder(PROJECT_NAME);
 
-	char cCurrentPath[FILENAME_MAX];
-	// set the default Path of the application : 
-	#ifdef __PLATFORM__Linux
-		etk::UString homedir;
-		#ifdef MODE_RELEASE
-			homedir = "/usr/share/"PROJECT_NAME"/";
-		#else
-			if (!getcwd(cCurrentPath, FILENAME_MAX)) {
-				homedir = "./assets/";
-			} else {
-				cCurrentPath[FILENAME_MAX - 1] = '\0';
-				homedir = cCurrentPath;
-				homedir += "/assets/";
-			}
-		#endif
-		// TODO : Remove the Utf8Data
-		etk::SetBaseFolderData(homedir.Utf8Data());
-		etk::SetBaseFolderDataUser("~/."PROJECT_NAME"/");
-		etk::SetBaseFolderCache("/tmp/"PROJECT_NAME"/");
-	#endif
 	ewol::SetFontFolder("Font");
 	
-	#ifdef __PLATFORM__Android
+	#ifdef __TARGET_OS__Android
 		ewol::SetDefaultFont("freefont/FreeSerif.ttf", 19);
 	#else
 		ewol::SetDefaultFont("freefont/FreeSerif.ttf", 14);
@@ -103,13 +85,13 @@ void APP_Init(void)
 	// set color and other trucs...
 	ColorizeManager::Init();
 	etk::UString corlorFile = "color_white.xml";
-	ColorizeManager::LoadFile( corlorFile.Utf8Data() );
+	ColorizeManager::LoadFile( corlorFile.c_str() );
 	ColorizeManager::DisplayListOfColor();
 	
 	HighlightManager::Init();
 	HighlightManager::loadLanguages();
 
-	
+	char cCurrentPath[FILENAME_MAX];
 	// get the curent program folder
 	if (!getcwd(cCurrentPath, FILENAME_MAX)) {
 		return ;
@@ -151,6 +133,8 @@ void APP_Init(void)
 	
 	ewol::shortCut::Add("ctrl+l",       ednMsgGuiGotoLine, "???");
 	
+	ewol::shortCut::Add("ctrl+f",       ednMsgGuiSearch, "");
+	
 	
 	// add files
 	APPL_INFO("show list of files : ");
@@ -193,7 +177,7 @@ void APP_UnInit(void)
 	//AccelKey::Kill();
 	
 	if (NULL != basicWindows) {
-		basicWindows->MarkToRemove();
+		delete(basicWindows);
 		basicWindows = NULL;
 	}
 	APPL_INFO("==> Un-Init Edn (END)");

assets/icon/Forbidden.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.2,0,0,1.2,-579.7324,-351.106)">
-		<path d="m 509.777,296.755 c -12.426,0 -22.5,10.073 -22.5,22.5 0,12.427 10.074,22.5 22.5,22.5 12.426,0 22.5,-10.073 22.5,-22.5 0,-12.427 -10.074,-22.5 -22.5,-22.5 z m 14.063,22.5 c 0,2.344 -0.584,4.55 -1.602,6.495 l -18.955,-18.955 c 1.945,-1.019 4.151,-1.603 6.494,-1.603 7.754,10e-4 14.063,6.309 14.063,14.063 z m -28.125,0 c 0,-2.343 0.584,-4.55 1.602,-6.493 l 18.955,18.953 c -1.943,1.019 -4.15,1.603 -6.494,1.603 -7.755,0 -14.063,-6.308 -14.063,-14.063 z"
-		      style="fill:#333333" />
-	</g>
-</svg>

assets/icon/Parameter.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="64" height="64">
-	<g transform="matrix(1.1999998,0,0,1.2054398,-147.94597,-642.18985)">
-		<path d="m 169.92,548.999 c -0.181,-0.441 -0.497,-0.633 -0.703,-0.426 -0.206,0.205 -0.575,0.451 -0.819,0.543 -0.244,0.094 -1.056,-0.443 -1.392,-0.779 h -0.001 c -0.336,-0.338 -0.688,-0.813 -0.78,-1.057 -0.092,-0.244 0.444,-1.055 0.78,-1.393 l 0.011,-0.01 c 0.337,-0.338 0.348,-0.898 0.023,-1.248 l -3.978,-3.666 c -0.374,-0.295 -0.851,-0.248 -1.059,0.104 -0.209,0.35 -0.555,0.76 -0.769,0.91 -0.214,0.148 -1.133,-0.17 -1.541,-0.414 -0.409,-0.242 -0.866,-0.617 -1.017,-0.83 -0.149,-0.215 0.132,-1.066 0.326,-1.393 0.194,-0.328 -0.013,-0.729 -0.461,-0.889 l -5.998,-1.547 c -0.47,-0.078 -0.854,0.205 -0.854,0.631 0,0.426 -0.088,0.969 -0.194,1.207 -0.107,0.238 -1.061,0.434 -1.536,0.434 -0.475,0 -1.06,-0.088 -1.298,-0.195 -0.238,-0.107 -0.433,-1.02 -0.433,-1.445 0,-0.425 -0.384,-0.709 -0.854,-0.631 l -5.998,1.547 c -0.448,0.16 -0.655,0.561 -0.461,0.889 0.195,0.326 0.379,0.807 0.408,1.066 0.03,0.258 -0.689,0.914 -1.099,1.156 -0.408,0.244 -0.955,0.467 -1.215,0.496 -0.26,0.029 -0.885,-0.643 -1.095,-0.992 -0.208,-0.352 -0.686,-0.398 -1.06,-0.104 l -3.978,3.666 c -0.324,0.35 -0.313,0.91 0.024,1.248 l 0.011,0.01 c 0.336,0.338 0.688,0.813 0.78,1.057 0.092,0.244 -0.444,1.055 -0.781,1.393 -0.336,0.336 -0.812,0.688 -1.056,0.779 -0.244,0.091 -0.949,-0.338 -1.155,-0.543 -0.206,-0.207 -0.522,-0.016 -0.703,0.426 0,0 -2.54,6.197 -2.54,10.189 0,12.428 10.073,22.5 22.5,22.5 12.427,0 22.5,-10.072 22.5,-22.5 0.005,-3.992 -2.535,-10.189 -2.535,-10.189 z m -19.96,21.541 c -6.213,0 -11.25,-5.037 -11.25,-11.25 0,-5.076 3.363,-9.363 7.981,-10.764 l 2.882,-5.764 c 0.213,-0.426 0.561,-0.426 0.773,0 l 2.882,5.764 c 4.619,1.4 7.981,5.688 7.981,10.764 0.001,6.213 -5.036,11.25 -11.249,11.25 z"
-		      style="fill:#333333"/>
-		<path d="m 149.96,551.501 c -4.295,0 -7.788,3.494 -7.788,7.789 0,4.295 3.493,7.787 7.788,7.787 4.295,0 7.788,-3.492 7.788,-7.787 0,-4.295 -3.493,-7.789 -7.788,-7.789 z"
-		      style="fill:#333333"/>
-	</g>
-</svg>

assets/icon/Search.svg

@@ -1,13 +0,0 @@
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<metadata>
-		<rdf:RDF>
-			<cc:Work rdf:about="">
-				<dc:format>image/svg+xml</dc:format>
-				<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-				<dc:title/>
-			</cc:Work>
-		</rdf:RDF>
-	</metadata>
-	<path d="M58.168,50.56,46.013,38.407c-0.91442-0.91442-2.3016-1.0644-3.3865-0.47161l-2.592-2.592c2.208-3.1357,3.5185-6.9493,3.5185-11.068,0-10.629-8.6485-19.276-19.277-19.276-10.629,0-19.276,8.6461-19.276,19.276s8.6461,19.277,19.276,19.277c4.1017,0,7.8985-1.296,11.026-3.4873l2.6088,2.6112c-0.56041,1.0752-0.40321,2.4348,0.49681,3.3373l12.155,12.153c1.1088,1.1112,2.9268,1.1112,4.0357,0l3.5725-3.5701c1.1064-1.1088,1.1064-2.9256-0.0024-4.0369z" fill="#333"/>
-	<path d="m1.4382,21.622a11.793,12.272,0,1,1,-23.586,0,11.793,12.272,0,1,1,23.586,0z" transform="matrix(1.0284553,0,0,1,35.146627,2.6846088)" fill="#FFF"/>
-</svg>

avancement.boo

@@ -1,18 +1,16 @@
 # action a faire (ordonner par r<>vision) :
 
 dans la liste des truc important a refaire
-	retirer tout les singleton ==> passer par des namespace ==> fonctionnera mieux ...
 	finir de netoyer la classe widget
 	netoyer les classe text ...
-	mettre en pla ce le repositionnement automatique quand on change de buffer
+	mettre en place le repositionnement automatique quand on change de buffer
 	Curseur au bon endroit
 	
 
+* 0.3.6 ...
 
 * 0.2.X :
 	- gui : Amelioration du full-screen et du display de base (sans l'entete de la fenetre)
-	- gui : Mise en place d'un display ligne par ligne
-	- gui : ascenceur quand n<>cessaire
 	- gui : Demander la cr<63>ation de nouveaux fichier quand il n'existe pas (a l'ouverture en ligne de commande)
 	- sys : Mise en place des colorisation de base pour le
 			* java script
@@ -21,12 +19,9 @@ dans la liste des truc important a refaire
 	- sys : Catch F[1-12] ==> for user personal event
 	- BUG : Correction du bug des entr<74> bizard tel que les chapot et les guillemets
 	- BUG : de s<>lection quand la ligne est pleine et la premi<6D>re ligne s<>ctionn<6E>e. ==> regarder apr<70>s avoir fait le display ligne par ligne...
-	- BUG : de copier coller sur les <20><><EFBFBD> ...
+	- BUG : de copier coller sur les <20><><EFBFBD> è ...
 	- BUG : les caract<63>re multiples type chapot ...
-	- BUG : italique non g<>n<EFBFBD>r<EFBFBD>
 * 0.3.X :
-	- SEARCH : get selected text in the search windows
-	- SEARCH : Select the search windows when call crtl+F
 	- sys : personal property file in the ~/.edn ou ~/.gnome/edn
 	- gui : Ordonner les fichier ouvert par nom ...
 	- gui : parameter gui : et en autre la taille de la police ... et voir pour la r<>cup<75>rer sur le system... et ce serait cool...
@@ -77,4 +72,4 @@ dans la liste des truc important a refaire
 
 # note utiles : 
 http://majutsushi.github.com/tagbar/		==> je devrais regarder ca pour savoir ce que je peux faire avec du ctags
-CTags : Set the parsing methode : "ctags -R --fields=+n Sources/ /usr/include/gtk-3.0/"
+CTags : Set the parsing methode : "ctags -R --fields=+n jni ../ewol/Sources/"

data/cedit.fbp

@@ -1,774 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
-    <FileVersion major="1" minor="9" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration"></property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="event_handler">impl_virtual</property>
-        <property name="file"></property>
-        <property name="first_id">1000</property>
-        <property name="help_provider">none</property>
-        <property name="internationalize">0</property>
-        <property name="name">MyProject1</property>
-        <property name="namespace"></property>
-        <property name="path">.</property>
-        <property name="precompiled_header"></property>
-        <property name="relative_path">1</property>
-        <property name="use_enum">0</property>
-        <property name="use_microsoft_bom">0</property>
-        <object class="Panel" expanded="1">
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="enabled">1</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">MyPanel1</property>
-            <property name="pos"></property>
-            <property name="size">500,196</property>
-            <property name="subclass"></property>
-            <property name="tooltip"></property>
-            <property name="validator_data_type"></property>
-            <property name="validator_style">wxFILTER_NONE</property>
-            <property name="validator_type">wxDefaultValidator</property>
-            <property name="validator_variable"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnChar"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
-                <property name="name">bSizer1</property>
-                <property name="orient">wxHORIZONTAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">1</property>
-                    <property name="flag"></property>
-                    <property name="proportion">1</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bSizer2</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticText" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">String to find:</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_staticText1</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxTextCtrl" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="maximum_size"></property>
-                                <property name="maxlength">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_textCtrl1</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="value"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnText"></event>
-                                <event name="OnTextEnter"></event>
-                                <event name="OnTextMaxLen"></event>
-                                <event name="OnTextURL"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticText" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Replace With:</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_staticText2</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <property name="wrap">-1</property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxTextCtrl" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="maximum_size"></property>
-                                <property name="maxlength">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_textCtrl2</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="value"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnText"></event>
-                                <event name="OnTextEnter"></event>
-                                <event name="OnTextMaxLen"></event>
-                                <event name="OnTextURL"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxCheckBox" expanded="1">
-                                <property name="bg"></property>
-                                <property name="checked">0</property>
-                                <property name="context_help"></property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Case Sensitive</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_checkBox1</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnCheckBox"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxCheckBox" expanded="1">
-                                <property name="bg"></property>
-                                <property name="checked">0</property>
-                                <property name="context_help"></property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Circular Search</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_checkBox2</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnCheckBox"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">1</property>
-                    <property name="flag"></property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bSizer3</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="default">0</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Find previous</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_button1</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="default">0</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Find next</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_button2</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="default">0</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Replace &amp;&amp; Find previous</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_button3</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="default">0</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Replace &amp;&amp; Find next</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_button4</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="default">0</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Replace in all window</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_button5</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">1</property>
-                            <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
-                                <property name="bg"></property>
-                                <property name="context_help"></property>
-                                <property name="default">0</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="label">Cancel</property>
-                                <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_button6</property>
-                                <property name="permission">protected</property>
-                                <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
-                                <property name="subclass"></property>
-                                <property name="tooltip"></property>
-                                <property name="validator_data_type"></property>
-                                <property name="validator_style">wxFILTER_NONE</property>
-                                <property name="validator_type">wxDefaultValidator</property>
-                                <property name="validator_variable"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnButtonClick"></event>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </object>
-</wxFormBuilder_Project>

data/config.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EdnConfig version="0.1">
-	<option name="DisplayTab"			value="true"/>
-	<option name="ConvertTabInSpace"	value="false"/>
-	<option name="TabWidth"				value="4"/>
-	<option name="CleanSpaceEndOfLine"	value="false"/>
-	<option name="DisplaySpace"			value="false"/>
-	<option name="DisplayEndOfLine"		value="false"/>
-	<option name="DisplayEndOfFile"		value="false"/>
-	<option name="ColorMode"			value="color_black.xml"/>
-	<option name="IndentationMode"		value="clever"/>
-	<option name="FontName"				value="Monospace"/>
-	<option name="FontSize"				value="8"/>
-	<option name="SaveCopyBeforSave"	value="true"/>
-	<option name="SaveCopyPrefix"		value=".save_"/>
-	<option name="SaveCopySufix"		value="DATE"/>
-	<option name="SaveAutomatic"		value="-1"/>
-	<option name="DisplayLineNumber"	value="true"/>
-	<option name="LeftMarging"			value="150"/>
-</EdnConfig>

data/dox/doxygen.css

@@ -1,521 +0,0 @@
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
-	font-family: Geneva, Arial, Helvetica, sans-serif;
-}
-BODY,TD {
-	font-size: 90%;
-}
-
-body {
-	counter-reset: chapitre;  /* Nous mettons <20> z<>ro le compteur chapitre */
-}
-
-H1 {
-	text-align: center;
-	font-size: 160%;
-}
-
-H2 {
-	font-size: 120%;
-}
-
-H3 {
-	font-size: 100%;
-}
-
-H4 {
-	font-size: 100%;
-}
-
-
-.contents H1 {
-	text-align: center;
-}
-
-.contents H2 {
-	padding-left: 5px;
-	counter-reset: section;
-}
-
-.contents h2:before {
-	counter-increment: chapitre;  /* Ajoute 1 au compteur chapitre */
-	content: counter(chapitre) ". ";
-}
-
-
-.contents H3 {
-	padding-left: 10px;
-	counter-reset: soussection;
-}
-
-.contents h3:before {
-	counter-increment: section;  /* Ajoute 1 au compteur section */
-	content: counter(chapitre) "." counter(section) ". ";
-}
-
-.contents H4 {
-	font-size: 100%;
-}
-
-.contents h4:before {
-	counter-increment: soussection;  /* Ajoute 1 au compteur section */
-	content: counter(chapitre) "." counter(section)  "." counter(soussection) ". ";
-}
-
-CAPTION { 
-	font-weight: bold 
-}
-DIV.qindex {
-	width: 100%;
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
-	text-align: center;
-	margin: 2px;
-	padding: 2px;
-	line-height: 140%;
-}
-DIV.navpath {
-	width: 100%;
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
-	text-align: center;
-	margin: 2px;
-	padding: 2px;
-	line-height: 140%;
-}
-DIV.navtab {
-       background-color: #e8eef2;
-       border: 1px solid #84b0c7;
-       text-align: center;
-       margin: 2px;
-       margin-right: 15px;
-       padding: 2px;
-}
-TD.navtab {
-       font-size: 70%;
-}
-A.qindex {
-       text-decoration: none;
-       font-weight: bold;
-       color: #1A419D;
-}
-A.qindex:visited {
-       text-decoration: none;
-       font-weight: bold;
-       color: #1A419D
-}
-A.qindex:hover {
-	text-decoration: none;
-	background-color: #ddddff;
-}
-A.qindexHL {
-	text-decoration: none;
-	font-weight: bold;
-	background-color: #6666cc;
-	color: #ffffff;
-	border: 1px double #9295C2;
-}
-A.qindexHL:hover {
-	text-decoration: none;
-	background-color: #6666cc;
-	color: #ffffff;
-}
-A.qindexHL:visited { 
-	text-decoration: none; 
-	background-color: #6666cc; 
-	color: #ffffff 
-}
-A.el { 
-	text-decoration: none; 
-	font-weight: bold 
-}
-A.elRef { 
-	font-weight: bold 
-}
-A.code:link { 
-	text-decoration: none; 
-	font-weight: normal; 
-	color: #0000FF
-}
-A.code:visited { 
-	text-decoration: none; 
-	font-weight: normal; 
-	color: #0000FF
-}
-A.codeRef:link { 
-	font-weight: normal; 
-	color: #0000FF
-}
-A.codeRef:visited { 
-	font-weight: normal; 
-	color: #0000FF
-}
-A:hover { 
-	text-decoration: none; 	
-	background-color: #f2f2ff 
-}
-DL.el { 
-	margin-left: -1cm 
-}
-.fragment {
-       font-family: monospace, fixed;
-       font-size: 95%;
-}
-PRE.fragment {
-	border: 1px solid #CCCCCC;
-	background-color: #f5f5f5;
-	margin-top: 4px;
-	margin-bottom: 4px;
-	margin-left: 2px;
-	margin-right: 8px;
-	padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 4px;
-	padding-bottom: 4px;
-}
-DIV.ah { 
-	background-color: black; 
-	font-weight: bold; 
-	color: #ffffff; 
-	margin-bottom: 3px; 
-	margin-top: 3px 
-}
-
-DIV.groupHeader {
-       margin-left: 16px;
-       margin-top: 12px;
-       margin-bottom: 6px;
-       font-weight: bold;
-}
-DIV.groupText { 
-	margin-left: 16px; 
-	font-style: italic; 
-	font-size: 90% 
-}
-BODY {
-	background: white;
-	color: black;
-	margin-right: 20px;
-	margin-left: 20px;
-}
-TD.indexkey {
-	background-color: #e8eef2;
-	font-weight: bold;
-	padding-right  : 10px;
-	padding-top    : 2px;
-	padding-left   : 10px;
-	padding-bottom : 2px;
-	margin-left    : 0px;
-	margin-right   : 0px;
-	margin-top     : 2px;
-	margin-bottom  : 2px;
-	border: 1px solid #CCCCCC;
-}
-TD.indexvalue {
-	background-color: #e8eef2;
-	font-style: italic;
-	padding-right  : 10px;
-	padding-top    : 2px;
-	padding-left   : 10px;
-	padding-bottom : 2px;
-	margin-left    : 0px;
-	margin-right   : 0px;
-	margin-top     : 2px;
-	margin-bottom  : 2px;
-	border: 1px solid #CCCCCC;
-}
-TR.memlist {
-	background-color: #f0f0f0; 
-}
-P.formulaDsp { 
-	text-align: center; 
-}
-IMG.formulaDsp {
-}
-IMG.formulaInl { 
-	vertical-align: middle; 
-}
-SPAN.keyword       { color: #008000 }
-SPAN.keywordtype   { color: #604020 }
-SPAN.keywordflow   { color: #e08000 }
-SPAN.comment       { color: #800000 }
-SPAN.preprocessor  { color: #806020 }
-SPAN.stringliteral { color: #002080 }
-SPAN.charliteral   { color: #008080 }
-SPAN.vhdldigit     { color: #ff00ff }
-SPAN.vhdlchar      { color: #000000 }
-SPAN.vhdlkeyword   { color: #700070 }
-SPAN.vhdllogic     { color: #ff0000 }
-
-.mdescLeft {
-	padding: 0px 8px 4px 8px;
-	font-size: 80%;
-	font-style: italic;
-	background-color: #FAFAFA;
-	border-top: 1px none #E0E0E0;
-	border-right: 1px none #E0E0E0;
-	border-bottom: 1px none #E0E0E0;
-	border-left: 1px none #E0E0E0;
-	margin: 0px;
-}
-.mdescRight {
-        padding: 0px 8px 4px 8px;
-	font-size: 80%;
-	font-style: italic;
-	background-color: #FAFAFA;
-	border-top: 1px none #E0E0E0;
-	border-right: 1px none #E0E0E0;
-	border-bottom: 1px none #E0E0E0;
-	border-left: 1px none #E0E0E0;
-	margin: 0px;
-}
-.memItemLeft {
-	padding: 1px 0px 0px 8px;
-	margin: 4px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-color: #E0E0E0;
-	border-right-color: #E0E0E0;
-	border-bottom-color: #E0E0E0;
-	border-left-color: #E0E0E0;
-	border-top-style: solid;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	background-color: #FAFAFA;
-	font-size: 80%;
-}
-.memItemRight {
-	padding: 1px 8px 0px 8px;
-	margin: 4px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-color: #E0E0E0;
-	border-right-color: #E0E0E0;
-	border-bottom-color: #E0E0E0;
-	border-left-color: #E0E0E0;
-	border-top-style: solid;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	background-color: #FAFAFA;
-	font-size: 80%;
-}
-.memTemplItemLeft {
-	padding: 1px 0px 0px 8px;
-	margin: 4px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-color: #E0E0E0;
-	border-right-color: #E0E0E0;
-	border-bottom-color: #E0E0E0;
-	border-left-color: #E0E0E0;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	background-color: #FAFAFA;
-	font-size: 80%;
-}
-.memTemplItemRight {
-	padding: 1px 8px 0px 8px;
-	margin: 4px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-color: #E0E0E0;
-	border-right-color: #E0E0E0;
-	border-bottom-color: #E0E0E0;
-	border-left-color: #E0E0E0;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	background-color: #FAFAFA;
-	font-size: 80%;
-}
-.memTemplParams {
-	padding: 1px 0px 0px 8px;
-	margin: 4px;
-	border-top-width: 1px;
-	border-right-width: 1px;
-	border-bottom-width: 1px;
-	border-left-width: 1px;
-	border-top-color: #E0E0E0;
-	border-right-color: #E0E0E0;
-	border-bottom-color: #E0E0E0;
-	border-left-color: #E0E0E0;
-	border-top-style: solid;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	color: #606060;
-	background-color: #FAFAFA;
-	font-size: 80%;
-}
-.search { 
-	color: #003399;
-	font-weight: bold;
-}
-FORM.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
-}
-INPUT.search { 
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
-}
-TD.tiny { 
-	font-size: 75%;
-}
-a {
-	color: #1A41A8;
-}
-a:visited {
-	color: #2A3798;
-}
-.dirtab { 
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #84b0c7;
-}
-TH.dirtab { 
-	background: #e8eef2;
-	font-weight: bold;
-}
-HR { 
-	height: 1px;
-	border: none;
-	border-top: 1px solid black;
-}
-
-/* Style for detailed member documentation */
-.memtemplate {
-	font-size: 80%;
-	color: #606060;
-	font-weight: normal;
-	margin-left: 3px;
-} 
-.memnav { 
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
-}
-.memitem {
-	padding: 4px;
-	background-color: #eef3f5;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #dedeee;
-	-moz-border-radius: 8px 8px 8px 8px;
-}
-.memname {
-	white-space: nowrap;
-	font-weight: bold;
-}
-.memdoc{
-	padding-left: 10px;
-}
-.memproto {
-	background-color: #d5e1e8;
-	width: 100%;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #84b0c7;
-	font-weight: bold;
-	-moz-border-radius: 8px 8px 8px 8px;
-}
-.paramkey {
-	text-align: right;
-}
-.paramtype {
-	white-space: nowrap;
-}
-.paramname {
-	color: #602020;
-	font-style: italic;
-	white-space: nowrap;
-}
-/* End Styling for detailed member documentation */
-
-/* for the tree view */
-.ftvtree {
-	font-family: sans-serif;
-	margin:0.5em;
-}
-.directory { 
-	font-size: 9pt; 
-	font-weight: bold; 
-}
-directory.directory h3 { 
-	margin: 0px; 
-	margin-top: 1em; 
-	font-size: 11pt; 
-}
-.directory > h3 { 
-	margin-top: 0; 
-}
-.directory p { 
-	margin: 0px; 
-	white-space: nowrap; 
-}
-.directory div { 
-	display: none; 
-	margin: 0px; 
-}
-.directory img { 
-	vertical-align: -30%; 
-}
-
-
-
-
-/* classe mise dans le tableau : table */
-.tableau{
-	margin-left:35px;
-	border: medium solid #6495ed;
-	border-collapse: collapse;
-	border-spacing: 0px;
-}
-.tableau th {
-	border: thin solid #6495ed;
-	padding: 5px;
-	background-color: #D0E3FA;
-}
-.tableau td {
-	border: thin solid #6495ed;
-	padding: 5px;
-	text-align: center;
-	background-color: #ffffff;
-}
-
-
-.tableau tr p {
-	padding: 0px;
-	border: 0px;
-	margin: 0px;
-}
-
-.contents p{
-	padding-left: 35px;
-}
-
-
-.contents ul{
-	padding-left: 80px;
-}
-
-.contents ul ul{
-	padding-left: 65px;
-}

data/edn.desktop

@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=0.3.0
-Name=Edn : Editeur de N'ours
-Exec=edn
-Icon=Edn
-Terminal=false
-Type=Application
-Categories=Development;Utility;TextEditor;
-GenericName=Text editor
-GenericName[en]=Text editor
-GenericName[nl]=Tekst verwerker
-GenericName[fr]=<EFBFBD>diteur de text
-Comment=Code editor for c, c++, php, bash, xml ...
-Comment[fr]=<EFBFBD>diteur de text pour les language c, c++, php, bash, xml ...